2018 files changed, 78466 insertions, 84260 deletions

diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 9bb57139a06..aeeb44fe819 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -487,17 +487,17 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
   if (!this->is_local ())
     {
       *os << "ACE_INLINE" << be_nl;
-      *os << this->name () << "::" 
-          << this->local_name () << " (" 
-          << be_idt << be_idt_nl 
+      *os << this->name () << "::"
+          << this->local_name () << " ("
+          << be_idt << be_idt_nl
           << "TAO_Stub *objref," << be_nl
-          << "CORBA::Boolean _tao_collocated," << be_nl 
-	        << "TAO_Abstract_ServantBase *servant" << be_uidt_nl
-	        << ")" // constructor 
-	        << be_nl;
+          << "CORBA::Boolean _tao_collocated," << be_nl
+                << "TAO_Abstract_ServantBase *servant" << be_uidt_nl
+                << ")" // constructor
+                << be_nl;
       *os << ": CORBA_Object (objref, _tao_collocated, servant)" << be_uidt_nl;
       *os << "{" << be_idt_nl
-	        << "this->" << this->flat_name () 
+                << "this->" << this->flat_name ()
           << "_setup_collocation (_tao_collocated);" << be_uidt_nl;
       *os << "}" << be_nl << be_nl;
     }
@@ -533,14 +533,14 @@ be_interface::gen_var_defn (char *interface_name)
   // for over here.
 
   *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf 
+      << " " << namebuf
       << " : public TAO_Base_var" << be_nl;
   *ch << "{" << be_nl;
   *ch << "public:" << be_idt_nl;
 
   // Default constructor.
   *ch << namebuf << " (void); // default constructor" << be_nl;
-  *ch << namebuf << " (" << interface_name 
+  *ch << namebuf << " (" << interface_name
       << "_ptr p)"
       << " : ptr_ (p) {} " << be_nl;
 
@@ -549,16 +549,16 @@ be_interface::gen_var_defn (char *interface_name)
       << " &); // copy constructor" << be_nl;
 
   // Destructor.
-  *ch << "~" << namebuf 
+  *ch << "~" << namebuf
       << " (void); // destructor" << be_nl;
   *ch << be_nl;
 
   // Assignment operator from a pointer.
-  *ch << namebuf << " &operator= (" << interface_name 
+  *ch << namebuf << " &operator= (" << interface_name
       << "_ptr);" << be_nl;
 
   // Assignment from _var.
-  *ch << namebuf << " &operator= (const " << namebuf 
+  *ch << namebuf << " &operator= (const " << namebuf
       << " &);" << be_nl;
 
   // Arrow operator
@@ -566,9 +566,9 @@ be_interface::gen_var_defn (char *interface_name)
   *ch << be_nl;
 
   // Other extra types (cast operators, [] operator, and others).
-  *ch << "operator const " << interface_name 
+  *ch << "operator const " << interface_name
       << "_ptr &() const;" << be_nl;
-  *ch << "operator " << interface_name 
+  *ch << "operator " << interface_name
       << "_ptr &();" << be_nl;
 
   *ch << "// in, inout, out, _retn " << be_nl;
@@ -579,7 +579,7 @@ be_interface::gen_var_defn (char *interface_name)
   *ch << interface_name << "_ptr &out (void);" << be_nl;
   *ch << interface_name << "_ptr _retn (void);" << be_nl;
 
-  // Generate an additional member function that returns the 
+  // Generate an additional member function that returns the
   // underlying pointer.
   *ch << interface_name << "_ptr ptr (void) const;" << be_nl << be_nl;
 
@@ -587,19 +587,19 @@ be_interface::gen_var_defn (char *interface_name)
   *ch << "// Hooks used by template sequence and object manager classes"
       << be_nl
       << "// for non-defined forward declared interfaces." << be_nl
-      << "static " << interface_name 
+      << "static " << interface_name
       << "_ptr tao_duplicate ("
       << interface_name << "_ptr);" << be_nl
       << "static void tao_release (" << interface_name
       << "_ptr);" << be_nl
-      << "static " << interface_name 
+      << "static " << interface_name
       << "_ptr tao_nil (void);" << be_nl
-      << "static " << interface_name 
+      << "static " << interface_name
       << "_ptr tao_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object *," << be_nl
-      << "CORBA::Environment &" << be_uidt_nl
+      << "CORBA::Object *" << be_nl
+      << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ");" << be_uidt_nl
-      << "static CORBA::Object * tao_upcast (void *);" 
+      << "static CORBA::Object * tao_upcast (void *);"
       << be_uidt_nl << be_nl;
 
   // Private.
@@ -607,7 +607,7 @@ be_interface::gen_var_defn (char *interface_name)
   *ch << interface_name << "_ptr ptr_;" << be_nl;
   *ch << "// Unimplemented - prevents widening assignment." << be_nl;
   *ch << interface_name << "_var (const TAO_Base_var &rhs);" << be_nl;
-  *ch << interface_name << "_var &operator= (const TAO_Base_var &rhs);" 
+  *ch << interface_name << "_var &operator= (const TAO_Base_var &rhs);"
       << be_uidt_nl;
 
   *ch << "};\n\n";
@@ -675,7 +675,7 @@ be_interface::gen_var_impl (char *interface_local_name,
   // defined before the remaining member functions including the copy
   // constructor because this inline function is used elsewhere. Hence to make
   // inlining of this function possible, we must define it before its use.
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr" << be_nl;
   *cs << fname << "::ptr (void) const" << be_nl;
   *cs << "{" << be_idt_nl;
@@ -683,16 +683,16 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "}" << be_nl << be_nl;
 
   // Copy constructor.
-  *cs << fname << "::" << lname 
+  *cs << fname << "::" << lname
       << " (const ::" << interface_full_name
       << "_var &p) // copy constructor" << be_nl;
   *cs << "  : TAO_Base_var ()," << be_nl;
-  *cs << "    ptr_ (" << interface_local_name 
+  *cs << "    ptr_ (" << interface_local_name
       << "::_duplicate (p.ptr ()))" << be_nl;
   *cs << "{}" << be_nl << be_nl;
 
   // Destructor.
-  *cs << fname << "::~" << lname 
+  *cs << fname << "::~" << lname
       << " (void) // destructor" << be_nl;
   *cs << "{" << be_idt_nl;
   *cs << "CORBA::release (this->ptr_);" << be_uidt_nl;
@@ -711,7 +711,7 @@ be_interface::gen_var_impl (char *interface_local_name,
   // Assignment operator from _var.
   *cs << fname << " &" << be_nl;
   *cs << fname << "::operator= (const "
-      << "::" << interface_full_name 
+      << "::" << interface_full_name
       << "_var &p)" << be_nl;
   *cs << "{" << be_idt_nl;
   *cs << "if (this != &p)" << be_nl;
@@ -737,7 +737,7 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "}" << be_nl << be_nl;
 
   // operator->
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr" << be_nl;
   *cs << fname << "::operator-> (void) const" << be_nl;
   *cs << "{" << be_idt_nl;
@@ -745,21 +745,21 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "}" << be_nl << be_nl;
 
   // in, inout, out, and _retn
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr" << be_nl;
   *cs << fname << "::in (void) const" << be_nl;
   *cs << "{" << be_idt_nl;
   *cs << "return this->ptr_;" << be_uidt_nl;
   *cs << "}" << be_nl << be_nl;
 
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr &" << be_nl;
   *cs << fname << "::inout (void)" << be_nl;
   *cs << "{" << be_idt_nl;
   *cs << "return this->ptr_;" << be_uidt_nl;
   *cs << "}" << be_nl << be_nl;
 
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr &" << be_nl;
   *cs << fname << "::out (void)" << be_nl;
   *cs << "{" << be_idt_nl;
@@ -769,12 +769,12 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "return this->ptr_;" << be_uidt_nl;
   *cs << "}" << be_nl << be_nl;
 
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr" << be_nl;
   *cs << fname << "::_retn (void)" << be_nl;
   *cs << "{" << be_idt_nl;
   *cs << "// yield ownership of managed obj reference" << be_nl;
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr val = this->ptr_;" << be_nl;
   *cs << "this->ptr_ = ::" << interface_full_name
       << "::_nil ();" << be_nl;
@@ -782,18 +782,18 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "}" << be_nl << be_nl;
 
   // Hooks for the global static functions used by non-defined interfaces.
-  *cs << "::" << interface_full_name 
+  *cs << "::" << interface_full_name
       << "_ptr" << be_nl
       << fname << "::tao_duplicate ("
       << interface_local_name << "_ptr p)" << be_nl
       << "{" << be_idt_nl
-      << "return ::" << interface_full_name 
+      << "return ::" << interface_full_name
       << "::_duplicate (p);"
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *cs << "void" << be_nl
-      << fname << "::tao_release (" << interface_local_name 
+      << fname << "::tao_release (" << interface_local_name
       << "_ptr p)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::release (p);" << be_uidt_nl
@@ -802,18 +802,18 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "::" << interface_full_name << "_ptr" << be_nl
       << fname << "::tao_nil (void)" << be_nl
       << "{" << be_idt_nl
-      << "return ::" << interface_full_name 
+      << "return ::" << interface_full_name
       << "::_nil ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *cs << "::" << interface_full_name << "_ptr" << be_nl
       << fname << "::tao_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object *p," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "CORBA::Object *p" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return ::" << interface_full_name 
-      << "::_narrow (p, ACE_TRY_ENV);"
+      << "return ::" << interface_full_name
+      << "::_narrow (p TAO_ENV_ARG_PARAMETER);"
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -821,8 +821,8 @@ be_interface::gen_var_impl (char *interface_local_name,
       << fname << "::tao_upcast (void *src)" << be_nl
       << "{" << be_idt_nl
       << interface_local_name << " **tmp =" << be_idt_nl
-      << "ACE_static_cast (" << interface_local_name 
-      << " **, src);" 
+      << "ACE_static_cast (" << interface_local_name
+      << " **, src);"
       << be_uidt_nl
       << "return *tmp;" << be_uidt_nl
       << "}\n\n";
@@ -859,31 +859,31 @@ be_interface::gen_out_defn (char *interface_name)
   // No default constructor.
 
   // Constructor from a pointer.
-  *ch << namebuf << " (" << interface_name 
+  *ch << namebuf << " (" << interface_name
       << "_ptr &);" << be_nl;
 
   // Constructor from a _var &.
-  *ch << namebuf << " (" << interface_name 
+  *ch << namebuf << " (" << interface_name
       << "_var &);" << be_nl;
 
   // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf 
+  *ch << namebuf << " (const " << namebuf
       << " &);" << be_nl;
 
   // Assignment operator from a _out &
-  *ch << namebuf << " &operator= (const " << namebuf 
+  *ch << namebuf << " &operator= (const " << namebuf
       << " &);" << be_nl;
 
   // Assignment operator from a pointer &, cast operator, ptr fn, operator
   // -> and any other extra operators.
   // Only interface allows assignment from var &.
-  *ch << namebuf << " &operator= (const " << interface_name 
+  *ch << namebuf << " &operator= (const " << interface_name
       << "_var &);" << be_nl;
-  *ch << namebuf << " &operator= (" << interface_name 
+  *ch << namebuf << " &operator= (" << interface_name
       << "_ptr);" << be_nl;
 
   // Cast.
-  *ch << "operator " << interface_name 
+  *ch << "operator " << interface_name
       << "_ptr &();" << be_nl;
 
   // ptr fn
@@ -941,7 +941,7 @@ be_interface::gen_out_impl (char *interface_local_name,
       << be_nl << be_nl;
 
       // Constructor from a _ptr.
-  *ci << fname << "::" << lname 
+  *ci << fname << "::" << lname
       << " ("  << interface_local_name
       << "_ptr &p)" << be_nl;
   *ci << "  : ptr_ (p)" << be_nl;
@@ -951,7 +951,7 @@ be_interface::gen_out_impl (char *interface_local_name,
   *ci << "}" << be_nl << be_nl;
 
   // Constructor from _var &.
-  *ci << fname << "::" << lname 
+  *ci << fname << "::" << lname
       << " (" << interface_local_name
       << "_var &p) // constructor from _var" << be_nl;
   *ci << "  : ptr_ (p.out ())" << be_nl;
@@ -962,7 +962,7 @@ be_interface::gen_out_impl (char *interface_local_name,
   *ci << "}" << be_nl << be_nl;
 
   // Copy constructor.
-  *ci << fname << "::" << lname 
+  *ci << fname << "::" << lname
       << " (const ::" << interface_full_name
       << "_out &p) // copy constructor" << be_nl;
   *ci << "  : ptr_ (ACE_const_cast (" << interface_local_name
@@ -970,7 +970,7 @@ be_interface::gen_out_impl (char *interface_local_name,
   *ci << "{}" << be_nl << be_nl;
 
   // Assignment operator from _out &.
-  *ci << "::" << fname 
+  *ci << "::" << fname
       << " &" << be_nl;
   *ci << fname << "::operator= (const ::" << interface_full_name
       << "_out &p)" << be_nl;
@@ -1007,7 +1007,7 @@ be_interface::gen_out_impl (char *interface_local_name,
   *ci << "}" << be_nl << be_nl;
 
   // ptr function.
-  *ci << "::" << interface_full_name 
+  *ci << "::" << interface_full_name
       << "_ptr &" << be_nl;
   *ci << fname << "::ptr (void) // ptr" << be_nl;
   *ci << "{" << be_idt_nl;
@@ -1015,7 +1015,7 @@ be_interface::gen_out_impl (char *interface_local_name,
   *ci << "}" << be_nl << be_nl;
 
   // operator->
-  *ci << "::" << interface_full_name 
+  *ci << "::" << interface_full_name
       << "_ptr" << be_nl;
   *ci << fname << "::operator-> (void)" << be_nl;
   *ci << "{" << be_idt_nl;
@@ -2091,10 +2091,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req, " << be_nl
                       << "void *obj," << be_nl
-                      << "void *context," << be_nl
-                      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-                      << "TAO_default_environment ()"
-                      << be_uidt << be_uidt_nl
+                      << "void *context" << be_nl
+                      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
               else
@@ -2106,8 +2104,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
-                      << "void *context," << be_nl
-                      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+                      << "void *context" << be_nl
+                      << "TAO_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
                   *os << ancestor->full_skel_name ()
@@ -2120,8 +2118,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "req," << be_nl
                       << "(" << ancestor->full_skel_name ()
                       << "_ptr) impl," << be_nl
-                      << "context," << be_nl
-                      << " ACE_TRY_ENV" << be_uidt_nl
+                      << "context" << be_nl
+                      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}\n";
                 }
@@ -2144,10 +2142,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
-                      << "void *context," << be_nl
-                      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-                      << "TAO_default_environment ()"
-                      << be_uidt << be_uidt_nl
+                      << "void *context" << be_nl
+                      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
               else
@@ -2159,8 +2155,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
-                      << "void *context," << be_nl
-                      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+                      << "void *context" << be_nl
+                      << "TAO_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl
                       << ancestor->full_skel_name ()
@@ -2173,8 +2169,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "req," << be_nl
                       << "(" << ancestor->full_skel_name ()
                       << "_ptr) impl," << be_nl
-                      << "context," << be_nl
-                      << "ACE_TRY_ENV" << be_uidt_nl
+                      << "context" << be_nl
+                      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}\n";
                 }
@@ -2193,10 +2189,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "TAO_ServerRequest &req," << be_nl
                           << "void *obj," << be_nl
-                          << "void *context," << be_nl
-                          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-                          << "TAO_default_environment ()"
-                          << be_uidt << be_uidt_nl
+                          << "void *context" << be_nl
+                          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                           << ");" << be_uidt << "\n\n";
                     }
                   else
@@ -2209,8 +2203,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "TAO_ServerRequest &req," << be_nl
                           << "void *obj," << be_nl
-                          << "void *context," << be_nl
-                          << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+                          << "void *context" << be_nl
+                          << "TAO_ENV_ARG_DECL" << be_uidt_nl
                           << ")" << be_uidt_nl
                           << "{" << be_idt_nl
                           << ancestor->full_skel_name ()
@@ -2223,8 +2217,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "req," << be_nl
                           << "(" << ancestor->full_skel_name ()
                           << "_ptr) impl," << be_nl
-                          << "context," << be_nl
-                          << "ACE_TRY_ENV" << be_uidt_nl
+                          << "context" << be_nl
+                          << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
                           << ");" << be_uidt << be_uidt_nl
                           << "}\n";
                     }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 21520b98926..14b2c3e0490 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -87,7 +87,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << ", ACE_TRY_ENV);" << be_nl
+      << " TAO_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index 32d8a8139ae..95c4ec70e3a 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -72,7 +72,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << ", ACE_TRY_ENV);" << be_nl
+      << " TAO_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index b4a02732ddf..5854f129730 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -99,7 +99,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << ", ACE_TRY_ENV);" << be_nl
+      << " TAO_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index f5bd68ac4ca..34394aa35ac 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -53,7 +53,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
       *os << "class " << be_global->stub_export_macro ()
                 << " " << node->local_name ()
                 << " : public CORBA::UserException" << be_nl;
-      *os << "{" << be_nl 
+      *os << "{" << be_nl
           << "public:" << be_idt_nl;
 
       // Generate code for field members.
@@ -85,12 +85,12 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
 
       *os << "virtual void _raise (void);\n" << be_nl
           << "virtual void _tao_encode (" << be_idt << be_idt_nl
-          << "TAO_OutputCDR &," << be_nl
-          << "CORBA::Environment &" << be_uidt_nl
+          << "TAO_OutputCDR &" << be_nl
+          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ") const;" << be_uidt_nl << be_nl
           << "virtual void _tao_decode (" << be_idt << be_idt_nl
-          << "TAO_InputCDR &," << be_nl
-          << "CORBA::Environment &" << be_uidt_nl
+          << "TAO_InputCDR &" << be_nl
+          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << "static " << node->local_name ()
           << " *_downcast (CORBA::Exception *);\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index dba0df31fe6..4f0f566a82e 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -62,7 +62,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
       // Default constructor.
       *os << "// Default constructor." << be_nl;
-      *os << node->name () << "::" << node->local_name () 
+      *os << node->name () << "::" << node->local_name ()
           << " (void)" << be_nl;
       *os << "  : CORBA_UserException (\""
           << node->repoID () << "\")\n";
@@ -70,9 +70,9 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "}" << be_nl << be_nl;
 
       // Destructor.
-      *os << "// Destructor - all members are of self managing types." 
+      *os << "// Destructor - all members are of self managing types."
           << be_nl;
-      *os << node->name () << "::~" << node->local_name () 
+      *os << node->name () << "::~" << node->local_name ()
           << " (void)" << be_nl;
       *os << "{" << be_nl;
       *os << "}" << be_nl << be_nl;
@@ -80,7 +80,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       if (!node->is_local ())
         {
           *os << "void "
-              << node->name () 
+              << node->name ()
               << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
               << "{" << be_idt_nl
               << node->local_name () << " *tmp = ACE_static_cast ("
@@ -145,7 +145,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_exception_cs::"
                              "visit_exception -"
-                             "codegen for scope failed\n"), 
+                             "codegen for scope failed\n"),
                             -1);
         }
 
@@ -181,9 +181,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
       if (!node->is_local ())
         {
-          *os << "TAO_OutputCDR &cdr," << be_nl
-              << "CORBA::Environment &ACE_TRY_ENV"
-              << be_uidt_nl
+          *os << "TAO_OutputCDR &cdr" << be_nl
+              << "TAO_ENV_ARG_DECL" << be_uidt_nl
               << ") const" << be_uidt_nl
               << "{" << be_idt_nl
               << "if (cdr << *this)" << be_idt_nl
@@ -204,9 +203,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
         }
       else
         {
-          *os << "TAO_OutputCDR &," << be_nl
-              << "CORBA::Environment &ACE_TRY_ENV"
-              << be_uidt_nl
+          *os << "TAO_OutputCDR &" << be_nl
+              << "TAO_ENV_ARG_DECL" << be_uidt_nl
               << ") const" << be_uidt_nl
               << "{" << be_idt_nl;
 
@@ -227,9 +225,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
       if (!node->is_local ())
         {
-          *os << "TAO_InputCDR &cdr," << be_nl
-              << "CORBA::Environment &ACE_TRY_ENV"
-              << be_uidt_nl
+          *os << "TAO_InputCDR &cdr" << be_nl
+              << "TAO_ENV_ARG_DECL" << be_uidt_nl
               << ")" << be_uidt_nl
               << "{" << be_idt_nl
               << "if (cdr >> *this)" << be_idt_nl
@@ -250,9 +247,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
         }
       else
         {
-          *os << "TAO_InputCDR &," << be_nl
-              << "CORBA::Environment &ACE_TRY_ENV"
-              << be_uidt_nl
+          *os << "TAO_InputCDR &" << be_nl
+              << "TAO_ENV_ARG_DECL" << be_uidt_nl
               << ")" << be_uidt_nl
               << "{" << be_idt_nl;
 
@@ -293,7 +289,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "(%N:%l) be_visitor_exception::"
                                  "visit_exception - "
-                                 "codegen for ctor failed\n"), 
+                                 "codegen for ctor failed\n"),
                                 -1);
             }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index a2f1fa28343..0bb05a544bb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -25,34 +25,36 @@ be_visitor_amh_interface_ss::~be_visitor_amh_interface_ss (void)
 {
 }
 
-void 
+void
 be_visitor_amh_interface_ss::this_method (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   // the _this () operation
   const char *non_amh_name = node->full_name () + 4;
 
-  *os << non_amh_name << "*" << be_nl  
+  *os << non_amh_name << "*" << be_nl
       << node->full_skel_name ()
-      << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl
+      << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_nl // idt = 1
-      << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
+      << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl;
 }
 
-void 
+void
 be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   // now the dispatch method
   *os << "void " << node->full_skel_name () <<
     "::_dispatch (TAO_ServerRequest &req, " <<
-    "void *context, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
+    "void *context TAO_ENV_ARG_DECL)" << be_nl;
   *os << "{" << be_idt_nl;
   // @todo ACE_TRY_ENV without check;
-  *os << "this->asynchronous_upcall_dispatch (req, context, this, ACE_TRY_ENV);" << be_nl;
+  *os << "this->asynchronous_upcall_dispatch" << be_idt_nl
+      << " (req, context, this TAO_ENV_ARG_PARAMETER);" << be_uidt_nl;
   *os << "this->asynchronous_upcall_reply (req);" << be_uidt_nl;
   *os << "}" << be_nl;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index cf7ef251b88..5b8e64e50c2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -82,7 +82,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
           << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
           << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-          << ", ACE_TRY_ENV);" << be_nl
+          << " TAO_ENV_ARG_PARAMETER);" << be_nl
           << "ACE_TRY_CHECK;" << be_nl << be_nl
           << "if (!result)" << be_idt_nl
           << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
index 923c51e2978..441b3330a6f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
@@ -47,8 +47,8 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (be_interface *node)
       << "select_proxy ("
       << be_idt << be_idt_nl;
 
-  *os << node->local_name () << " *object," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
+  *os << node->local_name () << " *object" << be_nl
+      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ") = 0;"
       << be_uidt_nl  // idt = 1
       << be_uidt_nl; // idt = 0
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index da043c51de2..f8fc999e4a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -41,8 +41,8 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 {
   // No CDR operations for local interfaces.
   // already generated and/or we are imported. Don't do anything.
-  if (node->cli_stub_cdr_op_gen () 
-      || node->imported () 
+  if (node->cli_stub_cdr_op_gen ()
+      || node->imported ()
       || node->is_local ())
     {
       return 0;
@@ -90,8 +90,8 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
   *os << "_tao_objref =" << be_idt_nl
       << node->full_name () << "::_unchecked_narrow ("
       << be_idt << be_idt_nl
-      << "obj.in ()," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "obj.in ()" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl;
   *os << "ACE_TRY_CHECK;" << be_nl;
   *os << "return 1;" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
index 3454a46ca23..d16bf1fd7ed 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
@@ -99,8 +99,8 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
 
   *os << "virtual CORBA::Boolean _is_a" << be_idt
       << "(" << be_idt_nl
-      << "const CORBA::Char *logical_type_id," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
+      << "const CORBA::Char *logical_type_id" << be_nl
+      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);\n"
@@ -118,7 +118,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
 
   *os << "virtual CORBA::Boolean _non_existent" << be_idt
       << "(" << be_idt_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
index 7604309251f..0d87db8e818 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
@@ -104,11 +104,12 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::DIRECT) << "::"
       << "_is_a"  << be_idt
       << "(" << be_idt_nl
-      << "const CORBA::Char *logical_type_id," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "const CORBA::Char *logical_type_id" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl;
   *os << "{" << be_idt_nl
-      << "return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);" << be_uidt_nl
+      << "return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);"
+      << be_uidt_nl
       << "}\n\n" << be_uidt_nl;
 
   // Generate _tao_QueryInterface implementation
@@ -154,10 +155,11 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::DIRECT) << "::"
       << "_non_existent"  << be_idt
       << "(" << be_idt_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl;
   *os << "{" << be_idt_nl
-      << "return this->servant_->_non_existent (ACE_TRY_ENV);" << be_uidt_nl
+      << "return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << be_uidt_nl
       << "}\n\n" << be_uidt_nl;
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index a2899ee801f..83db743a1d5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -52,7 +52,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // == STEP 1:  generate the class name and class names we inherit ==
 
       // Generate the ifdefined macro for  the _ptr type.
-      os->gen_ifdef_macro (node->flat_name (), 
+      os->gen_ifdef_macro (node->flat_name (),
                            "_ptr");
 
 
@@ -62,7 +62,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // Forward declaration.
       *os << "class " << node->local_name () << ";" << be_nl;
       // Generate the _ptr declaration.
-      *os << "typedef " << node->local_name () << " *" 
+      *os << "typedef " << node->local_name () << " *"
           << node->local_name () << "_ptr;" << be_nl;
 
       os->gen_endif ();
@@ -76,14 +76,14 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_interface_ch::"
                              "visit_interface - "
-                             "codegen for _var failed\n"), 
+                             "codegen for _var failed\n"),
                             -1);
         }
 
       os->gen_endif ();
 
       // Generate the ifdef macro for the _out class.
-      os->gen_ifdef_macro (node->flat_name (), 
+      os->gen_ifdef_macro (node->flat_name (),
                            "_out");
 
       // Generate the _out declaration.
@@ -100,7 +100,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     }
 
   // The above code could have been executed by the forward declaration
-  // as long as it wasn't imported. The code below can only be 
+  // as long as it wasn't imported. The code below can only be
   // executed by an interface definition, also non-imported.
   if (node->imported ())
     {
@@ -117,7 +117,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << "class " << node->base_proxy_impl_name () << ";" << be_nl
           << "class " << node->remote_proxy_impl_name () << ";" << be_nl
           << "class " << node->base_proxy_broker_name () << ";" << be_nl
-          << "class " << node->remote_proxy_broker_name () << ";" 
+          << "class " << node->remote_proxy_broker_name () << ";"
           << be_nl << be_nl;
     }
 
@@ -133,10 +133,10 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
       for (i = 0; i < node->n_inherits (); i++)
         {
-          *os << "public virtual " 
+          *os << "public virtual "
               << node->inherits ()[i]->name ();
 
-          if (i < node->n_inherits () - 1) 
+          if (i < node->n_inherits () - 1)
             {
               // Node has multiple inheritance, so put a comma.
               *os << "," << be_nl;
@@ -161,9 +161,9 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // but we must protect against certain versions of g++.
       << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
       << be_idt_nl
-      << "typedef " << node->local_name () << "_ptr _ptr_type;" 
+      << "typedef " << node->local_name () << "_ptr _ptr_type;"
       << be_nl
-      << "typedef " << node->local_name () << "_var _var_type;" 
+      << "typedef " << node->local_name () << "_var _var_type;"
       << be_uidt_nl
       << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n" << be_idt_nl;
 
@@ -176,20 +176,16 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       << node->local_name () << "_ptr obj);" << be_nl << be_nl
       << "static " << node->local_name () << "_ptr "
       << "_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "TAO_default_environment ()"
-      << be_uidt << be_uidt_nl
+      << "CORBA::Object_ptr obj" << be_nl
+      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
-  // There's no need for an _unchecked_narrow for locality 
+  // There's no need for an _unchecked_narrow for locality
   // constrained object.
   *os << "static " << node->local_name () << "_ptr "
       << "_unchecked_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "TAO_default_environment ()"
-      << be_uidt << be_uidt_nl
+      << "CORBA::Object_ptr obj" << be_nl
+      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // This method is defined in the header file to workaround old
@@ -222,10 +218,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   if (! node->is_local ())
     {
       *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-          << "const CORBA::Char *type_id, " << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-          << "TAO_default_environment ()"
-          << be_uidt << be_uidt_nl
+          << "const CORBA::Char *type_id" << be_nl
+          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl;
     }
 
@@ -241,7 +235,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       // Add the Proxy Broker member variable.
       *os << "private:" << be_idt_nl
-          << node->base_proxy_broker_name () << " *" 
+          << node->base_proxy_broker_name () << " *"
           << "the" << node->base_proxy_broker_name ()
           << "_;" << be_nl <<  be_uidt_nl;
     }
@@ -253,14 +247,14 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // Generate the "protected" constructor so that users cannot
       // instantiate us.
 
-      *os << node->local_name () << " (int collocated = 0);" 
+      *os << node->local_name () << " (int collocated = 0);"
           << be_nl << be_nl;
 
-      *os << "// These methods travese the inheritance tree and set the" 
+      *os << "// These methods travese the inheritance tree and set the"
           << be_nl
-          << "// parents piece of the given class in the right mode" 
+          << "// parents piece of the given class in the right mode"
           << be_nl
-          << "virtual void " << node->flat_name () 
+          << "virtual void " << node->flat_name ()
           << "_setup_collocation (int collocated);" << be_nl << be_nl;
     }
   else
@@ -278,21 +272,21 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << ");" << be_uidt_nl << be_nl;
 
       // Friends declarations.
-      *os << "friend class " << node->remote_proxy_impl_name () << ";" 
+      *os << "friend class " << node->remote_proxy_impl_name () << ";"
           << be_nl
-          << "friend class " << node->thru_poa_proxy_impl_name () << ";" 
+          << "friend class " << node->thru_poa_proxy_impl_name () << ";"
           << be_nl
-          << "friend class " << node->direct_proxy_impl_name () << ";" 
+          << "friend class " << node->direct_proxy_impl_name () << ";"
           << be_nl << be_nl;
     }
   // Protected destructor.
-  *os << "virtual ~" << node->local_name () << " (void);" 
+  *os << "virtual ~" << node->local_name () << " (void);"
       << be_uidt_nl << be_nl;
 
   // private copy constructor and assignment operator. These are not
   // allowed, hence they are private.
   *os << "private:" << be_idt_nl;
-  *os << node->local_name () << " (const " 
+  *os << node->local_name () << " (const "
       << node->local_name () << " &);"
       << be_nl
       << "void operator= (const " << node->local_name () << " &);";
@@ -401,7 +395,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
                              "(%N:%l) be_visitor_interface_ch::"
                              "visit_interface - "
                              "TypeCode declaration failed\n"
-                             ), 
+                             ),
                             -1);
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 3b723153df6..ee94c701bab 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -63,23 +63,23 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Initialize the static narrrowing helper variable.
-  *os << "int " << node->full_name () << "::_tao_class_id = 0;" 
+  *os << "int " << node->full_name () << "::_tao_class_id = 0;"
       << be_nl << be_nl;
 
   // Global functions to allow non-defined forward declared interfaces
   // access to some methods in the full definition.
   *os << node->full_name () << "_ptr" << be_nl
-      << "tao_" << node->flat_name () 
+      << "tao_" << node->flat_name ()
       << "_duplicate (" << be_idt << be_idt_nl
       << node->full_name () << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return " << node->full_name () 
+      << "return " << node->full_name ()
       << "::_duplicate (p);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "void" << be_nl
-      << "tao_" << node->flat_name () 
+      << "tao_" << node->flat_name ()
       << "_release (" << be_idt << be_idt_nl
       << node->full_name () << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -88,35 +88,35 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "}" << be_nl << be_nl;
 
   *os << node->full_name () <<  "_ptr" << be_nl
-      << "tao_" << node->flat_name () 
+      << "tao_" << node->flat_name ()
       << "_nil (" << be_idt << be_idt_nl
       << "void" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return " << node->full_name () 
+      << "return " << node->full_name ()
       << "::_nil ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << node->full_name () << "_ptr" << be_nl
-      << "tao_" << node->flat_name () 
+      << "tao_" << node->flat_name ()
       << "_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object *p," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "CORBA::Object *p" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return " << node->full_name () 
-      << "::_narrow (p, ACE_TRY_ENV);" 
+      << "return " << node->full_name ()
+      << "::_narrow (p TAO_ENV_ARG_PARAMETER);"
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "CORBA::Object *" << be_nl
-      << "tao_" << node->flat_name () 
+      << "tao_" << node->flat_name ()
       << "_upcast (" << be_idt << be_idt_nl
       << "void *src" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << node->full_name () << " **tmp =" << be_idt_nl
-      << "ACE_static_cast (" << node->full_name () 
+      << "ACE_static_cast (" << node->full_name ()
       << " **, src);" << be_uidt_nl
       << "return *tmp;" << be_uidt_nl
       << "}" << be_nl << be_nl;
@@ -241,7 +241,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "else" << be_idt_nl
           << "this->the" << node->base_proxy_broker_name ()
           << "_ =" << be_idt_nl
-          << "::" << node->full_remote_proxy_broker_name () 
+          << "::" << node->full_remote_proxy_broker_name ()
           << "::the" << node->remote_proxy_broker_name ()
           << " ();" << be_uidt << be_uidt;
 
@@ -284,7 +284,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   if (! node->is_local ())
     {
       *os << "void "
-          << node->name () 
+          << node->name ()
           << "::_tao_any_destructor (void *_tao_void_pointer)" << be_nl
           << "{" << be_idt_nl
           << node->local_name () << " *tmp = ACE_static_cast ("
@@ -297,8 +297,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << node->full_name () << "_ptr " << node->full_name ()
       << "::_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "CORBA::Object_ptr obj" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -313,7 +313,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << "if (! obj->_is_local ())" << be_idt_nl
           << "{" << be_idt_nl
           << "CORBA::Boolean is_a = obj->_is_a (\""
-          << node->repoID () << "\", ACE_TRY_ENV);" << be_nl
+          << node->repoID () << "\" TAO_ENV_ARG_PARAMETER);" << be_nl
           << "ACE_CHECK_RETURN (" << bt->nested_type_name (this->ctx_->scope ())
           << "::_nil ());" << be_nl
           << "if (is_a == 0)" << be_idt_nl
@@ -323,15 +323,15 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
 
   *os << "return " << bt->nested_type_name (this->ctx_->scope ())
-      << "::_unchecked_narrow (obj, ACE_TRY_ENV);" << be_uidt_nl
+      << "::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // The _unchecked_narrow method
 
   *os << node->full_name () << "_ptr " << node->full_name ()
       << "::_unchecked_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &" << be_uidt_nl
+      << "CORBA::Object_ptr obj" << be_nl
+      << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (CORBA::is_nil (obj))" << be_idt_nl
@@ -367,7 +367,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << be_idt_nl   // 1 idt
           << "ACE_NEW_RETURN (" << be_idt << be_idt_nl  // 2 idt
           << "default_proxy," << be_nl
-          << "::" <<  bt->name () 
+          << "::" <<  bt->name ()
           << " (" << be_idt << be_idt_nl  // 3 idt
           << "stub," << be_nl
           << "1," << be_nl
@@ -388,7 +388,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "stub," << be_nl
           << "0," << be_nl
           << "obj->_servant ()" << be_uidt_nl
-          << ")," << be_uidt_nl 
+          << ")," << be_uidt_nl
           << bt->nested_type_name (this->ctx_->scope ())
           << "::_nil ()" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
@@ -422,7 +422,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "ACE_reinterpret_cast" << be_idt_nl
       << "(" << be_idt_nl
       << "ptr_arith_t," << be_nl
-      << "&" << node->local_name () 
+      << "&" << node->local_name ()
       << "::_tao_class_id" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
       << ")" << be_uidt << be_uidt << be_uidt_nl
@@ -446,9 +446,9 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   if (! node->is_local ())
     {
       os->indent ();
-      *os << "CORBA::Boolean " << node->full_name () 
-          << "::_is_a (" 
-          << "const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)" 
+      *os << "CORBA::Boolean " << node->full_name ()
+          << "::_is_a ("
+          << "const CORBA::Char *value TAO_ENV_ARG_DECL)"
           << be_nl
           << "{\n";
 
@@ -471,7 +471,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << "  return 1; // success using local knowledge\n";
       os->decr_indent ();
       *os << "else" << be_nl;
-      *os << "  return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);\n";
+      *os << "  return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);\n";
       os->decr_indent ();
       *os << "}\n\n";
     }
@@ -505,7 +505,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "::_interface_repository_id (void) const"
       << be_nl
       << "{" << be_idt_nl
-      << "return \"" << node->repoID () 
+      << "return \"" << node->repoID ()
       << "\";" << be_uidt_nl
       << "}\n\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index ee2960285c1..b413bbeddd2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -91,7 +91,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   if (be_global->gen_thru_poa_collocation ()
       || be_global->gen_direct_collocation ())
     {
-      *os << "class " << node->strategized_proxy_broker_name () 
+      *os << "class " << node->strategized_proxy_broker_name ()
           << ";" << be_nl;
     }
 
@@ -107,7 +107,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
     {
       for (i = 0; i < n_parents; ++i)
         {
-          *os << "public virtual " << "POA_" 
+          *os << "public virtual " << "POA_"
               << node->inherits ()[i]->name ();
 
           if (i < n_parents - 1)
@@ -134,10 +134,8 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "virtual ~" << namebuf << " (void);\n\n"
       << be_nl
       << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-      << "const char* logical_type_id," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "TAO_default_environment ()"
-      << be_uidt << be_uidt_nl
+      << "const char* logical_type_id" << be_nl
+      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
@@ -148,32 +146,31 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV"
-      << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
-      << "void *_servant_upcall," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void *_servant_upcall" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   this->this_method (node);
@@ -235,14 +232,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       ctx.state (TAO_CodeGen::TAO_INTERFACE_STRATEGIZED_PROXY_BROKER_SH);
       visitor = tao_cg->make_visitor (&ctx);
       if (node->accept (visitor) == -1)
-	      {
-	        delete visitor;
-	        ACE_ERROR_RETURN ((LM_ERROR,
-			           "be_visitor_interface_sh::"
-			           "visit_interface - "
-			           "codegen for thru_poa_collocated class failed\n"),
-			          -1);
-	      }
+              {
+                delete visitor;
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "be_visitor_interface_sh::"
+                                   "visit_interface - "
+                                   "codegen for thru_poa_collocated class failed\n"),
+                                  -1);
+              }
 
       delete visitor;
     }
@@ -304,8 +301,6 @@ be_visitor_interface_sh::this_method (be_interface *node)
 
   // Print out the _this() method.
   *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "TAO_default_environment ()"
-      << be_uidt << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 41c17065d78..0470519da3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -267,8 +267,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "::_is_a_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
-      << "void * /* Servant_Upcall */," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void * /* Servant_Upcall */" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << be_nl;
@@ -281,7 +281,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     *os << "throw CORBA::MARSHAL ();" << be_uidt_nl << be_nl;
   else
     *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
-  *os << "_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);" << be_nl;
+  *os << "_tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);" << be_nl;
   *os << "ACE_CHECK;" << be_nl << be_nl;
   *os << "_tao_server_request.init_reply ();" << be_nl;
   *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
@@ -298,13 +298,13 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "::_non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
-      << "void * /* Servant_Upcall */," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void * /* Servant_Upcall */" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << node->full_skel_name () << " *_tao_impl = ("
       << node->full_skel_name () << " *) _tao_object_reference;" << be_nl;
-  *os << "CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);" << be_nl;
+  *os << "CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl;
   *os << "ACE_CHECK;" << be_nl << be_nl;
   *os << "_tao_server_request.init_reply ();" << be_nl;
   *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
@@ -320,8 +320,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "::_interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
-      << "void * /* Servant_Upcall */," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void * /* Servant_Upcall */" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << node->full_skel_name () << " *_tao_impl = ("
@@ -339,7 +339,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "}" << be_uidt_nl << be_nl;
   *os << "ACE_TRY" << be_idt_nl
       << "{" << be_idt_nl
-      << "_tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);" << be_nl
+      << "_tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "_tao_server_request.init_reply ();" << be_nl << be_nl
       << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();"
@@ -365,11 +365,11 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   os->indent ();
   *os << "CORBA::Boolean " << node->full_skel_name ()
       << "::_is_a (" << be_idt << be_idt_nl
-      << "const char* value," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "const char* value" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);" << be_nl
+      << "const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl
       << "if (\n" << be_idt;
   if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
@@ -516,9 +516,9 @@ be_visitor_interface_ss::this_method (be_interface *node)
   // the _this () operation
   *os << node->full_name () << "*" << be_nl
       << node->full_skel_name ()
-      << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl
+      << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_nl // idt = 1
-      << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
+      << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl << be_nl;
 }
@@ -531,13 +531,13 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
   // now the dispatch method
   *os << "void " << node->full_skel_name () <<
     "::_dispatch (TAO_ServerRequest &req, " <<
-    "void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
+    "void *servant_upcall TAO_ENV_ARG_DECL)" << be_nl;
   *os << "{" << be_idt_nl;
   //BRT
   *os << "this->synchronous_upcall_dispatch (req," << be_nl
       << "                                   servant_upcall," << be_nl
-      << "                                   this," << be_nl
-      << "                                   ACE_TRY_ENV);" << be_uidt_nl;
+      << "                                   this" << be_nl
+      << "                                   TAO_ENV_ARG_PARAMETER);" << be_uidt_nl;
   //  *os << "TAO_Skeleton skel; // pointer to skeleton for operation" << be_nl;
 //  *os << "const char *opname = req.operation (); // retrieve operation name"
 //      << be_nl;
@@ -552,6 +552,6 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
 //  *os << be_uidt_nl;
 //  *os << "}" << be_nl;
 //  *os << "else" << be_idt_nl;
-//  *os << "skel (req, this, context, ACE_TRY_ENV);" << be_uidt << be_uidt_nl;
+//  *os << "skel (req, this, context TAO_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl;
   *os << "}" << be_nl << be_nl;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
index b135e329f6c..61e98a47572 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
@@ -51,8 +51,8 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (be_interface *node
   *os << "virtual " << node->base_proxy_impl_name () << " &" << "select_proxy ("
       << be_idt << be_idt_nl;
 
-  *os << node->local_name () << " *object," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
+  *os << node->local_name () << " *object" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
   *os << "private:" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
index 8488bf1c1a2..717fb8d85e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
@@ -43,13 +43,13 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (be_interface *node
 
   // Generate the proxy broker factory function pointer definition.
   *os << node->full_base_proxy_broker_name () << " * (*"
-      << node->flat_client_enclosing_scope () 
-      << node->base_proxy_broker_name () 
-	    << "_Factory_function_pointer) ("
-      << be_idt << be_idt_nl 
+      << node->flat_client_enclosing_scope ()
+      << node->base_proxy_broker_name ()
+            << "_Factory_function_pointer) ("
+      << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj" << be_uidt_nl
       << ") = 0;" << be_uidt_nl << be_nl;
- 
+
   *os << "// Factory Member function Implementation." << be_nl
       << node->full_remote_proxy_broker_name () << " *" << be_nl
       << node->full_remote_proxy_broker_name () << "::the"
@@ -76,8 +76,8 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (be_interface *node
   *os << node->full_base_proxy_impl_name () << "&" << be_nl
       <<node->full_remote_proxy_broker_name () << "::"
       << "select_proxy (" << be_idt_nl
-      << "::" << node->full_name () << " *," << be_nl
-      << "CORBA::Environment &" << be_uidt_nl << ")"
+      << "::" << node->full_name () << " *" << be_nl
+      << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")"
       << be_uidt_nl << "{" << be_idt_nl // idt = 1
       << "return this->remote_proxy_impl_;"
       << be_uidt_nl << "}" << be_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index 7f168dea521..f94b49ace25 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -66,8 +66,8 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "public:" << be_idt_nl << be_nl
           << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory (int permanent = 1);"
-          << be_nl 
-          <<"// <permanent> signifies that the proxy factory will remain" <<be_nl 
+          << be_nl
+          <<"// <permanent> signifies that the proxy factory will remain" <<be_nl
           <<"// registered with the Proxy Factory Adapter until the program"<<be_nl
           <<"// terminates. That is, it will be a one-shot factory for the "<<be_nl
           <<"// interface.  If this value is set to 0, then the factory will"<<be_nl
@@ -79,9 +79,8 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "virtual "<< node->local_name ()
           << "_ptr create_proxy (" << be_idt << be_idt_nl
           << node->local_name ()
-          << "_ptr proxy," << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-          << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+          << "_ptr proxy" << be_nl
+          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "};\n\n";
 
@@ -94,19 +93,16 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "_Proxy_Factory_Adapter, TAO_SYNCH_RECURSIVE_MUTEX>;" << be_nl << be_nl
           << "int register_proxy_factory (" << be_idt << be_idt_nl
           << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl
-          << "int one_shot_factory = 1,"<<be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-          << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+          << "int one_shot_factory = 1" << be_nl
+          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << "int unregister_proxy_factory (" << be_idt << be_idt_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-          << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+          << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << node->local_name ()
           << "_ptr create_proxy (" << be_idt << be_idt_nl
-          << node->local_name () << "_ptr proxy," << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-          << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+          << node->local_name () << "_ptr proxy" << be_nl
+          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl << be_nl
           << "protected:" << be_idt_nl
           << "TAO_" << node->flat_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index a87c910f902..6fefb52088a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_interface.h"
 
@@ -100,8 +100,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
-          << "_ptr proxy," << be_nl
-          << "CORBA::Environment &" << be_uidt_nl
+          << "_ptr proxy" << be_nl
+          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return proxy;" << be_uidt << be_uidt_nl
@@ -150,15 +150,15 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "_Proxy_Factory_Adapter::register_proxy_factory (" << be_idt_nl
           << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory *df," << be_idt_nl
-          << " int one_shot_factory,"<<be_nl
-          << " CORBA::Environment &ACE_TRY_ENV" << be_idt_nl
+          << " int one_shot_factory" << be_nl
+          << " TAO_ENV_ARG_DECL" << be_idt_nl
           << ")" << be_uidt << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
           << "TAO_SYNCH_RECURSIVE_MUTEX, ace_mon," << be_idt_nl
           << "this->lock_, 0));" <<be_uidt_nl
           << "// Remove any existing <proxy_factory_> and replace with the new one."<<be_nl
-          << "this->unregister_proxy_factory (ACE_TRY_ENV);" << be_nl
+          << "this->unregister_proxy_factory (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl
           << "ACE_CHECK_RETURN (-1);" << be_nl
           << "this->proxy_factory_ = df;"<< be_nl
           << "this->one_shot_factory_ = one_shot_factory;" << be_uidt << be_uidt_nl
@@ -175,7 +175,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::unregister_proxy_factory (" << be_idt_nl
-          << "CORBA::Environment &" << be_idt_nl
+          << "TAO_ENV_SINGLE_ARG_DECL_NOT_USED" << be_idt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
@@ -204,8 +204,8 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
-          << "_ptr proxy," << be_nl
-          << "CORBA::Environment &" << be_uidt_nl
+          << "_ptr proxy" << be_nl
+          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
@@ -293,7 +293,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
         *os << "::";
 
       *os <<  "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"
-	  << "get_proxy (void)" << be_idt_nl
+          << "get_proxy (void)" << be_idt_nl
           << be_uidt_nl;
 
       *os << "{" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index e26407dc218..6a861bcbacc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -47,16 +47,16 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface
   // Accessor Method
   *os << "virtual " << "::" << node->full_base_proxy_impl_name () << " &" << "select_proxy (" << be_idt_nl;
 
-  *os << "::" << node->full_name () << " *object," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
+  *os << "::" << node->full_name () << " *object" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
 
   *os << "private:" << be_idt_nl
       << "// Helper methods that takes care to create the proxy" << be_nl
       << "// as soon as their use is necessary." << be_nl
-      << "void create_proxy (" << be_idt_nl << "int collocation_strategy,"
-      << be_nl << "CORBA::Environment &ACE_TRY_ENV"
+      << "void create_proxy (" << be_idt_nl << "int collocation_strategy"
+      << be_nl << "TAO_ENV_ARG_DECL"
       << be_uidt_nl << ");"
       << be_nl << be_nl
       << "// Caches the proxy implementations. The proxy implementation" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index d92f677b77b..e16ab575100 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -69,8 +69,8 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       <<node->full_strategized_proxy_broker_name () << "::"
       << "select_proxy ("
       << be_idt << be_idt_nl // idt = 2
-      << "::" << node->full_name () << " *object," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV"
+      << "::" << node->full_name () << " *object" << be_nl
+      << "TAO_ENV_ARG_DECL"
       << be_uidt_nl // idt = 1
       << ")"
       << be_uidt_nl // idt = 0
@@ -78,7 +78,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       << be_idt_nl // idt = 1
       << "int strategy ="
       << be_idt_nl // idt = 2
-      << "TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);"
+      << "TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);"
       << be_nl
       << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);"
       << be_uidt_nl << be_nl // idt = 1
@@ -86,7 +86,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       << be_idt_nl // idt = 2
       << "return *this->proxy_cache_[strategy];"
       << be_uidt_nl << be_nl // idt = 1
-      << "this->create_proxy (strategy, ACE_TRY_ENV);"
+      << "this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);"
       << be_nl
       << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);"
       << be_nl << be_nl
@@ -99,9 +99,9 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       <<node->full_strategized_proxy_broker_name () << "::"
       << "create_proxy ("
       << be_idt << be_idt_nl // idt = 2
-      << "int strategy,"
+      << "int strategy"
       << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV"
+      << "TAO_ENV_ARG_DECL"
       << be_uidt_nl // idt = 1
       << ")"
       << be_uidt_nl // idt = 0
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
index c8be8110686..e600e2e83a4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_interface.h"
 
@@ -88,13 +88,13 @@ int be_visitor_interface_thru_poa_collocated_sh::visit_interface (be_interface *
 
   *os << "virtual CORBA::Boolean _is_a" << be_idt
       << "(" << be_idt_nl
-      << "const CORBA::Char *logical_type_id," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
+      << "const CORBA::Char *logical_type_id" << be_nl
+      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Boolean _non_existent" << be_idt
       << "(" << be_idt_nl
-      << "CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()" << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
index 511525705be..277a6ec76e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
@@ -78,8 +78,8 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::"
       << "_is_a"  << be_idt
       << "(" << be_idt_nl
-      << "const CORBA::Char *logical_type_id," << be_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "const CORBA::Char *logical_type_id" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl
       << "{" << be_idt_nl;
   *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
@@ -92,8 +92,8 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.prepare_for_upcall (" << be_idt << be_idt_nl
       << "this->_object_key ()," << be_nl
       << "\"" << "_is_a" << "\"," << be_nl
-      << "forward_to.out ()," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "forward_to.out ()" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_CHECK_RETURN (0);" << be_nl;
   *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl
@@ -101,14 +101,14 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
-      << ")->_is_a (logical_type_id, ACE_TRY_ENV);" << be_uidt << be_uidt_nl
+      << ")->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl << be_nl;
 
   // Generate _non_existent implementation.
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::"
       << "_non_existent"  << be_idt
       << "(" << be_idt_nl
-      << "CORBA_Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl
       << "{" << be_idt_nl;
   *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
@@ -121,8 +121,8 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.prepare_for_upcall (" << be_idt << be_idt_nl
       << "this->_object_key ()," << be_nl
       << "\"" << "_non_existent" << "\"," << be_nl
-      << "forward_to.out ()," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "forward_to.out ()" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_CHECK_RETURN (0);" << be_nl;
   *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl
@@ -130,7 +130,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
-      << ")->_non_existent (ACE_TRY_ENV);" << be_uidt << be_uidt_nl
+      << ")->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index 5bd2d361ed2..a785d74b43b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -69,21 +69,21 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_server_request," << be_nl
       << "void *_tao_object_reference, " << be_nl
-      << "void * /* context */, " << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void * /* context */ " << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton. However, if any of the argument
   // types is "native", we do not generate any skeleton
   // last argument - is always CORBA::Environment.
   *os << "{" << be_idt_nl;
-  
+
   *os << "// foo" << be_uidt_nl;
-  
+
   *os << "}" << be_nl << be_nl;
 
 
   // see <be_visitor_operation_ss::visit_operation> for more info
-      
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 6a4d8ca270d..dcbf01e4276 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -491,7 +491,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
       << "for (;;)" << be_nl
       << "{" << be_idt_nl;
 
-  *os << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
+  *os << "_tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl;
   // Check if there is an exception.
   // Return type is void, so we know what to generate here.
   *os << "ACE_CHECK;" << be_nl;
@@ -511,7 +511,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
 
   *os << be_nl
       << "_tao_call.prepare_header (" << be_idt << be_idt_nl
-      << "ACE_static_cast (CORBA::Octet, _tao_response_flag), ACE_TRY_ENV"
+      << "ACE_static_cast (CORBA::Octet, _tao_response_flag) TAO_ENV_ARG_PARAMETER"
       << be_uidt_nl << ");" << be_uidt << "\n";
 
   // Now make sure that we have some in and inout
@@ -555,7 +555,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
     }
 
   *os << be_nl
-      << "int _invoke_status = _tao_call.invoke (ACE_TRY_ENV);";
+      << "int _invoke_status = _tao_call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);";
 
   *os << be_uidt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
index 0ca259ce8d1..eb23efde4a1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
@@ -104,7 +104,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper
   *os << node->local_name () << "(";
 
   if (!be_global->exception_support ())
-    *os << "CORBA::Environment &ACE_TRY_ENV";
+    *os << "TAO_ENV_SINGLE_ARG_DECL";
 
   *os << ")" << be_uidt;
 
@@ -175,7 +175,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper
       << "CORBA::String_var type_id;" << be_nl << be_nl
       << "if ((_tao_in >> type_id.inout ()) == 0)" << be_nl
       << "  {" << be_nl
-      << "    // Could not demarshal the exception id, raise an local" << be_nl
+      << "    // Could not demarshal the exception id, raise a local" << be_nl
       << "    // CORBA::MARSHAL" << be_nl;
 
   if (be_global->use_raw_throw ())
@@ -213,8 +213,8 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper
     }
 
   *os << "CORBA::SystemException* exception =" << be_idt_nl
-      << "TAO_Exceptions::create_system_exception (type_id.in ()," << be_idt_nl
-      << "ACE_TRY_ENV);" << be_uidt_nl << be_uidt_nl
+      << "TAO_Exceptions::create_system_exception (type_id.in ()" << be_idt_nl
+      << "TAO_ENV_ARG_PARAMETER);" << be_uidt_nl << be_uidt_nl
       << "ACE_CHECK;" << be_nl << be_nl;
   *os << "if (exception == 0)" << be_idt_nl
       << " {" << be_idt_nl
@@ -225,12 +225,9 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper
       << "}"<< be_uidt_nl
       << "exception->minor (minor);" << be_nl
       << "exception->completed (CORBA::CompletionStatus (completion));" << be_nl
-
-      << "// @@ There should be a better way to raise this exception!" << be_nl
-      << "//    This code works for both native and emulated exceptions," << be_nl
-      << "//    but it is ugly." << be_nl
-      << "ACE_TRY_ENV.exception (exception);" << be_nl
-      << "// We can not use ACE_THROW here." << be_nl
+      << be_nl
+      << "// Raise the exception." << be_nl
+      << "TAO_ENV_RAISE (exception);" << be_nl << be_nl
       << "return;" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl;
 
@@ -271,16 +268,11 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper
               << be_uidt_nl;
         }
 
-      *os << "exception->_tao_decode (_tao_in, ACE_TRY_ENV);" << be_nl
-          << "ACE_CHECK;\n" << be_nl;
+      *os << "exception->_tao_decode (_tao_in TAO_ENV_ARG_PARAMETER);" << be_nl
+          << "ACE_CHECK;\n" << be_nl << be_nl;
 
-      *os << "// @@ There should be a better way to raise this exception!"
-          << be_nl
-          << "//    This code works for both native and emulated exceptions,"
-          << be_nl
-          << "//    but it is ugly." << be_nl
-          << "ACE_TRY_ENV.exception (exception); // Can't use ACE_THROW here."
-          << be_nl
+      *os << "// Raise the exception." << be_nl
+          << "TAO_ENV_RAISE (exception);" << be_nl << be_nl
           << "return;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
index af3aee2ba65..e5a8b2c763a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
@@ -20,9 +20,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_operation.h"
 
@@ -79,9 +79,8 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (be_op
           << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
           << "CORBA::ULong reply_status";
 
-      *os << "," << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-          << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+      *os << be_nl
+          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl;
     }
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index adc5ab34af2..7dd81cff066 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -112,8 +112,8 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
       << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
       << "CORBA::ULong reply_status";
 
-  *os << "," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV";
+  *os << be_nl
+      << "TAO_ENV_ARG_DECL";
 
   *os << ")" << be_uidt << be_uidt_nl;
 
@@ -148,7 +148,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
       << "_tao_reply_handler_object =" << be_idt_nl;
 
   *os << parent->full_name ();
-  *os << "::_narrow(_tao_reply_handler, ACE_TRY_ENV);" << be_uidt_nl;
+  *os << "::_narrow(_tao_reply_handler TAO_ENV_ARG_PARAMETER);" << be_uidt_nl;
 
   *os << "ACE_CHECK;" << be_nl << be_nl
       << "// Exception handling" << be_nl
@@ -249,7 +249,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
 
   if (!be_global->exception_support ())
     {
-      *os << "," << be_nl << "ACE_TRY_ENV";
+      *os << " TAO_ENV_ARG_PARAMETER";
     }
 
   *os << be_uidt_nl << ");" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index e2cca6d452f..f204460fb8a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -50,14 +50,17 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
   *os << " (" << be_idt // idt = 1
       << be_idt_nl; // idt = 2
 
+  bool arg_emitted = false;
+
   switch (this->ctx_->state ())
     {
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_BASE_PROXY_IMPL_CH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XS:
       *os << "CORBA_Object *_collocated_tao_target_";
-      if (node->argument_count () > 0 || !be_global->exception_support () )
+      if (node->argument_count () > 0)
         *os << "," << be_nl;
+      arg_emitted = true;
       break;
 
     default:
@@ -77,11 +80,10 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
   // generate the CORBA::Environment parameter for the alternative mapping
   if (!be_global->exception_support ())
     {
-      // if the operation node has parameters, then we need to insert a comma
-      if (node->argument_count () > 0)
-        {
-          *os << "," << be_nl;
-        }
+      // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on
+      // whether the operation node has parameters.
+      const char *env_decl = (arg_emitted || node->argument_count () > 0 ?
+                              " TAO_ENV_ARG_DECL" : "TAO_ENV_SINGLE_ARG_DECL");
 
       switch (this->ctx_->state ())
         {
@@ -89,20 +91,17 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
           // last argument - is always CORBA::Environment
-          *os << "CORBA::Environment &ACE_TRY_ENV";
-          *os << " = " << be_idt_nl
-              << "TAO_default_environment ()"
-              << be_uidt;
+          *os << env_decl << "_WITH_DEFAULTS";
           break;
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH:
         case TAO_CodeGen::TAO_OPERATION_ARGLIST_BASE_PROXY_IMPL_CH:
           // last argument - is always CORBA::Environment
-          *os << "CORBA::Environment &ACE_TRY_ENV";
+          *os << env_decl;
           break;
         default:
-          *os << "CORBA::Environment &ACE_TRY_ENV";
+          *os << env_decl;
           break;
         }
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index 606aeb110d7..26aafed725a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -94,14 +94,12 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
         case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS:
           // applicable only to these cases where the actual upcall is made
 
+          // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on
+          // whether the operation node has parameters.
           if (node->argument_count () > 0)
-            {
-              // insert a comma only if there were previous parameters
-              *os << "," << be_nl;
-            }
-
-          // last argument is the environment
-          *os << "ACE_TRY_ENV";
+            *os << " TAO_ENV_ARG_PARAMETER";
+          else
+            *os << "TAO_ENV_SINGLE_ARG_PARAMETER";
           break;
         default:
           break;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp
index 8ac8311b525..c4189a301f2 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp
@@ -73,31 +73,23 @@ be_visitor_operation_interceptors_arglist::visit_operation (be_operation *node)
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CS:
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SS:
           {
-            // if the operation node has parameters, then we need to insert a comma
-            *os << "," << be_nl;
-            *os << "ACE_TRY_ENV";
+            *os << " TAO_ENV_ARG_PARAMETER";
             break;
           }
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_CS:
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_SS:
           {
-            // if the operation node has parameters, then we need to insert a comma
-            *os << "," << be_nl;
            // last argument - is always CORBA::Environment
-            *os << "CORBA::Environment &";
+            *os << " TAO_ENV_ARG_DECL_NOT_USED";
             break;
           }
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_CH:
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_SH:
             {
               // @@ Do it for all cases i.e arg count > = 0
-              *os << "," << be_nl;
 
               // last argument - is always CORBA::Environment
-              *os << "CORBA::Environment &ACE_TRY_ENV";
-              *os << " = " << be_idt_nl
-                  << "TAO_default_environment ()"
-                  << be_uidt << be_uidt_nl;
+              *os << " TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl;
               break;
             }
         default:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
index 78169d0d681..380e15f1991 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
@@ -185,26 +185,17 @@ be_visitor_operation_interceptors_cs::
 
   // Here I still need to generate the other methods + private args.
   *os << "virtual Dynamic::ParameterList * arguments "
-      << "(" << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-      << "TAO_default_environment ()" << be_uidt << be_uidt_nl
-      << ")" << be_nl
+      << "(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual Dynamic::ExceptionList * exceptions "
-      << "(" << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-      << "TAO_default_environment ()" << be_uidt << be_uidt_nl
-      << ")" << be_nl
+      << "(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Any * result "
-      << "(" << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-      << "TAO_default_environment ()" << be_uidt << be_uidt_nl
-      << ")" << be_nl
+      << "(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));\n"
       << be_uidt;
 
@@ -583,7 +574,7 @@ be_visitor_operation_interceptors_cs::
         }
     }
 
-  *os << "::arguments (CORBA::Environment &ACE_TRY_ENV)" << be_idt_nl
+  *os << "::arguments (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))"<<  be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -591,7 +582,7 @@ be_visitor_operation_interceptors_cs::
     {
       *os << "// Generate the argument list on demand." << be_nl
           << "Dynamic::ParameterList *parameter_list ="  << be_idt_nl
-          << "TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);"
+          << "TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
           << be_uidt_nl
           << "ACE_CHECK_RETURN (0);" << be_nl
           << be_nl;
@@ -702,7 +693,7 @@ be_visitor_operation_interceptors_cs::
         }
     }
 
-  *os << "::exceptions (CORBA::Environment &ACE_TRY_ENV)"<< be_idt_nl
+  *os << "::exceptions (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -710,7 +701,7 @@ be_visitor_operation_interceptors_cs::
     {
       *os << "// Generate the exception list on demand." << be_nl
           << "Dynamic::ExceptionList *exception_list ="  << be_idt_nl
-          << "TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);"
+          << "TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
           << be_uidt_nl
           << "ACE_CHECK_RETURN (0);" << be_nl
           << be_nl;
@@ -799,7 +790,7 @@ be_visitor_operation_interceptors_cs::
         }
     }
 
-  *os << "::result (CORBA::Environment &ACE_TRY_ENV)" << be_idt_nl
+  *os << "::result (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -814,7 +805,7 @@ be_visitor_operation_interceptors_cs::
           // Return an Any with tk_void TypeCode.
           *os << "CORBA::Boolean tk_void_any = 1;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
@@ -824,7 +815,7 @@ be_visitor_operation_interceptors_cs::
         {
           *os << "CORBA::Boolean tk_void_any = 0;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
index 978553d13d0..0b141fb00f6 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
@@ -199,38 +199,35 @@ be_visitor_operation_interceptors_ss::
   // Here I still need to generate the other methods + private args
   *os << "virtual Dynamic::ParameterList * arguments ("
       << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-      << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual Dynamic::ExceptionList * exceptions ("
       << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-      << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Any * result ("
       << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl
-      << "TAO_default_environment ()" << be_uidt << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual char * target_most_derived_interface ("
       << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())"
+      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)"
       << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Boolean target_is_a (" << be_idt << be_idt_nl
-      << "const char * id," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())"
+      << "const char * id" << be_nl
+      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS)"
       << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));\n"
       << be_uidt_nl;
@@ -638,12 +635,12 @@ be_visitor_operation_interceptors_ss::
         }
     }
 
-  *os << "::arguments (CORBA::Environment &ACE_TRY_ENV)" << be_idt_nl
+  *os << "::arguments (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
       << "// Generate the argument list on demand." << be_nl
       << "Dynamic::ParameterList *parameter_list ="  << be_idt_nl
-      << "TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);"
+      << "TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
       << be_uidt_nl
       << "ACE_CHECK_RETURN (0);" << be_nl
       << be_nl;
@@ -740,7 +737,7 @@ be_visitor_operation_interceptors_ss::
         }
     }
 
-  *os << "::exceptions (CORBA::Environment &ACE_TRY_ENV)"<< be_idt_nl
+  *os << "::exceptions (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -748,7 +745,7 @@ be_visitor_operation_interceptors_ss::
     {
       *os << "// Generate the exception list on demand." << be_nl
           << "Dynamic::ExceptionList *exception_list ="  << be_idt_nl
-          << "TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);"
+          << "TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
           << be_uidt_nl
           << "ACE_CHECK_RETURN (0);" << be_nl
           << be_nl;
@@ -837,7 +834,7 @@ be_visitor_operation_interceptors_ss::
         }
     }
 
-  *os << "::result (CORBA::Environment &ACE_TRY_ENV)"<< be_idt_nl
+  *os << "::result (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -852,7 +849,7 @@ be_visitor_operation_interceptors_ss::
           // Return an Any with tk_void TypeCode.
           *os << "CORBA::Boolean tk_void_any = 1;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
@@ -862,7 +859,7 @@ be_visitor_operation_interceptors_ss::
         {
           *os << "CORBA::Boolean tk_void_any = 0;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
@@ -944,7 +941,7 @@ be_visitor_operation_interceptors_ss::
 
   *os << "::target_most_derived_interface ("
       << be_idt << be_idt_nl
-      << "CORBA::Environment &)" << be_uidt_nl
+      << "TAO_ENV_SINGLE_ARG_DECL_NOT_USED)" << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
@@ -989,11 +986,11 @@ be_visitor_operation_interceptors_ss::
     }
 
   *os << "::target_is_a (" << be_idt << be_idt_nl
-      << "const char * id," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV)" << be_uidt_nl
+      << "const char * id" << be_nl
+      << "TAO_ENV_ARG_DECL)" << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return this->_tao_impl->_is_a (id, ACE_TRY_ENV);"
+      << "return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);"
       << be_uidt_nl << "}" << be_nl << be_nl;
 
   // -----------------------------------------------------------------
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index f48ffe31aeb..b68eba30039 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -171,7 +171,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
   *os << intf->base_proxy_impl_name () << " &proxy = " << be_idt_nl
       << "this->the" << intf->base_proxy_broker_name ()
-      << "_->select_proxy (this, ACE_TRY_ENV);" << be_uidt_nl;
+      << "_->select_proxy (this TAO_ENV_ARG_PARAMETER);" << be_uidt_nl;
 
   if (!this->void_return_type (bt))
     {
@@ -215,7 +215,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
         {
           *os << "0);";
         }
-      
+
       *os << be_nl << be_nl
           << "return ";
     }
@@ -251,17 +251,17 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
             }
 
-	        *os << "," << be_nl;
+                *os << "," << be_nl;
           be_decl *decl = be_decl::narrow_from_decl (d);
 
-	        *os << decl->local_name();
-	        si->next ();
-	      }
+                *os << decl->local_name();
+                si->next ();
+              }
     }
 
   if (!be_global->exception_support ())
     {
-      *os << "," << be_nl << "ACE_TRY_ENV";
+      *os << " TAO_ENV_ARG_PARAMETER";
     }
 
   *os << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 0b0a07ddd48..0aa4c6c2729 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -137,9 +137,8 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
         "_skel (" << be_idt << be_idt_nl
           << "TAO_ServerRequest &_tao_req," << be_nl
           << "void *_tao_obj," << be_nl
-          << "void *_tao_servant_upcall," << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV"
-          << be_uidt_nl
+          << "void *_tao_servant_upcall" << be_nl
+          << "TAO_ENV_ARG_DECL" << be_uidt_nl
           << ");" << be_uidt << "\n\n";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index ba43189ce15..fcd5480a52d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -126,8 +126,8 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_server_request," << be_nl
       << "void *_tao_object_reference," << be_nl
-      << "void *_tao_servant_upcall," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void *_tao_servant_upcall" << be_nl
+      << "TAO_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton. However, if any of the argument
@@ -313,7 +313,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       << be_nl << be_nl;
 
   // Invoke the receive_request() interception point.
-  *os << "_tao_vfr.receive_request (&_tao_ri, ACE_TRY_ENV);" << be_nl
+  *os << "_tao_vfr.receive_request (&_tao_ri TAO_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
   *os << "\n#endif /* TAO_HAS_INTERCEPTORS */\n";
@@ -424,7 +424,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     }
 
   *os << "_tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);" << be_nl
-      << "_tao_vfr.send_reply (&_tao_ri, ACE_TRY_ENV);"<< be_nl
+      << "_tao_vfr.send_reply (&_tao_ri TAO_ENV_ARG_PARAMETER);"<< be_nl
           << "ACE_TRY_CHECK;" << be_uidt_nl;
 
   *os << "}" << be_uidt_nl
@@ -433,8 +433,8 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   // Update the ServerRequestInfo exception attribute.
   *os << "_tao_ri.exception (&ACE_ANY_EXCEPTION);"<< be_nl
       << "_tao_vfr.send_exception (" << be_idt << be_idt_nl
-      << "&_tao_ri," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "&_tao_ri" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
@@ -443,7 +443,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   // exception.
   *os << be_nl
       << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
-      << "_tao_ri.reply_status (ACE_TRY_ENV);" << be_uidt_nl
+      << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
   *os << be_nl
@@ -484,12 +484,10 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     }
 
   *os << "// In case _tao_servant_upcall is not used in this function"
-      << be_nl 
+      << be_nl
       << "ACE_UNUSED_ARG (_tao_servant_upcall);" << be_nl << be_nl;
 
-  *os << "// In case ACE_TRY_ENV is not used in this function" << be_nl
-      << "ACE_UNUSED_ARG (ACE_TRY_ENV);" << be_uidt_nl
-      << "}\n\n";
+  *os << be_uidt << "}\n\n";
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
index f50e909537d..f382a44634c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
@@ -106,11 +106,14 @@ be_visitor_operation_remote_proxy_impl_cs::visit_operation (be_operation *node)
   // last argument - is always CORBA::Environment
   *os << "{" << be_idt_nl;
 
+/* This shall go away as soon as we drop the suppress_env transition
+   (2001-10-29 oliver.kellogg@t-online.de)                           =======*/
   // Deal with differences between IDL mapping for true C++ exceptions and
   // alternate mapping. Since our code uses the ACE_TRY_ENV variable in a
   // number of places, for the true exception case, we will have to explicitly
   // declare the ACE_TRY_ENV variable.
   *os << this->gen_environment_var () << "\n";
+//============================================================================
 
   // Generate any pre stub info if and only if none of our parameters is of the
   // native type.
@@ -478,8 +481,8 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   // connection can be avoided if send_request() throws an exception,
   // i.e. this is an optimization.
   *os << "_tao_vfr.send_request (" << be_idt_nl
-      << "&_tao_ri," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "&_tao_ri" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
@@ -505,7 +508,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
 
 
   *os << be_nl
-      << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
+      << "_tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl;
   // check if there is an exception
   if (this->gen_check_interceptor_exception (bt) == -1)
     {
@@ -518,8 +521,8 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
 
  *os << be_nl
       << "_tao_call.prepare_header (" << be_idt << be_idt_nl
-      << "ACE_static_cast (CORBA::Octet, _tao_response_flag)," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "ACE_static_cast (CORBA::Octet, _tao_response_flag)" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl;
   // check if there is an exception
 
@@ -581,7 +584,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   if (node->flags () == AST_Operation::OP_oneway)
     {
       // Oneway operation.
-      *os << "_tao_call.invoke (ACE_TRY_ENV);";
+      *os << "_tao_call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);";
     }
   else
     {
@@ -590,11 +593,11 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
           *os << "_tao_call.invoke (_tao_" << node->flat_name ()
               << "_exceptiondata, "
               << node->exceptions ()->length ()
-              << ", ACE_TRY_ENV);";
+              << " TAO_ENV_ARG_PARAMETER);";
         }
       else
         {
-          *os << "_tao_call.invoke (0, 0, ACE_TRY_ENV);";
+          *os << "_tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);";
         }
     }
 
@@ -637,8 +640,8 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
       << "TAO_INTERCEPTOR (" << be_idt_nl
       << "_tao_ri.reply_status (_invoke_status);" << be_nl
       << "_tao_vfr.receive_other (" << be_idt_nl
-      << "&_tao_ri," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "&_tao_ri" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_nl
       << "ACE_TRY_CHECK;" << be_uidt_nl
       << ")" << be_nl
@@ -822,8 +825,8 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
       *os << be_nl
           << "_tao_ri.reply_status (_invoke_status);" << be_nl
           << "_tao_vfr.receive_reply (" << be_idt_nl
-          << "&_tao_ri," << be_nl
-          << "ACE_TRY_ENV" << be_uidt_nl
+          << "&_tao_ri" << be_nl
+          << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
           << ");" << be_nl;
     }
   else if (node->flags () == AST_Operation::OP_oneway)
@@ -832,8 +835,8 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
       *os << be_nl
           << "_tao_ri.reply_status (_invoke_status);" << be_nl
           << "_tao_vfr.receive_other (" << be_idt_nl
-          << "&_tao_ri," << be_nl
-          << "ACE_TRY_ENV" << be_uidt_nl
+          << "&_tao_ri" << be_nl
+          << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
           << ");" << be_nl;
     }
 
@@ -855,8 +858,8 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   *os << "_tao_ri.exception (&ACE_ANY_EXCEPTION);"<< be_nl;
 
   *os << "_tao_vfr.receive_exception (" << be_idt_nl
-      << "&_tao_ri," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
+      << "&_tao_ri" << be_nl
+      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
@@ -866,7 +869,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   // caught exception.
   *os << be_nl
       << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
-      << "_tao_ri.reply_status (ACE_TRY_ENV);" << be_uidt_nl
+      << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
   *os << be_nl
@@ -899,7 +902,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   // ClientRequestInfo object.
   *os << be_nl
       << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
-      << "_tao_ri.reply_status (ACE_TRY_ENV);" << be_uidt_nl;
+      << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl;
 
   if (this->gen_check_exception (bt) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
index 6ef90435f69..6dde06d632b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
@@ -179,9 +179,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
       << "\"" << node->original_local_name () << "\"," << be_nl
       << "forward_to.out ()";
   if (!be_global->exception_support ())
-    *os << "," << be_nl
-        << "ACE_TRY_ENV" << be_uidt_nl
-        << ");\n" << be_uidt;
+    *os << " TAO_ENV_ARG_PARAMETER);\n" << be_uidt_nl << be_uidt;
   else
     *os << be_uidt_nl << ");\n" << be_uidt;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
index 73278ab77e1..018da5f23f1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
@@ -161,8 +161,8 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (be_operation *node
       << "\"" << node->original_local_name () << "\"," << be_nl
       << "forward_to.out ()";
   if (!be_global->exception_support ())
-    *os << "," << be_nl
-        << "ACE_TRY_ENV" << be_uidt_nl
+    *os << be_nl
+        << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
         << ");" << be_nl << be_uidt;
   else
     *os << be_uidt_nl << ");" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 818ac16b87a..d57cf009866 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -88,8 +88,8 @@ int be_visitor_root::visit_root (be_root *node)
 
           *os << "extern " << be_global->stub_export_macro () << be_nl
               << i->full_base_proxy_broker_name () << " *" << be_nl
-              << "(*" << i->flat_client_enclosing_scope () 
-              << i->base_proxy_broker_name () 
+              << "(*" << i->flat_client_enclosing_scope ()
+              << i->base_proxy_broker_name ()
               << "_Factory_function_pointer) ("
               << be_idt << be_idt_nl
               << "CORBA::Object_ptr obj" << be_uidt_nl
@@ -107,33 +107,33 @@ int be_visitor_root::visit_root (be_root *node)
 
           *os << be_global->stub_export_macro () << be_nl
               << ifwd->full_name () << "_ptr" << be_nl
-              << "tao_" << ifwd->flat_name () 
-              << "_duplicate (" 
+              << "tao_" << ifwd->flat_name ()
+              << "_duplicate ("
               << be_idt << be_idt_nl
               << ifwd->full_name  () << "_ptr" << be_uidt_nl
               << ");" << be_uidt_nl
               << be_global->stub_export_macro () << be_nl
               << "void" << be_nl
-              << "tao_" << ifwd->flat_name () 
+              << "tao_" << ifwd->flat_name ()
               << "_release (" << be_idt << be_idt_nl
               << ifwd->full_name () << "_ptr" << be_uidt_nl
               << ");" << be_uidt_nl
               << be_global->stub_export_macro () << be_nl
               << ifwd->full_name () << "_ptr" << be_nl
-              << "tao_" << ifwd->flat_name () 
+              << "tao_" << ifwd->flat_name ()
               << "_nil (" << be_idt << be_idt_nl
               << "void" << be_uidt_nl
               << ");" << be_uidt_nl
               << be_global->stub_export_macro () << be_nl
               << ifwd->full_name () << "_ptr" << be_nl
-              << "tao_" << ifwd->flat_name () 
+              << "tao_" << ifwd->flat_name ()
               << "_narrow (" << be_idt << be_idt_nl
-              << "CORBA::Object *," << be_nl
-              << "CORBA::Environment &" << be_uidt_nl
+              << "CORBA::Object *" << be_nl
+              << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
               << ");" << be_uidt_nl
               << be_global->stub_export_macro () << be_nl
               << "CORBA::Object *" << be_nl
-              << "tao_" << ifwd->flat_name () 
+              << "tao_" << ifwd->flat_name ()
               << "_upcast (" << be_idt << be_idt_nl
               << "void *" << be_uidt_nl
               << ");" << be_uidt_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index edba02bea4f..08eb44a58a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -102,7 +102,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << ", ACE_TRY_ENV);" << be_nl
+      << " TAO_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
index f804c829f80..7e00afcdf5e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
@@ -20,7 +20,7 @@
 //
 // ============================================================================
 
-#include	"be.h"
+#include        "be.h"
 
 #include "be_visitor_sequence.h"
 
@@ -175,12 +175,10 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
     {
       // Pseudo objects do not require these methods.
       *os << "virtual void _downcast (" << be_idt << be_idt_nl
-	        << "void* target," << be_nl
-	        << "CORBA_Object *src," << be_nl
-	        << "CORBA_Environment &ACE_TRY_ENV = "  << be_idt_nl
-	        << "TAO_default_environment ()"
-	        << be_uidt << be_uidt_nl
-	        << ");" << be_uidt_nl;
+                << "void* target," << be_nl
+                << "CORBA_Object *src" << be_nl
+                << "TAO_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
+                << ");" << be_uidt_nl;
 
       *os << "virtual CORBA_Object* _upcast (void *src) const;";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index 22459a78dae..5bf1fa9988d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -19,7 +19,7 @@
 //    Modifications by Aniruddha Gokhale
 // ============================================================================
 
-#include	"be.h"
+#include        "be.h"
 
 #include "be_visitor_sequence.h"
 
@@ -40,7 +40,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_cs::"
                          "visit_sequence - "
-                         "Bad element type\n"), 
+                         "Bad element type\n"),
                         -1);
     }
 
@@ -58,7 +58,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       pt = bt;
     }
 
-  const char *name = 
+  const char *name =
     be_decl::narrow_from_decl (pt)->full_name ();
 
   idl_bool bt_is_defined;
@@ -83,22 +83,22 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
   const char * class_name = node->instance_name ();
 
   static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, 
-                  '\0', 
+  ACE_OS::memset (full_class_name,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (node->is_nested ())
     {
       be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
 
-      ACE_OS::sprintf (full_class_name, 
+      ACE_OS::sprintf (full_class_name,
                        "%s::%s",
                        parent->decl ()->full_name (),
                        class_name);
     }
   else
     {
-      ACE_OS::sprintf (full_class_name, 
+      ACE_OS::sprintf (full_class_name,
                        "%s",
                        class_name);
     }
@@ -129,7 +129,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       << "// For this class memory is never reallocated so the implementation"
       << be_nl
       << "// is *really* simple." << be_nl
-      << "this->buffer_ = " << class_name << "::allocbuf (length);" 
+      << "this->buffer_ = " << class_name << "::allocbuf (length);"
       << be_uidt_nl
       << "}" << be_nl
       << be_nl;
@@ -163,7 +163,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
 
   // _shrink_buffer
   *os << "void" << be_nl
-      << full_class_name 
+      << full_class_name
       << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)"
       << be_nl
       << "{" << be_idt_nl;
@@ -201,19 +201,19 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
 
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
 
-  if ((pt->node_type () != AST_Decl::NT_pre_defined) 
-      || (prim 
-          && (prim->pt () == AST_PredefinedType::PT_pseudo) 
+  if ((pt->node_type () != AST_Decl::NT_pre_defined)
+      || (prim
+          && (prim->pt () == AST_PredefinedType::PT_pseudo)
           && (!ACE_OS::strcmp (prim->local_name ()->get_string (), "Object"))))
     {
       // Pseudo objects do not require these methods.
       *os << "void" << be_nl
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
-	        << "void* target," << be_nl
-	        << "CORBA_Object *src," << be_nl
-	        << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
-	        << ")" << be_uidt_nl
-	        << "{" << be_idt_nl;
+                << "void* target," << be_nl
+                << "CORBA_Object *src" << be_nl
+                << "TAO_ENV_ARG_DECL" << be_uidt_nl
+                << ")" << be_uidt_nl
+                << "{" << be_idt_nl;
 
       bt->accept (visitor);
 
@@ -222,27 +222,27 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       bt->accept (visitor);
 
       *os << "**, target);" << be_nl
-	        << "*tmp = ";
+                << "*tmp = ";
 
       if (bt_is_defined)
         {
           bt->accept (visitor);
 
-          *os << "::_narrow (src, ACE_TRY_ENV);";
+          *os << "::_narrow (src TAO_ENV_ARG_PARAMETER);";
         }
       else
         {
-          *os << "tao_" << pt->flat_name () 
-              << "_narrow (src, ACE_TRY_ENV);";
+          *os << "tao_" << pt->flat_name ()
+              << "_narrow (src TAO_ENV_ARG_PARAMETER);";
         }
 
       *os << be_nl
           << "ACE_CHECK;" << be_uidt_nl
-	        << "}\n" << be_nl;
+                << "}\n" << be_nl;
 
       *os << "CORBA_Object*" << be_nl
           << full_class_name << "::_upcast (void *src) const" <<  be_nl
-	        << "{" << be_idt_nl;
+                << "{" << be_idt_nl;
 
       if (bt_is_defined)
         {
@@ -257,11 +257,11 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
         }
       else
         {
-	        *os << "return tao_" << pt->flat_name () << "_upcast (src);";
+                *os << "return tao_" << pt->flat_name () << "_upcast (src);";
         }
 
       *os << be_uidt_nl
-	        << "}" << be_nl;
+                << "}" << be_nl;
     }
 
   os->gen_endif ();
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
index 308d3257ea0..eeaa464acf9 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
@@ -21,7 +21,7 @@
 // ============================================================================
 
 
-#include	"be.h"
+#include        "be.h"
 
 #include "be_visitor_sequence.h"
 
@@ -180,12 +180,10 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
     {
       // Pseudo objects do not require these methods.
       *os << "virtual void _downcast (" << be_idt << be_idt_nl
-	        << "void* target," << be_nl
-	        << "CORBA_Object *src," << be_nl
-	        << "CORBA_Environment &ACE_TRY_ENV = "  << be_idt_nl
-	        << "TAO_default_environment ()"
-	        << be_uidt << be_uidt_nl
-	        << ");" << be_uidt_nl;
+                << "void* target," << be_nl
+                << "CORBA_Object *src" << be_nl
+                << "TAO_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
+                << ");" << be_uidt_nl;
 
       *os << "virtual CORBA_Object* _upcast (void *src) const;";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index dc8289ec615..fc74d1b974c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -19,7 +19,7 @@
 //    Modifications by Aniruddha Gokhale
 // ============================================================================
 
-#include	"be.h"
+#include        "be.h"
 
 #include "be_visitor_sequence.h"
 
@@ -57,7 +57,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       pt = bt;
     }
 
-  const char *name = 
+  const char *name =
     be_decl::narrow_from_decl (pt)->full_name ();
 
   idl_bool bt_is_defined;
@@ -82,22 +82,22 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   const char * class_name = node->instance_name ();
 
   static char full_class_name [NAMEBUFSIZE];
-  ACE_OS::memset (full_class_name, 
-                  '\0', 
+  ACE_OS::memset (full_class_name,
+                  '\0',
                   NAMEBUFSIZE);
 
   if (node->is_nested ())
     {
       be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
 
-      ACE_OS::sprintf (full_class_name, 
+      ACE_OS::sprintf (full_class_name,
                        "%s::%s",
                        parent->decl ()->full_name (),
                        class_name);
     }
   else
     {
-      ACE_OS::sprintf (full_class_name, 
+      ACE_OS::sprintf (full_class_name,
                        "%s",
                        class_name);
     }
@@ -115,10 +115,10 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   os->indent ();
 
   // allocate_buffer.
-  *os << "// The Base_Sequence functions, please see tao/Sequence.h" 
+  *os << "// The Base_Sequence functions, please see tao/Sequence.h"
       << be_nl
       << "void" << be_nl
-      << full_class_name << "::_allocate_buffer (CORBA::ULong length)" 
+      << full_class_name << "::_allocate_buffer (CORBA::ULong length)"
       << be_nl
       << "{" << be_idt_nl;
 
@@ -158,12 +158,12 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       << "}" << be_uidt_nl
       << "else" << be_idt_nl
       << "{" << be_idt_nl
-      << "tmp[i] = old[i];" << be_uidt_nl 
+      << "tmp[i] = old[i];" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "if (this->release_)" << be_idt_nl
       << "{" << be_idt_nl
-      << "delete[] old;" << be_uidt_nl 
+      << "delete[] old;" << be_uidt_nl
       << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl
       << "this->buffer_ = tmp;" << be_uidt_nl
@@ -219,7 +219,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
 
   // shrink_buffer.
   *os << "void" << be_nl
-      << full_class_name 
+      << full_class_name
       << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
       << "{" << be_idt_nl;
 
@@ -263,12 +263,11 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       // Pseudo objects do not require these methods.
       *os << "void " << be_nl
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
-	        << "void* target," << be_nl
-	        << "CORBA_Object *src," << be_nl
-	        << "CORBA_Environment &ACE_TRY_ENV"
-	        << be_uidt_nl
-	        << ")" << be_uidt_nl
-	        << "{" << be_idt_nl;
+                << "void* target," << be_nl
+                << "CORBA_Object *src" << be_nl
+                << "TAO_ENV_ARG_DECL" << be_uidt_nl
+                << ")" << be_uidt_nl
+                << "{" << be_idt_nl;
 
       bt->accept (visitor);
 
@@ -277,27 +276,27 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       bt->accept (visitor);
 
       *os << "**, target);" << be_nl
-	        << "*tmp = ";
+                << "*tmp = ";
 
       if (bt_is_defined)
         {
           bt->accept (visitor);
 
-          *os << "::_narrow (src, ACE_TRY_ENV);";
+          *os << "::_narrow (src TAO_ENV_ARG_PARAMETER);";
         }
       else
         {
-          *os << "tao_" << pt->flat_name () 
-              << "_narrow (src, ACE_TRY_ENV);";
+          *os << "tao_" << pt->flat_name ()
+              << "_narrow (src TAO_ENV_ARG_PARAMETER);";
         }
 
       *os << be_nl
           << "ACE_CHECK;" << be_uidt_nl
-	        << "}\n" << be_nl;
+                << "}\n" << be_nl;
 
       *os << "CORBA_Object*" << be_nl
           << full_class_name << "::_upcast (void *src) const" <<  be_nl
-	        << "{" << be_idt_nl;
+                << "{" << be_idt_nl;
 
       if (bt_is_defined)
         {
@@ -312,11 +311,11 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
         }
       else
         {
-	        *os << "return tao_" << pt->flat_name () << "_upcast (src);";
+                *os << "return tao_" << pt->flat_name () << "_upcast (src);";
         }
 
       *os << be_uidt_nl
-	        << "}" << be_nl;
+                << "}" << be_nl;
     }
 
   os->gen_endif ();
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index 6642aafc200..fbb5cac423f 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -97,7 +97,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << ", ACE_TRY_ENV);" << be_nl
+      << " TAO_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 92feeed2a52..f91f85da940 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -110,7 +110,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << ", ACE_TRY_ENV);" << be_nl
+      << " TAO_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index 303d12ffce2..45222b3795f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -51,7 +51,7 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << " (";
-  
+
   if (node->argument_count () > 0)
     {
       *os << be_idt << be_idt_nl;
@@ -70,15 +70,10 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
   // Generate the CORBA::Environment parameter for the alternative mapping.
   if (!be_global->exception_support ())
     {
-      // If the operation node has parameters, then we need to insert a comma.
-      if (node->argument_count () > 0)
-        {
-          *os << "," << be_nl;
-        }
-      else
-        {
-          *os << be_idt << be_idt_nl;
-        }
+      // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on
+      // whether the operation node has parameters.
+      const char *env_decl = (node->argument_count () > 0 ?
+                              " TAO_ENV_ARG_DECL" : "TAO_ENV_SINGLE_ARG_DECL");
 
       switch (this->ctx_->state ())
         {
@@ -86,17 +81,15 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
         case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OBV_CH:
         case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CH:
           // Last argument - is always CORBA::Environment.
-          *os << "CORBA::Environment &ACE_TRY_ENV";
-          *os << " = " << be_idt_nl
-              << "TAO_default_environment ()" << be_uidt
+          *os << env_decl << "_WITH_DEFAULTS" << be_nl
               << be_uidt_nl << ")";
           break;
         case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CS:
           // Last argument - is always CORBA::Environment.
-          *os << "CORBA::Environment &ACE_TRY_ENV)";
+          *os << env_decl << ")";
           break;
         default:
-          *os << "CORBA::Environment &ACE_TRY_ENV)";
+          *os << env_decl << ")";
           break;
         }
     }
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index 71130ddb113..4650afc561a 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -14,8 +14,8 @@ public:
 
   void connect (CosEventChanneAdmin::ConsumerAdmin_ptr consumer_admin);
 
-  void push (const CORBA::Any& data, CORBA::Environment &);
-  void disconnect_push_consumer (CORBA::Environment &);
+  void push (const CORBA::Any& data TAO_ENV_ARG_DECL_NOT_USED);
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
 };
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index 641eec60291..e02c36336de 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -30,8 +30,8 @@ Stock_Consumer::disconnect ()
 }
 
 void
-Stock_Consumer::push (const CORBA::Any& data,
-                      CORBA::Environment &)
+Stock_Consumer::push (const CORBA::Any& data
+                      TAO_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   Quoter::Event *event;
@@ -45,7 +45,7 @@ Stock_Consumer::push (const CORBA::Any& data,
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException)
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index bf81bc2e75c..f3659626a57 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -18,9 +18,9 @@ public:
   void disconnect ();
   // Disconnect from the event channel.
 
-  void push (const CORBA::Any& data, CORBA::Environment &)
+  void push (const CORBA::Any& data TAO_ENV_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
-  void disconnect_push_consumer (CORBA::Environment &)
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/index.html b/TAO/docs/tutorials/Quoter/Event_Service/index.html
index 15e691657c1..e27ab5c93b7 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/index.html
+++ b/TAO/docs/tutorials/Quoter/Event_Service/index.html
@@ -57,13 +57,13 @@ class Stock_Consumer : public POA_CosEventComm::PushConsumer {
 public:
   Stock_Consumer ();
 
-  void push (const CORBA::Any& data, CORBA::Environment &);
-  void disconnect_push_consumer (CORBA::Environment &);
+  void push (const CORBA::Any& data TAO_ENV_ARG_DECL);
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL);
 
   // details omitted
 };
 </PRE>
-    <P>Let us ignore the strange <CODE>CORBA::Environment</CODE>
+    <P>Let us ignore the strange <CODE>TAO_ENV_ARG_DECL</CODE>
       arguments and concentrate on the implementation.
       The <CODE>disconnect_push_consumer()</CODE> method is invoked by
       the Events Service when it is disconnecting,
@@ -76,8 +76,8 @@ public:
     </P>
 <PRE>
 void
-Stock_Consumer::push (const CORBA::Any& data,
-                      CORBA::Environment &)
+Stock_Consumer::push (const CORBA::Any& data
+                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   Quoter::Event *event;
   if ((data >>= event) == 0)
@@ -102,38 +102,32 @@ Stock_Consumer::push (const CORBA::Any& data,
 }
 </PRE>
 
-    <P>So what was the <CODE>CORBA::Environment</CODE> about? After
+    <P>So what was the <CODE>TAO_ENV_ARG_DECL</CODE> about? After
       all it was not used.  TAO services must support platforms
       without support for native C++ exceptions.  On those platforms
       the CORBA specification defines an <EM>alternate mapping</EM>
       where all the operations use an extra argument to return any
       exceptions.
       Notice that the TAO IDL compiler supports both mappings.  We have
-      been using the standard one so far!  It is only in some services
-      and callback objects that the alternate mapping becomes apparent.
+      been using the standard one so far!  It is only if your C++
+      compiler does not support exceptions that you need to use
+      the alternative mapping.
     </P>
     <P>Notice that on platforms with native C++ exception support we
       can safely ignore the extra argument,
       and use the usual mechanisms to catch and throw exceptions.
-      Unfortunately we must declare the extra argument.  The TAO team
-      is working on solutions to that problem.
       For more information on how to use the alternative mapping and
       how to write portable code for both environments check
       <A HREF="http://ace.cs.wustl.edu/cvsweb/ace-latest.cgi/ACE_wrappers/docs/exception.html">Using ACE try macros for CORBA programming</A>.
     </P>
 
-    <P>In short, the <CODE>CORBA::Environment</CODE> is ugly,
-      but it does not affect your code significantly,
-      and you can still use the regular C++ exception handling
-      mechanisms.
-    </P>
     <P>Going back to our example,
       when the event channel disconnects we receive a callback, too.
       At that point we want to forget about the original connection:
     </P>
 <PRE>
 void
-Stock_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
@@ -259,7 +253,7 @@ class Quoter_Stock_i : public POA_Quoter::Modify_Stock {
 public:
   // some details removed...
 
-  void disconnect_push_supplier (CORBA::Environment&);
+  void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   POA_CosEventComm::PushSupplier_tie < Quoter_Stock_i > supplier_personality_;
@@ -321,7 +315,7 @@ POA_CosEventComm::PushSupplier_tie < T >::disconnect_push_supplier ()
     </P>
 <PRE>
 void
-Quoter_Stock_i::disconnect_push_supplier (CORBA::Environment &)
+Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   // Forget about the consumer.  It is not there anymore
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
index 746f3339301..99eb940ad6e 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
@@ -13,7 +13,8 @@ PortableServer::Servant
 Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
                                            PortableServer::POA_ptr,
                                            const char *,
-                                           void * & cookie )
+                                           void * & cookie
+                                           TAO_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException, PortableServer::ForwardRequest)
 {
 
@@ -47,7 +48,8 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &,
                                             PortableServer::POA_ptr,
                                             const char *,
                                             void * cookie,
-                                            PortableServer::Servant servant)
+                                            PortableServer::Servant servant
+                                            TAO_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
index 0e8225d616f..4405c865fcd 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
@@ -17,7 +17,8 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa,
                                              const char * operation,
-                                             void * & cookie)
+                                             void * & cookie
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     throw (CORBA::SystemException, PortableServer::ForwardRequest);
 
   // Postinvoke function
@@ -25,7 +26,8 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
                            PortableServer::POA_ptr poa,
                            const char * operation,
                            void * cookie,
-                           PortableServer::Servant servant)
+                           PortableServer::Servant servant
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     throw (CORBA::SystemException);
 
  private:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
index ce03e9caca0..62f89416c49 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
@@ -32,8 +32,8 @@ Stock_Consumer::disconnect ()
 }
 
 void
-Stock_Consumer::push (const RtecEventComm::EventSet &data,
-                      CORBA::Environment &)
+Stock_Consumer::push (const RtecEventComm::EventSet &data
+                      TAO_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   for (CORBA::ULong i = 0; i != data.length (); ++i) {
@@ -51,7 +51,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data,
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException)
 {
   this->supplier_proxy_ =
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index 63a365bc8f0..2348b9b1a2d 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -20,9 +20,9 @@ public:
   void disconnect ();
   // Disconnect from the event channel.
 
-  void push (const RtecEventComm::EventSet& data, CORBA::Environment &)
+  void push (const RtecEventComm::EventSet& data TAO_ENV_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
-  void disconnect_push_consumer (CORBA::Environment &)
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html b/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html
index bc6b625cf6f..ef39589014a 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/index.html
@@ -14,7 +14,7 @@
 
     <P>We have already explored how to use
       <A HREF="../Event_Service/index.html">
-	TAO's COS Event Service
+        TAO's COS Event Service
       </A>
       to receive updated stock prices,
       but what if we are not interested in all the stocks?
@@ -37,7 +37,7 @@
     <P>For this example we will use the same data structures that we
       used in the previous example,
       i.e., the events will be identical.
-      TAO's RT Event Service can be configured to carry your events in 
+      TAO's RT Event Service can be configured to carry your events in
       a type-safe manner,
       or you can use custom marshaling to send non-IDL structures in
       the event,
@@ -48,7 +48,7 @@
 
     <P>Connecting as a consumer is very similar.  Some of the base
       classes and signatures change, but it is basically the same
-      idea: 
+      idea:
       First let us define the consumer object:
     </P>
 <PRE>
@@ -56,8 +56,8 @@ class Stock_Consumer : public POA_RtecEventComm::PushConsumer {
 public:
   Stock_Consumer ();
 
-  void push (const RtecEventComm::EventSet& data, CORBA::Environment &);
-  void disconnect_push_consumer (CORBA::Environment &);
+  void push (const RtecEventComm::EventSet& data TAO_ENV_ARG_DECL_NOT_USED);
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   // details omitted
 };
@@ -69,8 +69,8 @@ public:
     </P>
 <PRE>
 void
-Stock_Consumer::push (const RtecEventComm::EventSet &data,
-                      CORBA::Environment &)
+Stock_Consumer::push (const RtecEventComm::EventSet &data
+                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   for (CORBA::ULong i = 0; i != data.length (); ++i) {
     RtecEventComm::Event &e = data[i];
@@ -99,7 +99,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data,
     </P>
 <PRE>
 void
-Stock_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
@@ -190,7 +190,7 @@ public:
   void set_price (CORBA::Double new_price)
     throw (CORBA::SystemException);
 
-  void disconnect_push_supplier (CORBA::Environment&);
+  void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   Quoter::Event data_;
@@ -224,7 +224,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 <PRE>
    RtecEventComm::Event &e = event[0];
    const char *symbol = this->data_.symbol;
-   e.header.type = 
+   e.header.type =
       ((int(symbol[0]) << 24)
        | (int(symbol[1]) << 16)
        | (int(symbol[2]) << 8)
@@ -246,7 +246,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 
     <H3>Connecting to the Event Service as a Supplier</H3>
 
-    <P>As in the COS Event Channel case we need a supplier personality 
+    <P>As in the COS Event Channel case we need a supplier personality
       to connect to it.
       We gain access to the Event Service, for example using the
       naming service:
@@ -274,12 +274,12 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
     </P>
 <PRE>
    const char *symbol = this->data_.symbol;
-   CORBA::ULong type =   
+   CORBA::ULong type =
       ((int(symbol[0]) << 24)
        | (int(symbol[1]) << 16)
        | (int(symbol[2]) << 8)
        | int(symbol[3]));
-   CORBA::ULong source = 1; 
+   CORBA::ULong source = 1;
    ACE_SupplierQOS_Factory publications;
    publications.insert_type (type, source, 0, 1);
 </PRE>
@@ -295,7 +295,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
     </P>
 <PRE>
 void
-Quoter_Stock_i::disconnect_push_supplier (CORBA::Environment &)
+Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   // Forget about the consumer it is not there anymore
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index 71cd4edcd4e..fb81056443c 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -14,37 +14,37 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
 }
 
 void
-Peer_Handler_i::request (CORBA::Long retval,
-                         CORBA::Environment &ACE_TRY_ENV)
+Peer_Handler_i::request (CORBA::Long retval
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static int i = 0;
   i++;
   if (i % 100 == 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d replies received\n", i));
-  this->peer_->reply (retval, ACE_TRY_ENV);
+  this->peer_->reply (retval TAO_ENV_ARG_PARAMETER);
 }
 
 
 void
 Peer_Handler_i::request_excep (
-    AMI_PeerExceptionHolder * excep_holder,
-    CORBA::Environment &ACE_TRY_ENV)
+    AMI_PeerExceptionHolder * excep_holder
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (excep_holder);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  TAO_ENV_ARG_NOT_USED;
 }
 
 
 void
-Peer_Handler_i::start (CORBA::Environment &)
+Peer_Handler_i::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Peer_Handler_i::shutdown (CORBA::Environment &)
+Peer_Handler_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
@@ -62,33 +62,33 @@ Peer_i::~Peer_i (void)
 void
 Peer_i::init (CORBA::ORB_ptr orb,
               Progress_ptr progress,
-              const ACE_Time_Value &delay,
-              CORBA::Environment &ACE_TRY_ENV)
+              const ACE_Time_Value &delay
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->progress_ = Progress::_duplicate (progress);
   this->delay_ = delay;
 
-  Peer_var peer = this->_this (ACE_TRY_ENV);
+  Peer_var peer = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n"));
-  this->id_ = this->progress_->bind (peer.in (), ACE_TRY_ENV);
+  this->id_ = this->progress_->bind (peer.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Peer_i::reply (CORBA::Long result,
-               CORBA::Environment &ACE_TRY_ENV)
+Peer_i::reply (CORBA::Long result
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->progress_->recv_reply (result, ACE_TRY_ENV);
+  this->progress_->recv_reply (result TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Long
-Peer_i::request (CORBA::Long id,
-                 CORBA::Environment &)
+Peer_i::request (CORBA::Long id
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv  = this->delay_;
@@ -99,12 +99,12 @@ Peer_i::request (CORBA::Long id,
 
 void
 Peer_i::start (const PeerSet &the_peers,
-               CORBA::Long iterations,
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Long iterations
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   AMI_PeerHandler_var handler =
-    this->reply_handler_._this (ACE_TRY_ENV);
+    this->reply_handler_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Report errors as exceptions...
@@ -118,10 +118,10 @@ Peer_i::start (const PeerSet &the_peers,
 }
 
 void
-Peer_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Peer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -147,16 +147,15 @@ Peer_Task::svc (void)
       CORBA::ULong l = this->the_peers_.length ();
       for (CORBA::ULong j = 0; j != l; ++j)
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
+          ACE_TRY_NEW_ENV
             {
               this->the_peers_[j]->sendc_request (this->handler_.in (),
-                                                  this->id_,
-                                                  ACE_TRY_ENV);
+                                                  this->id_
+                                                  TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->progress_->sent_request (this->id_,
-                                             ACE_TRY_ENV);
+              this->progress_->sent_request (this->id_
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index bc2e1e799b9..8f95390f898 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -27,18 +27,18 @@ public:
   Peer_Handler_i (Peer_i *peer);
   // The peer
 
-  virtual void request (CORBA::Long retval, 
-                         CORBA::Environment &ACE_TRY_ENV)
+  virtual void request (CORBA::Long retval
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void request_excep (AMI_PeerExceptionHolder * excep_holder,
-                              CORBA::Environment &ACE_TRY_ENV)
+  virtual void request_excep (AMI_PeerExceptionHolder * excep_holder
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start (CORBA::Environment &ACE_TRY_ENV)
+  virtual void start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -57,27 +57,27 @@ public:
 
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
-             const ACE_Time_Value &delay,
-             CORBA::Environment &ACE_TRY_ENV)
+             const ACE_Time_Value &delay
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void reply (CORBA::Long result,
-              CORBA::Environment &ACE_TRY_ENV)
+  void reply (CORBA::Long result
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by the Reply_Handler to indicate that a reply has been
   // received.
 
    // = See test.idl for an explanation of these methods.
-  CORBA::Long request (CORBA::Long id,
-                       CORBA::Environment& ACE_TRY_ENV)
+  CORBA::Long request (CORBA::Long id
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   void start (const PeerSet& the_peers,
-              CORBA::Long iterations,
-              CORBA::Environment& ACE_TRY_ENV)
+              CORBA::Long iterations
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment& ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index 0755359220e..bbadc2933d4 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -19,8 +19,8 @@ Progress_i::Progress_i (Progress_Window *window)
 }
 
 void
-Progress_i::sent_request (CORBA::Long id,
-                     CORBA::Environment &)
+Progress_i::sent_request (CORBA::Long id
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id));
@@ -28,20 +28,20 @@ Progress_i::sent_request (CORBA::Long id,
 }
 
 void
-Progress_i::recv_reply (CORBA::Long id,
-                        CORBA::Environment &)
+Progress_i::recv_reply (CORBA::Long id
+                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->recv_reply (id);
 }
 
 CORBA::Long
-Progress_i::bind (Peer_ptr a_peer,
-                  CORBA::Environment &ACE_TRY_ENV)
+Progress_i::bind (Peer_ptr a_peer
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n"));
-  return this->window_->bind (a_peer, ACE_TRY_ENV);
+  return this->window_->bind (a_peer TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -131,8 +131,8 @@ Progress_Window::recv_reply (CORBA::Long id)
 }
 
 CORBA::Long
-Progress_Window::bind (Peer_ptr a_peer,
-                       CORBA::Environment &)
+Progress_Window::bind (Peer_ptr a_peer
+                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   CORBA::ULong l = this->peers_.length ();
   this->peers_.length (l + 1);
@@ -155,14 +155,14 @@ Progress_Window::start ()
   if (this->peers_.length () < CORBA::ULong (this->n_peers_))
     return;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   for (CORBA::ULong i = 0; i != this->peers_.length (); ++i)
     {
       ACE_TRY
         {
           this->peers_[i]->start (this->peers_,
-                                  this->n_iterations_,
-                                  ACE_TRY_ENV);
+                                  this->n_iterations_
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 9066b6833e6..8ffc57f0aac 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -36,8 +36,8 @@ public:
   void recv_reply (CORBA::Long id);
   // Keep track of the progress on each peer
 
-  CORBA::Long bind (Peer_ptr a_peer,
-                    CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long bind (Peer_ptr a_peer
+                    TAO_ENV_ARG_DECL);
   // One of the peers has bound to the server
 
   void start (void);
@@ -76,14 +76,14 @@ public:
   // ctor
 
   // = The Progress methods.
-  void sent_request (CORBA::Long id,
-                     CORBA::Environment &ACE_TRY_ENV)
+  void sent_request (CORBA::Long id
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void recv_reply (CORBA::Long id,
-                   CORBA::Environment &ACE_TRY_ENV)
+  void recv_reply (CORBA::Long id
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  CORBA::Long bind (Peer_ptr a_peer,
-                    CORBA::Environment&)
+  CORBA::Long bind (Peer_ptr a_peer
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 872da877e68..d190d593f6d 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -100,11 +100,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -113,25 +113,25 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var progress_object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Progress_var progress =
-        Progress::_narrow (progress_object.in (), ACE_TRY_ENV);
+        Progress::_narrow (progress_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value delay (0, interval);
@@ -139,8 +139,8 @@ main (int argc, char *argv[])
       Peer_i peer;
       peer.init (orb.in (),
                  progress.in (),
-                 delay,
-                 ACE_TRY_ENV);
+                 delay
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker (orb.in ());
@@ -157,7 +157,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 80855d97f95..b71ef84f409 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -33,24 +33,24 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'p':
-	n_peers = ACE_OS::atoi (get_opts.optarg);
-	break;
+        n_peers = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'i':
-	n_iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        n_iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
-			   "-p <peers>"
-			   "-i <iterations>"
+                           "-o <iorfile>"
+                           "-p <peers>"
+                           "-i <iterations>"
                            "\n",
                            argv [0]),
                           -1);
@@ -62,11 +62,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -100,40 +100,40 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Progress_i server_impl (&sw);
 
       Progress_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
 
       if (Fl::run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Fl::run"), -1);
@@ -142,7 +142,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index f416910ee6b..13f05d89110 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -48,8 +48,8 @@ static int received_all_replies = 0;
 class Reply_Handler : public POA_AMI_testHandler
 {
 public:
-  void method (CORBA::ULong reply_number,
-               CORBA::Environment &)
+  void method (CORBA::ULong reply_number
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -61,13 +61,13 @@ public:
         received_all_replies = 1;
     }
 
-  void method_excep (AMI_testExceptionHolder *holder,
-                     CORBA::Environment &ACE_TRY_ENV)
+  void method_excep (AMI_testExceptionHolder *holder
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_method (ACE_TRY_ENV);
+        holder->raise_method (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
@@ -77,18 +77,18 @@ public:
     ACE_ENDTRY;
   }
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
-  void shutdown_excep (AMI_testExceptionHolder *holder,
-                       CORBA::Environment &ACE_TRY_ENV)
+  void shutdown_excep (AMI_testExceptionHolder *holder
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_shutdown (ACE_TRY_ENV);
+        holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
@@ -177,18 +177,18 @@ parse_args (int argc, char **argv)
 }
 
 void
-setup_buffering_constraints (CORBA::ORB_ptr orb,
-                             CORBA::Environment &ACE_TRY_ENV)
+setup_buffering_constraints (CORBA::ORB_ptr orb
+                             TAO_ENV_ARG_DECL)
 {
   // Obtain PolicyCurrent.
-  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent",
-                                                              ACE_TRY_ENV);
+  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow down to correct type.
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+    CORBA::PolicyCurrent::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Start off with no constraints.
@@ -209,18 +209,18 @@ setup_buffering_constraints (CORBA::ORB_ptr orb,
   // Setup the buffering constraint policy.
   buffering_constraint_policy_list[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_constraint_any,
-                        ACE_TRY_ENV);
+                        buffering_constraint_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the constraints (at the ORB level).
   policy_current->set_policy_overrides (buffering_constraint_policy_list,
-                                        CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+                                        CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are done with the policy.
-  buffering_constraint_policy_list[0]->destroy (ACE_TRY_ENV);
+  buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the none sync scope policy, i.e., the ORB will buffer AMI
@@ -238,25 +238,25 @@ setup_buffering_constraints (CORBA::ORB_ptr orb,
   // Setup the none sync scope policy.
   sync_none_policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_none_any,
-                        ACE_TRY_ENV);
+                        sync_none_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the none sync scope (at the ORB level).
   policy_current->set_policy_overrides (sync_none_policy_list,
-                                        CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+                                        CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are now done with these policies.
-  sync_none_policy_list[0]->destroy (ACE_TRY_ENV);
+  sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -264,8 +264,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -274,40 +274,40 @@ main (int argc, char **argv)
         return parse_args_result;
 
       CORBA::Object_var base =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (base.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (base.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an object reference from the argument string.
-      base = orb->string_to_object (IOR,
-                                    ACE_TRY_ENV);
+      base = orb->string_to_object (IOR
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object = test::_narrow (base.in (),
-                                            ACE_TRY_ENV);
+      test_var test_object = test::_narrow (base.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Reply_Handler reply_handler_servant;
-      AMI_testHandler_var reply_handler_object = reply_handler_servant._this (ACE_TRY_ENV);
+      AMI_testHandler_var reply_handler_object = reply_handler_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (setup_buffering)
         {
-          setup_buffering_constraints (orb.in (),
-                                       ACE_TRY_ENV);
+          setup_buffering_constraints (orb.in ()
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -321,8 +321,8 @@ main (int argc, char **argv)
             {
               // Invoke the AMI method.
               test_object->sendc_method (reply_handler_object.in (),
-                                         i,
-                                         ACE_TRY_ENV);
+                                         i
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -331,8 +331,8 @@ main (int argc, char **argv)
 
               // Invoke the regular method.
               test_object->method (i,
-                                   reply_number,
-                                   ACE_TRY_ENV);
+                                   reply_number
+                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -344,7 +344,7 @@ main (int argc, char **argv)
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval, ACE_TRY_ENV);
+          orb->run (sleep_interval TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -357,13 +357,13 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (ACE_TRY_ENV);
+          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
@@ -372,7 +372,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 57565d8e20f..3b1c02ba84f 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -41,22 +41,22 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index f1638e3e712..2cf8850817b 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -11,8 +11,8 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::method (CORBA::ULong request_number,
-                CORBA::ULong_out reply_number,
-                CORBA::Environment &)
+                CORBA::ULong_out reply_number
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -23,9 +23,9 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h
index 6dbf633558f..c83114c88d0 100644
--- a/TAO/examples/Buffered_AMI/test_i.h
+++ b/TAO/examples/Buffered_AMI/test_i.h
@@ -29,11 +29,11 @@ public:
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
-               CORBA::ULong_out reply_number,
-               CORBA::Environment &)
+               CORBA::ULong_out reply_number
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index e61f720ac72..dbe248cc7f1 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -115,7 +115,7 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -123,8 +123,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -134,24 +134,24 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var base =
-        orb->string_to_object (IOR,
-                               ACE_TRY_ENV);
+        orb->string_to_object (IOR
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object = test::_narrow (base.in (),
-                                            ACE_TRY_ENV);
+      test_var test_object = test::_narrow (base.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain PolicyCurrent.
-      base = orb->resolve_initial_references ("PolicyCurrent",
-                                              ACE_TRY_ENV);
+      base = orb->resolve_initial_references ("PolicyCurrent"
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to correct type.
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (base.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (base.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup the none sync scope policy, i.e., the ORB will buffer
@@ -169,18 +169,18 @@ main (int argc, char **argv)
       // Setup the none sync scope policy.
       sync_none_policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_none_any,
-                            ACE_TRY_ENV);
+                            sync_none_any
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup the none sync scope.
       policy_current->set_policy_overrides (sync_none_policy_list,
-                                            CORBA::ADD_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::ADD_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We are now done with this policy.
-      sync_none_policy_list[0]->destroy (ACE_TRY_ENV);
+      sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start off with no constraints.
@@ -225,14 +225,14 @@ main (int argc, char **argv)
       // Setup the buffering constraint policy.
       buffering_constraint_policy_list[0] =
         orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                            buffering_constraint_any,
-                            ACE_TRY_ENV);
+                            buffering_constraint_any
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup the constraints.
       policy_current->set_policy_overrides (buffering_constraint_policy_list,
-                                            CORBA::ADD_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::ADD_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -258,8 +258,8 @@ main (int argc, char **argv)
       // Setup the buffering flush policy.
       buffering_flush_policy_list[0] =
         orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                            buffering_flush_any,
-                            ACE_TRY_ENV);
+                            buffering_flush_any
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -274,8 +274,8 @@ main (int argc, char **argv)
             {
               // Setup explicit flushing.
               policy_current->set_policy_overrides (buffering_flush_policy_list,
-                                                    CORBA::ADD_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -283,14 +283,14 @@ main (int argc, char **argv)
                           i));
 
               // Invoke the oneway method.
-              test_object->method (i,
-                                   ACE_TRY_ENV);
+              test_object->method (i
+                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Reset buffering policy.
               policy_current->set_policy_overrides (buffering_constraint_policy_list,
-                                                    CORBA::ADD_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -300,8 +300,8 @@ main (int argc, char **argv)
                           i));
 
               // Invoke the oneway method.
-              test_object->method (i,
-                                   ACE_TRY_ENV);
+              test_object->method (i
+                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -309,23 +309,23 @@ main (int argc, char **argv)
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval, ACE_TRY_ENV);
+          orb->run (sleep_interval TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (ACE_TRY_ENV);
+          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // We are done with the policy.
-      buffering_constraint_policy_list[0]->destroy (ACE_TRY_ENV);
+      buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We are done with the policy.
-      buffering_flush_policy_list[0]->destroy (ACE_TRY_ENV);
+      buffering_flush_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
@@ -334,7 +334,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 0833f740340..8f57aaac3ea 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -41,22 +41,22 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index 01d8b0faea7..74b1323a4df 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -10,8 +10,8 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::method (CORBA::ULong request_number,
-                CORBA::Environment &)
+test_i::method (CORBA::ULong request_number
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -20,9 +20,9 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h
index c1c8b71f406..cbe1b31e777 100644
--- a/TAO/examples/Buffered_Oneways/test_i.h
+++ b/TAO/examples/Buffered_Oneways/test_i.h
@@ -28,11 +28,11 @@ public:
   // ctor.
 
   // = The test interface methods.
-  void method (CORBA::ULong request_number,
-               CORBA::Environment &)
+  void method (CORBA::ULong request_number
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 6e6883be1db..fe48f153d66 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -102,7 +102,7 @@ Consumer_Handler::parse_args (void)
     switch (c)
       {
       case 'd':  // debug flag
-	TAO_debug_level++; //****
+        TAO_debug_level++; //****
         break;
 
       case 'k':  // ior provide on command line
@@ -119,8 +119,8 @@ Consumer_Handler::parse_args (void)
         break;
 
       case 's': // don't use the naming service
-	this->use_naming_service_ = 0;
-	break;
+        this->use_naming_service_ = 0;
+        break;
 
       case 'a': // to be given only on using run_test.pl
         this->stock_name_ = get_opts.optarg;
@@ -144,9 +144,9 @@ Consumer_Handler::parse_args (void)
                            " [-f ior-file]"
                            " [-k ior]"
                            " [-x]"
-			   " [-s]"
-			   " [-a stock_name]"
-			   " [-t threshold]"
+                           " [-s]"
+                           " [-a stock_name]"
+                           " [-t threshold]"
                            "\n",
                            this->argv_ [0]),
                           -1);
@@ -161,30 +161,30 @@ Consumer_Handler::parse_args (void)
 int
 Consumer_Handler::via_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialization of the naming service.
       if (naming_services_client_.init (orb_.in ()) != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize "
-			   "the TAO_Naming_Client. \n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize "
+                           "the TAO_Naming_Client. \n"),
+                          -1);
 
       CosNaming::Name notifier_ref_name (1);
       notifier_ref_name.length (1);
       notifier_ref_name[0].id = CORBA::string_dup ("Notifier");
 
       CORBA::Object_var notifier_obj =
-	this->naming_services_client_->resolve (notifier_ref_name,
-						ACE_TRY_ENV);
+        this->naming_services_client_->resolve (notifier_ref_name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to Notifier_var using
       // the <_narrow> method.
       this->server_ =
-        Notifier::_narrow (notifier_obj.in (),
-                           ACE_TRY_ENV);
+        Notifier::_narrow (notifier_obj.in ()
+                           TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -211,21 +211,21 @@ Consumer_Handler::init (int argc, char **argv)
   // Register our <Input_Handler> to handle STDIN events, which will
   // trigger the <handle_input> method to process these events.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "parse_args failed\n"),
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "parse_args failed\n"),
                           -1);
 
       if (this->interactive_ == 1)
@@ -280,8 +280,8 @@ Consumer_Handler::init (int argc, char **argv)
                               -1);
 
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_,
-                                          ACE_TRY_ENV);
+            this->orb_->string_to_object (this->ior_
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -291,8 +291,8 @@ Consumer_Handler::init (int argc, char **argv)
                               -1);
           // The downcasting from CORBA::Object_var to Notifier_var is
           // done using the <_narrow> method.
-          this->server_ = Notifier::_narrow (server_object.in (),
-                                             ACE_TRY_ENV);
+          this->server_ = Notifier::_narrow (server_object.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -312,23 +312,23 @@ int
 Consumer_Handler::run (void)
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Obtain and activate the RootPOA.
      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;
 
      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
      PortableServer::POAManager_var poa_manager=
-       root_poa->the_POAManager (ACE_TRY_ENV);
+       root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
-     poa_manager->activate (ACE_TRY_ENV);
+     poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
      ACE_NEW_RETURN (this->consumer_servant_,
@@ -339,7 +339,7 @@ Consumer_Handler::run (void)
 
      // Get the consumer stub (i.e consumer object) pointer.
      this->consumer_var_ =
-       this->consumer_servant_->_this (ACE_TRY_ENV);
+       this->consumer_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->interactive_ == 0)
@@ -348,8 +348,8 @@ Consumer_Handler::run (void)
           // Register with the server.
           this->server_->register_callback (this->stock_name_,
                                             this->threshold_value_,
-                                            this->consumer_var_.in (),
-                                            ACE_TRY_ENV);
+                                            this->consumer_var_.in ()
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Note the registration.
@@ -361,7 +361,7 @@ Consumer_Handler::run (void)
         }
 
       // Run the ORB.
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
index 09b0cdf1ae2..c98a8522314 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
@@ -102,7 +102,7 @@ Consumer_Input_Handler::register_consumer ()
   this->consumer_handler_->threshold_value_ =
     ACE_OS::atoi (needed_stock_value);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -110,8 +110,8 @@ Consumer_Input_Handler::register_consumer ()
       // Register with the server.
       this->consumer_handler_->server_->register_callback (this->consumer_handler_->stock_name_,
                                                            this->consumer_handler_->threshold_value_,
-                                                           this->consumer_handler_->consumer_var_.in (),
-                                                           ACE_TRY_ENV);
+                                                           this->consumer_handler_->consumer_var_.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Note the registration.
@@ -165,7 +165,7 @@ Consumer_Input_Handler::quit_consumer_process ()
   // Only if the consumer is registered and wants to shut
   // down, its necessary to unregister and then shutdown.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -173,9 +173,9 @@ Consumer_Input_Handler::quit_consumer_process ()
         {
           // If the notifier has exited and the consumer tries to call
           // the unregister_callback method tehn an execption will be
-          // raised. Hence check for this case using ACE_TRY_ENV.
-          this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in (),
-                                                                 ACE_TRY_ENV);
+          // raised. Hence check for this case using TAO_ENV_SINGLE_ARG_PARAMETER.
+          this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in ()
+                                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -183,7 +183,7 @@ Consumer_Input_Handler::quit_consumer_process ()
           consumer_handler_->unregistered_ = 0;
           consumer_handler_->registered_ = 0;
         }
-      this->consumer_handler_->consumer_servant_->shutdown (ACE_TRY_ENV);
+      this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -196,7 +196,7 @@ Consumer_Input_Handler::quit_consumer_process ()
 
       ACE_TRY_EX (block1)
         {
-          this->consumer_handler_->consumer_servant_->shutdown (ACE_TRY_ENV);
+          this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (block1);
         }
       ACE_CATCHANY
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp
index 8464a357f11..380ff65ecfe 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp
@@ -28,8 +28,8 @@ Consumer_i::~Consumer_i (void)
 }
 
 void
-Consumer_i::push (const Callback_Quoter::Info &data,
-                  CORBA::Environment &)
+Consumer_i::push (const Callback_Quoter::Info &data
+                  TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // On getting the needed information you now proceed to the next
@@ -42,7 +42,7 @@ Consumer_i::push (const Callback_Quoter::Info &data,
 }
 
 void
-Consumer_i::shutdown (CORBA::Environment &)
+Consumer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h
index 319214fb627..3e7a28df332 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.h
+++ b/TAO/examples/Callback_Quoter/Consumer_i.h
@@ -39,12 +39,12 @@ public:
   ~Consumer_i (void);
   // Destructor.
 
-  void push (const Callback_Quoter::Info & data,
-             CORBA_Environment& TAO_TRY_ENV)
+  void push (const Callback_Quoter::Info & data
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets the stock information from the Notifier.
 
-  virtual void shutdown (CORBA::Environment &TAO_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used to get the consumer to shut down.
 
@@ -57,7 +57,7 @@ private:
 
   int quit_;
   // If 1 denotes that the consumer is dead else alive.
- 
+
   // @@ Please rename to Notifier.
   Notifier_var server_;
   // Smart pointer to the Notifier object.
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index 51245f63ac9..07518fa833b 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -52,7 +52,7 @@ Notifier_Input_Handler::~Notifier_Input_Handler (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Input_Handler::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Notifier_Input_Handler::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -69,15 +69,15 @@ Notifier_Input_Handler::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
   // (re)Bind the object.
   ACE_TRY
     {
-      Notifier_var notifier_obj = notifier_i_._this (ACE_TRY_ENV);
+      Notifier_var notifier_obj = notifier_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       naming_server_->rebind (notifier_obj_name,
-                              notifier_obj.in(),
-                              ACE_TRY_ENV);
+                              notifier_obj.in()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -141,8 +141,8 @@ Notifier_Input_Handler::parse_args (void)
 
 int
 Notifier_Input_Handler::init (int argc,
-                              char *argv[],
-                              CORBA::Environment &ACE_TRY_ENV)
+                              char *argv[]
+                              TAO_ENV_ARG_DECL)
 {
 
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
@@ -153,8 +153,8 @@ Notifier_Input_Handler::init (int argc,
 
   if (this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -186,8 +186,8 @@ Notifier_Input_Handler::init (int argc,
   // Activate the servant in the POA.
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("Notifier",
-                                                 &this->notifier_i_,
-                                                 ACE_TRY_ENV);
+                                                 &this->notifier_i_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -204,14 +204,14 @@ Notifier_Input_Handler::init (int argc,
 
   if (this->using_naming_service_)
     {
-      this->init_naming_service (ACE_TRY_ENV);
+      this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   return 0;
 }
 
 int
-Notifier_Input_Handler::run (CORBA::Environment &ACE_TRY_ENV)
+Notifier_Input_Handler::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Run the main event loop for the ORB.
 
@@ -219,7 +219,7 @@ Notifier_Input_Handler::run (CORBA::Environment &ACE_TRY_ENV)
   ACE_DEBUG ((LM_DEBUG,
               " Type \"q\" to quit \n "));
 
-  int result = this->orb_manager_.run (ACE_TRY_ENV);
+  int result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == -1)
@@ -237,7 +237,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -259,7 +259,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE)
         {
           // @@ Please remove this call if it's not used.
           // (this->notifier_i_.consumer_map_).close();
-          this->notifier_i_.shutdown (ACE_TRY_ENV);
+          this->notifier_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index f541aba1036..4012a86e4a1 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -44,11 +44,11 @@ public:
   // Destructor.
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Notifier who plays the role of the server here.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the ORB.
 
    virtual int handle_input (ACE_HANDLE);
@@ -62,7 +62,7 @@ private:
   int parse_args (void);
   // Parses the command line arguments.
 
-  int init_naming_service (CORBA::Environment &env);
+  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Initialises the name server and registers the Notifier object
   // name with the name server.
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index d3bcc01538d..a3416749139 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -40,8 +40,8 @@ Notifier_i::~Notifier_i (void)
 void
 Notifier_i::register_callback (const char *stock_name,
                                CORBA::Long threshold_value,
-                               Callback_Quoter::Consumer_ptr consumer_handler,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               Callback_Quoter::Consumer_ptr consumer_handler
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Stock))
 {
@@ -78,7 +78,7 @@ Notifier_i::register_callback (const char *stock_name,
     {
       // the unbounded set entry is created.
       // NOTE:: its pathetic, but to make this macro call its necessary to name
-      // your environment variable ACE_TRY_ENV
+      // your TAO_ENV_SINGLE_ARG_PARAMETERironment variable TAO_ENV_SINGLE_ARG_PARAMETER
       ACE_NEW_THROW_EX (consumers, CONSUMERS, CORBA::NO_MEMORY ());
       ACE_CHECK;
 
@@ -111,8 +111,8 @@ Notifier_i::orb (CORBA::ORB_ptr orb)
 // Remove the client handler.
 
 void
-Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Handle))
 {
@@ -158,8 +158,8 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer,
 
 void
 Notifier_i::market_status (const char *stock_name,
-                           CORBA::Long stock_value,
-                           CORBA::Environment &)
+                           CORBA::Long stock_value
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -207,7 +207,7 @@ Notifier_i::market_status (const char *stock_name,
 }
 
 void
-Notifier_i::shutdown (CORBA::Environment &)
+Notifier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->consumer_map_.close () > 0)
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index a0e8e18c2bc..d3d326e3e58 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -51,29 +51,29 @@ public:
 
   virtual void register_callback (const char *stock_name,
                                   CORBA::Long threshold_value,
-                                  Callback_Quoter::Consumer_ptr consumer_handler,
-                                  CORBA::Environment &TAO_TRY_ENV)
+                                  Callback_Quoter::Consumer_ptr consumer_handler
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Stock));
   // Register a distributed callback handler that is invoked when the
   // given stock reaches the desired threshold value.
 
-  virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler,
-                                    CORBA::Environment &TAO_TRY_ENV)
+  virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Handle));
   // Remove the consumer object.
 
   virtual void market_status (const char *stock_name,
-                              CORBA::Long stock_value,
-                              CORBA::Environment &TAO_TRY_ENV)
+                              CORBA::Long stock_value
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the market status.
 
   void orb (CORBA::ORB_ptr orb);
   // Get the orb pointer.
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the Notifier.
 
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index d27bbd722ff..b4791a05311 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -153,15 +153,15 @@ int
 Supplier::send_market_status (const char *stock_name,
                               long value)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
 
       // Make the RMI.
       this->notifier_->market_status (stock_name,
-                                      value,
-                                      ACE_TRY_ENV);
+                                      value
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -228,15 +228,15 @@ Supplier::via_naming_service (void)
       notifier_ref_name[0].id = CORBA::string_dup ("Notifier");
 
       CORBA::Object_var notifier_obj =
-        this->naming_services_client_->resolve (notifier_ref_name,
-                                                ACE_TRY_ENV);
+        this->naming_services_client_->resolve (notifier_ref_name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
-        Notifier::_narrow (notifier_obj.in (),
-                           ACE_TRY_ENV);
+        Notifier::_narrow (notifier_obj.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -269,8 +269,8 @@ Supplier::init (int argc, char **argv)
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -293,8 +293,8 @@ Supplier::init (int argc, char **argv)
                            this->argv_[0]),
                           -1);
       CORBA::Object_var notifier_object =
-        this->orb_->string_to_object (this->ior_,
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (this->ior_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (notifier_object.in ()))
@@ -304,8 +304,8 @@ Supplier::init (int argc, char **argv)
                           -1);
       // The downcasting from CORBA::Object_var to Notifier_var is
       // done using the <_narrow> method.
-      this->notifier_ = Notifier::_narrow (notifier_object.in (),
-                                           ACE_TRY_ENV);
+      this->notifier_ = Notifier::_narrow (notifier_object.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index 982fcfb6e52..246f16e2ccd 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -14,17 +14,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tNotifier\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int rc = notifier.init (argc, argv, ACE_TRY_ENV);
+      int rc = notifier.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (rc == -1)
         return 1;
       else
         {
-          notifier.run (ACE_TRY_ENV);
+          notifier.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index 8b253015f81..a382f854632 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -25,8 +25,8 @@ Content_Iterator_i::~Content_Iterator_i (void)
 
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULong offset,
-                                Web_Server::Chunk_Type_out chunk,
-                                CORBA::Environment &)
+                                Web_Server::Chunk_Type_out chunk
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
@@ -105,23 +105,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset,
 }
 
 void
-Content_Iterator_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Content_Iterator object.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Decrease the reference count on our selves.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index 9d6792bdd6c..edf2fae0b71 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -62,13 +62,13 @@ public:
   // Destructor
 
   virtual CORBA::Boolean next_chunk (CORBA::ULong offset,
-                                     Web_Server::Chunk_Type_out chunk,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     Web_Server::Chunk_Type_out chunk
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the iterator.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index b6a863158de..b7bac2b09f6 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -11,8 +11,8 @@ ACE_RCSID (AMI_Iterator, Iterator_Factory_i, "$Id$")
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
-                                  Web_Server::Metadata_Type_out metadata,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  Web_Server::Metadata_Type_out metadata
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -44,7 +44,7 @@ Iterator_Factory_i::get_iterator (const char *pathname,
 
   // Activate the Content_Iterator object.
   Web_Server::Content_Iterator_var iterator =
-    iterator_servant->_this (ACE_TRY_ENV);
+    iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Web_Server::Metadata_Type *tmp = 0;
@@ -52,7 +52,7 @@ Iterator_Factory_i::get_iterator (const char *pathname,
                     Web_Server::Metadata_Type,
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
-  
+
   metadata = tmp;
 
   if (this->modification_date (&file_status,
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
index 3cd99dddc0d..71599ff6347 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
@@ -44,8 +44,8 @@ public:
 
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
-                             Web_Server::Metadata_Type_out metadata,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             Web_Server::Metadata_Type_out metadata
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This factory method returns a <Content_Iterator> that can be used
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 4892f086435..46f896a5c8c 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -29,8 +29,8 @@ Iterator_Handler::~Iterator_Handler (void)
 
 void
 Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
-                              const Web_Server::Chunk_Type &chunk_data,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const Web_Server::Chunk_Type &chunk_data
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (pending_data)
@@ -52,8 +52,8 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
         this->offset_ += chunk->length ();
 
       this->contents_->sendc_next_chunk (this->ami_handler_.in (),
-                                         this->offset_,
-                                         ACE_TRY_ENV);
+                                         this->offset_
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
     }
@@ -66,8 +66,8 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
       (*this->request_count_)--;  // No more data.
 
       // Done with the iterator, so destroy it.
-      this->contents_->sendc_destroy (this->ami_handler_.in (),
-                                      ACE_TRY_ENV);
+      this->contents_->sendc_destroy (this->ami_handler_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // File retrieval has completed, so spawn an external viewer to
@@ -77,11 +77,11 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
     }
 }
 void
-Iterator_Handler::destroy (CORBA::Environment &ACE_TRY_ENV)
+Iterator_Handler::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate this reply handler.
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -89,8 +89,8 @@ Iterator_Handler::destroy (CORBA::Environment &ACE_TRY_ENV)
 void
 Iterator_Handler::run (int *request_count,
                        const char *pathname,
-                       Web_Server::Iterator_Factory_ptr factory,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       Web_Server::Iterator_Factory_ptr factory
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -101,34 +101,34 @@ Iterator_Handler::run (int *request_count,
     ACE_THROW (CORBA::BAD_PARAM ());
   // Initialize the Content Iterator
   this->initialize_content_iterator (pathname,
-                                     factory,
-                                     ACE_TRY_ENV);
+                                     factory
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate this Reply Handler.
-  this->ami_handler_ = this->_this (ACE_TRY_ENV);
+  this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Begin the asynchronous invocation.
   this->contents_->sendc_next_chunk (this->ami_handler_.in (),
-                                     this->offset_,
-                                     ACE_TRY_ENV);
+                                     this->offset_
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Iterator_Handler::initialize_content_iterator
   (const char *pathname,
-   Web_Server::Iterator_Factory_ptr factory,
-   CORBA::Environment &ACE_TRY_ENV)
+   Web_Server::Iterator_Factory_ptr factory
+   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
   // Obtain a Content Iterator for the desired file.
   factory->get_iterator (pathname,
                          this->contents_,
-                         this->metadata_,
-                         ACE_TRY_ENV);
+                         this->metadata_
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create a temporary file to store the retrieved data.
@@ -149,21 +149,21 @@ Iterator_Handler::initialize_content_iterator
 }
 
 void
-Iterator_Handler::deactivate (CORBA::Environment &ACE_TRY_ENV)
+Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index 400549e2a2c..e64986ca215 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -63,27 +63,27 @@ public:
   // name of the file being retrieved from the web server.
 
   virtual void next_chunk (CORBA::Boolean pending_data,
-                   const Web_Server::Chunk_Type & chunk,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   const Web_Server::Chunk_Type & chunk
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void next_chunk_excep (
-      Web_Server::AMI_Content_IteratorExceptionHolder *,
-      CORBA::Environment &)
+      Web_Server::AMI_Content_IteratorExceptionHolder *
+      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
-  virtual void destroy (CORBA::Environment &)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy_excep (
-      Web_Server::AMI_Content_IteratorExceptionHolder *,
-      CORBA::Environment &)
+      Web_Server::AMI_Content_IteratorExceptionHolder *
+      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
   void run (int *request_count,
             const char *pathname,
-            Web_Server::Iterator_Factory_ptr factory,
-            CORBA::Environment &ACE_TRY_ENV)
+            Web_Server::Iterator_Factory_ptr factory
+            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -97,13 +97,13 @@ private:
   // on the heap).
 
   void initialize_content_iterator (const char *pathname,
-                                    Web_Server::Iterator_Factory_ptr factory,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    Web_Server::Iterator_Factory_ptr factory
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Initialize the Content Iterator used to retrieve the file.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV)
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this reply handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index c92a676ecad..3ac86a85b96 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -12,20 +12,20 @@ ACE_RCSID (AMI_Iterator, client, "$Id$")
 
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr orb,
-              CORBA::Environment &ACE_TRY_ENV);
+get_iterator (CORBA::ORB_ptr orb
+              TAO_ENV_ARG_DECL);
 
 // Perform file requests
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      Web_Server::Iterator_Factory_ptr f
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (argc < 2)
@@ -36,29 +36,29 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB",
-                                            ACE_TRY_ENV);
+                                            "Mighty ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an Iterator_Factory reference.
       Web_Server::Iterator_Factory_var factory =
-        ::get_iterator (orb.in (),
-                        ACE_TRY_ENV);
+        ::get_iterator (orb.in ()
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -79,8 +79,8 @@ main (int argc, char *argv[])
       ::invoke_requests (argc,
                          argv,
                          &request_count,
-                         factory.in (),
-                         ACE_TRY_ENV);
+                         factory.in ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB event loop.
@@ -88,22 +88,22 @@ main (int argc, char *argv[])
         {
           CORBA::Boolean more_work;
 
-          more_work = orb->work_pending (ACE_TRY_ENV);
+          more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (more_work)
             {
-              orb->perform_work (ACE_TRY_ENV);
+              orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             ACE_OS::sleep (tv);
         }
 
-      orb->shutdown (0, ACE_TRY_ENV);
+      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Web_Server::Error_Result, exc)
@@ -130,20 +130,20 @@ main (int argc, char *argv[])
 }
 
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr o,
-              CORBA::Environment &ACE_TRY_ENV)
+get_iterator (CORBA::ORB_ptr o
+              TAO_ENV_ARG_DECL)
 {
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (o);
 
   // Get a reference to the Name Service.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("NameService",
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references ("NameService"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   // Narrow to a Naming Context
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   if (CORBA::is_nil (obj.in ()))
@@ -159,7 +159,7 @@ get_iterator (CORBA::ORB_ptr o,
   name[0].id = CORBA::string_dup ("Iterator_Factory");
   name[0].kind = CORBA::string_dup ("");
 
-  obj = nc->resolve (name, ACE_TRY_ENV);
+  obj = nc->resolve (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   Web_Server::Iterator_Factory_ptr factory =
@@ -171,8 +171,8 @@ get_iterator (CORBA::ORB_ptr o,
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      Web_Server::Iterator_Factory_ptr f
+                      TAO_ENV_ARG_DECL)
 {
   Web_Server::Iterator_Factory_var factory =
     Web_Server::Iterator_Factory::_duplicate (f);
@@ -194,8 +194,8 @@ void invoke_requests (int argc,
       // This ends up being an AMI call, so it won't block.
       handler->run (request_count,
                     argv[i + 1],
-                    factory.in (),
-                    ACE_TRY_ENV);
+                    factory.in ()
+                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index 3db1745290b..c711edf8594 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -13,46 +13,46 @@ ACE_RCSID (AMI_Iterator, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB",
-                                            ACE_TRY_ENV);
+                                            "Mighty ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the Iterator_Factory servant and object.
       // It activates and deactivates the Content_Iterator object.
       Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (ACE_TRY_ENV);
+        factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
-      obj = orb->resolve_initial_references ("NameService",
-                                             ACE_TRY_ENV);
+      obj = orb->resolve_initial_references ("NameService"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a name.
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in (), ACE_TRY_ENV);
+      nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Some debugging output.
-      CORBA::String_var IOR = orb->object_to_string (factory.in (),
-                                                     ACE_TRY_ENV);
+      CORBA::String_var IOR = orb->object_to_string (factory.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 0ecfbdf5dbb..61774035f58 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -28,12 +28,12 @@ Callback_Handler::~Callback_Handler (void)
 }
 
 void
-Callback_Handler::next_chunk (CORBA::Environment &ACE_TRY_ENV)
+Callback_Handler::next_chunk (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->last_chunk_ == 1)
     {
-      this->deactivate (ACE_TRY_ENV);
+      this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -79,26 +79,26 @@ Callback_Handler::next_chunk (CORBA::Environment &ACE_TRY_ENV)
 
   this->callback_->sendc_next_chunk (this->ami_handler_.in (),
                                      this->chunk_.in (),
-                                     this->last_chunk_,
-                                     ACE_TRY_ENV);
+                                     this->last_chunk_
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Callback_Handler::next_chunk_excep
-  (Web_Server::AMI_CallbackExceptionHolder *excep_holder,
-   CORBA::Environment &)
+  (Web_Server::AMI_CallbackExceptionHolder *excep_holder
+   TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->last_chunk_ = 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->deactivate (ACE_TRY_ENV);
+      this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      excep_holder->raise_next_chunk (ACE_TRY_ENV);
+      excep_holder->raise_next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -111,27 +111,27 @@ Callback_Handler::next_chunk_excep
 }
 
 void
-Callback_Handler::run (CORBA::Environment &ACE_TRY_ENV)
+Callback_Handler::run (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
   // Open the file to be downloaded
-  this->open_file (ACE_TRY_ENV);
+  this->open_file (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate this Reply Handler.
-  this->ami_handler_ = this->_this (ACE_TRY_ENV);
+  this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Begin the asynchronous invocation.  Note that the AMI
   // "sendc_next_chunk()" call is done within the following call,
   // since data must first be read into the Chunk.
-  this->next_chunk (ACE_TRY_ENV);
+  this->next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Callback_Handler::open_file (CORBA::Environment &ACE_TRY_ENV)
+Callback_Handler::open_file (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -149,23 +149,23 @@ Callback_Handler::open_file (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Callback_Handler::deactivate (CORBA::Environment &ACE_TRY_ENV)
+Callback_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Close the file that was sent to the client.
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
index 01b8aadacd5..fe87b50c854 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -87,15 +87,15 @@ public:
   // Constructor that creates a content iterator corresponding to the
   // name of the file being retrieved from the web server.
 
-  virtual void next_chunk (CORBA::Environment &ACE_TRY_ENV)
+  virtual void next_chunk (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback for this reply handler.
 
-  virtual void next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder *,
-                                 CORBA::Environment &)
+  virtual void next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder *
+                                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void run (CORBA::Environment &ACE_TRY_ENV)
+  void run (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -108,12 +108,12 @@ private:
   // Destructor (private to ensure that Callback_Handler is allocated
   // on the heap).
 
-  void open_file (CORBA::Environment &ACE_TRY_ENV)
+  void open_file (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result));
   // Open the file to be uploaded to the client callback.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV)
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this reply handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 1c379a57417..a6299288c56 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -46,8 +46,8 @@ Callback_i::~Callback_i (void)
 
 void
 Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
-                        CORBA::Boolean last_chunk,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Boolean last_chunk
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!last_chunk)
@@ -93,7 +93,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
       if (this->metadata_received ())
         {
           (void) this->file_io_.close ();
-          this->deactivate (ACE_TRY_ENV);
+          this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           (void) this->spawn_viewer ();
@@ -104,7 +104,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
 void
 Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       {
@@ -126,7 +126,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
       // an external viewer to display it.
       if (this->content_received ())
         {
-          this->deactivate (ACE_TRY_ENV);
+          this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           (void) this->spawn_viewer ();
@@ -273,19 +273,19 @@ Callback_i::spawn_viewer (void)
 }
 
 void
-Callback_i::deactivate (CORBA::Environment &ACE_TRY_ENV)
+Callback_i::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
index 1a14d9ae55e..7a9ea118094 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
@@ -71,8 +71,8 @@ public:
   // Constructor
 
   virtual void next_chunk (const Web_Server::Chunk_Type &chunk,
-                           CORBA::Boolean last_chunk,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Boolean last_chunk
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
@@ -102,7 +102,7 @@ private:
 
 private:
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivate this Callback servant.
 
 private:
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index 3ebf7564bfd..aa7b3e0e064 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -11,8 +11,8 @@ ACE_RCSID (AMI_Observer, Push_Iterator_Factory_i, "$Id$")
 Web_Server::Metadata_Type *
 Push_Iterator_Factory_i::register_callback
   (const char *pathname,
-   Web_Server::Callback_ptr client_callback,
-   CORBA::Environment &ACE_TRY_ENV)
+   Web_Server::Callback_ptr client_callback
+   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   if (CORBA::is_nil (client_callback))  // @@ Will it ever be nil?
@@ -43,7 +43,7 @@ Push_Iterator_Factory_i::register_callback
   PortableServer::ServantBase_var tmp (handler);
 
   // Start sending data to the client callback object.
-  handler->run (ACE_TRY_ENV);
+  handler->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_stat file_status;
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
index 22f193e940a..ee2d114c915 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
@@ -52,8 +52,8 @@ class Push_Iterator_Factory_i :
 public:
   Web_Server::Metadata_Type *register_callback
     (const char *pathname,
-     Web_Server::Callback_ptr client_callback,
-     CORBA::Environment &ACE_TRY_ENV)
+     Web_Server::Callback_ptr client_callback
+     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This registration method passes a <Callback> that the Web server
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index 4cf2a709de5..f2b0cee21e2 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -25,22 +25,22 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void)
 
 void
 Push_Iterator_Handler::register_callback
-  (const Web_Server::Metadata_Type &metadata,
-   CORBA::Environment &ACE_TRY_ENV)
+  (const Web_Server::Metadata_Type &metadata
+   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_servant_->metadata (metadata);
 
   // This handler is no longer needed, so deactivate it.
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Push_Iterator_Handler::run (int *request_count,
                             const char *pathname,
-                            Web_Server::Iterator_Factory_ptr factory,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            Web_Server::Iterator_Factory_ptr factory
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -54,37 +54,37 @@ Push_Iterator_Handler::run (int *request_count,
 
   // Activate the Callback.
   this->callback_ =
-    this->callback_servant_->_this (ACE_TRY_ENV);
+    this->callback_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate this Reply Handler.
   this->ami_handler_ =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Register the client callback with the server asynchronously.
   factory->sendc_register_callback (this->ami_handler_.in (),
                                     pathname,
-                                    this->callback_.in (),
-                                    ACE_TRY_ENV);
+                                    this->callback_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Push_Iterator_Handler::deactivate (CORBA::Environment &ACE_TRY_ENV)
+Push_Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
index 0f2ca884e16..caa91026a62 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -72,8 +72,8 @@ public:
 
   void run (int *request_count,
             const char *pathname,
-            Web_Server::Iterator_Factory_ptr factory,
-            CORBA::Environment &ACE_TRY_ENV)
+            Web_Server::Iterator_Factory_ptr factory
+            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -88,18 +88,18 @@ private:
   // on the heap).
 
   virtual void register_callback
-  (const Web_Server::Metadata_Type &metadata,
-   CORBA::Environment &ACE_TRY_ENV)
+  (const Web_Server::Metadata_Type &metadata
+   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // AMI callback that is invoked when a response from the
   // corresponding server method is received.
 
   virtual void register_callback_excep
-  (Web_Server::AMI_Iterator_FactoryExceptionHolder *,
-   CORBA::Environment &)
+  (Web_Server::AMI_Iterator_FactoryExceptionHolder *
+   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV)
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 8c1df79a463..306a86b7910 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -12,20 +12,20 @@ ACE_RCSID (AMI_Observer, client, "$Id$")
 
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr orb,
-              CORBA::Environment &ACE_TRY_ENV);
+get_iterator (CORBA::ORB_ptr orb
+              TAO_ENV_ARG_DECL);
 
 // Perform file requests
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      Web_Server::Iterator_Factory_ptr f
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (argc < 2)
@@ -37,29 +37,29 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB",
-                                            ACE_TRY_ENV);
+                                            "Mighty ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an Iterator_Factory reference.
       Web_Server::Iterator_Factory_var factory =
-        ::get_iterator (orb.in (),
-                        ACE_TRY_ENV);
+        ::get_iterator (orb.in ()
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -80,8 +80,8 @@ main (int argc, char *argv[])
       ::invoke_requests (argc,
                          argv,
                          &request_count,
-                         factory.in (),
-                         ACE_TRY_ENV);
+                         factory.in ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // 1 millisecond delay to reduce "busy waiting" in ORB event
@@ -93,22 +93,22 @@ main (int argc, char *argv[])
         {
           CORBA::Boolean more_work;
 
-          more_work = orb->work_pending (ACE_TRY_ENV);
+          more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (more_work)
             {
-              orb->perform_work (ACE_TRY_ENV);
+              orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             ACE_OS::sleep (tv);
         }
 
-      orb->shutdown (0, ACE_TRY_ENV);
+      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      //orb->destroy (ACE_TRY_ENV);
+      //orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       //ACE_TRY_CHECK;
     }
   ACE_CATCH (Web_Server::Error_Result, exc)
@@ -135,20 +135,20 @@ main (int argc, char *argv[])
 }
 
 Web_Server::Iterator_Factory_ptr
-get_iterator (CORBA::ORB_ptr o,
-              CORBA::Environment &ACE_TRY_ENV)
+get_iterator (CORBA::ORB_ptr o
+              TAO_ENV_ARG_DECL)
 {
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (o);
 
   // Get a reference to the Name Service.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("NameService",
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references ("NameService"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   // Narrow to a Naming Context
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   if (CORBA::is_nil (obj.in ()))
@@ -164,7 +164,7 @@ get_iterator (CORBA::ORB_ptr o,
   name[0].id = CORBA::string_dup ("Push_Iterator_Factory");
   name[0].kind = CORBA::string_dup ("");
 
-  obj = nc->resolve (name, ACE_TRY_ENV);
+  obj = nc->resolve (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   Web_Server::Iterator_Factory_ptr factory =
@@ -176,8 +176,8 @@ get_iterator (CORBA::ORB_ptr o,
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
-                      Web_Server::Iterator_Factory_ptr f,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      Web_Server::Iterator_Factory_ptr f
+                      TAO_ENV_ARG_DECL)
 {
   Web_Server::Iterator_Factory_var factory =
     Web_Server::Iterator_Factory::_duplicate (f);
@@ -199,8 +199,8 @@ void invoke_requests (int argc,
       // This ends up being an AMI call, so it won't block.
       handler->run (request_count,
                     argv[i + 1],
-                    factory.in (),
-                    ACE_TRY_ENV);
+                    factory.in ()
+                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 501b2db71d9..5a59ffd5e91 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -12,45 +12,45 @@ ACE_RCSID (AMI_Observer, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB",
-                                            ACE_TRY_ENV);
+                                            "Mighty ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the Iterator_Factory servant and object.
       Push_Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (ACE_TRY_ENV);
+        factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
-      obj = orb->resolve_initial_references ("NameService",
-                                             ACE_TRY_ENV);
+      obj = orb->resolve_initial_references ("NameService"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a name.
@@ -59,12 +59,12 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Push_Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in (), ACE_TRY_ENV);
+      nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Some debugging output.
-      CORBA::String_var IOR = orb->object_to_string (factory.in (),
-                                                     ACE_TRY_ENV);
+      CORBA::String_var IOR = orb->object_to_string (factory.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 428cf5cee73..ffa637debb2 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -26,8 +26,8 @@ Content_Iterator_i::~Content_Iterator_i (void)
 
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULong offset,
-                                Web_Server::Chunk_Type_out chunk,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                Web_Server::Chunk_Type_out chunk
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
@@ -117,23 +117,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset,
 }
 
 void
-Content_Iterator_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Content_Iterator object.
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
-  PortableServer::ObjectId_var oid = poa->servant_to_id (this,
-                                                         ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid = poa->servant_to_id (this
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Decrease the reference count on our selves.
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
index 849125f546d..09bbfa3ddc0 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
@@ -62,13 +62,13 @@ public:
   // Destructor
 
   virtual CORBA::Boolean next_chunk (CORBA::ULong offset,
-                                     Web_Server::Chunk_Type_out chunk,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     Web_Server::Chunk_Type_out chunk
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the iterator.
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index b5e6f2dbc8c..4257ddb5581 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -11,8 +11,8 @@ ACE_RCSID (SMI_Iterator, Iterator_Factory_i, "$Id$")
 void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
-                                  Web_Server::Metadata_Type_out metadata,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  Web_Server::Metadata_Type_out metadata
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -50,7 +50,7 @@ Iterator_Factory_i::get_iterator (const char *pathname,
 
   // Activate the Content_Iterator object.
   Web_Server::Content_Iterator_var iterator =
-    iterator_servant->_this (ACE_TRY_ENV);
+    iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Web_Server::Metadata_Type *tmp = 0;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
index 8a7dbb7dffb..adad7bc5b1e 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
@@ -46,9 +46,8 @@ public:
 
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
-                             Web_Server::Metadata_Type_out metadata,
-                             CORBA::Environment &ACE_TRY_ENV =
-                               TAO_default_environment ())
+                             Web_Server::Metadata_Type_out metadata
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This factory method returns a <Content_Iterator> that can be used
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index 67867bf4035..c6c3e47d613 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -13,8 +13,8 @@ ACE_RCSID(SMI_Iterator, client, "$Id$")
 
 // Retrieve the data from the server
 int retrieve_data (const char *content_type,
-                   Web_Server::Content_Iterator_ptr contents,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   Web_Server::Content_Iterator_ptr contents
+                   TAO_ENV_ARG_DECL);
 
 
 // Map content type to viewer.
@@ -29,7 +29,7 @@ int spawn_viewer (const char *content_type,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (argc < 2)
@@ -40,19 +40,19 @@ main (int argc, char *argv[])
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB",
-                                            ACE_TRY_ENV);
+                                            "Mighty ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("NameService",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      obj = nc->resolve (name, ACE_TRY_ENV);
+      obj = nc->resolve (name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now narrow to an Iterator_Factory reference.
@@ -92,8 +92,8 @@ main (int argc, char *argv[])
       Web_Server::Metadata_Type_var metadata;
       factory->get_iterator (pathname,
                              contents,
-                             metadata,
-                             ACE_TRY_ENV);
+                             metadata
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO,
@@ -106,21 +106,21 @@ main (int argc, char *argv[])
                   metadata->content_type.in ()));
 
       int result = ::retrieve_data (metadata->content_type.in (),
-                                    contents.in (),
-                                    ACE_TRY_ENV);
+                                    contents.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return -1;
 
       // Done with the Content_Iterator, so destroy it.
-      contents->destroy (ACE_TRY_ENV);
+      contents->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->shutdown (0, ACE_TRY_ENV);
+      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // orb->destroy (ACE_TRY_ENV);
+      // orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       // ACE_TRY_CHECK;
     }
   ACE_CATCH (Web_Server::Error_Result, exc)
@@ -148,8 +148,8 @@ main (int argc, char *argv[])
 
 
 int retrieve_data (const char *content_type,
-                   Web_Server::Content_Iterator_ptr iterator,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   Web_Server::Content_Iterator_ptr iterator
+                   TAO_ENV_ARG_DECL)
 {
   Web_Server::Content_Iterator_var contents =
     Web_Server::Content_Iterator::_duplicate (iterator);
@@ -179,7 +179,7 @@ int retrieve_data (const char *content_type,
 
   for (;;)
     {
-      rc = contents->next_chunk (offset, chunk, ACE_TRY_ENV);
+      rc = contents->next_chunk (offset, chunk TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (!rc)
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index 63ec2db16cf..0ff14a044c1 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -13,46 +13,46 @@ ACE_RCSID(SMI_Iterator, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Mighty ORB",
-                                            ACE_TRY_ENV);
+                                            "Mighty ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the Iterator_Factory servant and object.
       // It activates and deactivates the Content_Iterator object.
       Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (ACE_TRY_ENV);
+        factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
-      obj = orb->resolve_initial_references ("NameService",
-                                             ACE_TRY_ENV);
+      obj = orb->resolve_initial_references ("NameService"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc;
-      nc = CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+      nc = CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a name.
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in (), ACE_TRY_ENV);
+      nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Some debugging output.
-      CORBA::String_var IOR = orb->object_to_string (factory.in (),
-                                                     ACE_TRY_ENV);
+      CORBA::String_var IOR = orb->object_to_string (factory.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 33d3f352fa9..cc5c529d9ca 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -37,26 +37,26 @@ Consumer_Handler::init (int argc,
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (argc,
-				    argv,
-				    0,
-				    ACE_TRY_ENV);
+                                    argv,
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+        this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Save the Shutdown callback.
@@ -67,20 +67,20 @@ Consumer_Handler::init (int argc,
 
       // Start the servant.
       this->receiver_ =
-	this->receiver_i_._this (ACE_TRY_ENV);
+        this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (this->get_notifier () == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
+        ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the notifier "
                            "the TAO_Naming_Client. \n"),
                           -1);
 
       // Subscribe ourselves with the notifier's broker.
       this->notifier_->subscribe (this->receiver_.in (),
-				  filtering_criteria,
-				  ACE_TRY_ENV);
+                                  filtering_criteria
+                                  TAO_ENV_ARG_PARAMETER);
     }
   ACE_CATCHANY
    {
@@ -110,15 +110,15 @@ Consumer_Handler::get_notifier (void)
       notifier_ref_name[0].id = CORBA::string_dup (NOTIFIER_BIND_NAME);
 
       CORBA::Object_var notifier_obj =
-        this->naming_services_client_->resolve (notifier_ref_name,
-                                                ACE_TRY_ENV);
+        this->naming_services_client_->resolve (notifier_ref_name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
-        Event_Comm::Notifier::_narrow (notifier_obj.in (),
-                                       ACE_TRY_ENV);
+        Event_Comm::Notifier::_narrow (notifier_obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -153,10 +153,10 @@ Consumer_Handler::run (void)
               "Running the Consumer...\n"));
 
   // Run the ORB.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index fd80f244231..56c065f735e 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -35,7 +35,7 @@ int
 Consumer_Input_Handler::close (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "closing down Consumer::Input_Handler\n"));
+              "closing down Consumer::Input_Handler\n"));
 
   Event_Comm::Consumer *receiver =
     this->receiver_handler_->receiver ();
@@ -52,11 +52,11 @@ Consumer_Input_Handler::close (void)
           // Gracefully shutdown the Receiver by removing it from the
           // Notifier's internal map.
 
-	  if (notifier != 0)
-	    notifier->unsubscribe (receiver,
-				   "",
-				   ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
+          if (notifier != 0)
+            notifier->unsubscribe (receiver,
+                                   ""
+                                   TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -86,9 +86,9 @@ int Consumer_Input_Handler::initialize (Consumer_Handler *ch)
        TAO_ORB_Core_instance ()->reactor (),
        TAO_ORB_Core_instance ()->thr_mgr ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "register_stdin_handler"),
-		      -1);
+                       "%p\n",
+                       "register_stdin_handler"),
+                      -1);
   return 0;
 }
 
@@ -104,9 +104,9 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h)
     {
       // Null terminate the buffer, replacing the '\n' with '\0'.
       if (buf[n - 1] == '\n')
-	buf[n - 1] = '\0';
+        buf[n - 1] = '\0';
       else
-	buf[n] = '\0';
+        buf[n] = '\0';
       ACE_DEBUG ((LM_DEBUG,
                   "notifying for event %s\n",
                   buf));
@@ -138,9 +138,9 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h)
 
           event.tag_ = ACE_OS::strdup (buf);
 
-          notifier->push (event, ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+          notifier->push (event TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
       ACE_CATCHANY
         {
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception\n");
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index eb224917ce0..ece9cc4de9f 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -12,7 +12,7 @@ class Consumer_Entry
 public:
   // = Initialization and termination methods.
   Consumer_Entry (Event_Comm::Consumer *consumer,
-		  const char *filtering_criteria);
+                  const char *filtering_criteria);
   // Constructor.
 
   ~Consumer_Entry (void);
@@ -49,7 +49,7 @@ Consumer_Entry::criteria (const char *criteria)
 {
   ACE_OS::free ((void *) this->filtering_criteria_);
   ACE_ALLOCATOR (this->filtering_criteria_,
-		 ACE_OS::strdup (criteria));
+                 ACE_OS::strdup (criteria));
 }
 
 const char *
@@ -86,7 +86,7 @@ Consumer_Entry::regexp (char *regexp)
 }
 
 Consumer_Entry::Consumer_Entry (Event_Comm::Consumer *consumer,
-				const char *filtering_criteria)
+                                const char *filtering_criteria)
   : filtering_criteria_ (0),
     compiled_regexp_ (0),
     consumer_ (consumer)
@@ -99,7 +99,7 @@ Consumer_Entry::Consumer_Entry (Event_Comm::Consumer *consumer,
   // Check for wildcard case first.
   if (ACE_OS::strcmp (filtering_criteria, "") == 0)
     ACE_ALLOCATOR (compile_buffer,
-		   ACE_OS::strdup (""));
+                   ACE_OS::strdup (""));
   else
   {
 #if defined (ACE_HAS_REGEX)
@@ -109,7 +109,7 @@ Consumer_Entry::Consumer_Entry (Event_Comm::Consumer *consumer,
 #else
     // Win32 does not support regular expression functions such as compile.
     ACE_ALLOCATOR (compile_buffer,
-		   ACE_OS::strdup (""));
+                   ACE_OS::strdup (""));
 #endif // #if defined (ACE_HAS_REGEX)
   }
 
@@ -156,16 +156,16 @@ The filtering criteria will not work.\n"));
 
 void
 Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
-		       const char *filtering_criteria,
-		       CORBA::Environment &ACE_TRY_ENV)
+                       const char *filtering_criteria
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    Event_Comm::Notifier::CannotSubscribe
                    ))
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "in Notifier_i::subscribe for %x with filtering criteria \"%s\"\n",
-	      consumer_ref,
+              "in Notifier_i::subscribe for %x with filtering criteria \"%s\"\n",
+              consumer_ref,
               filtering_criteria));
 
   MAP_ITERATOR mi (this->map_);
@@ -186,16 +186,16 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
 
       // Check for a duplicate entry.
       if (consumer_ref->_is_equivalent (me->ext_id_)
-	  && (ACE_OS::strcmp (filtering_criteria,
-			      "") == 0
-	      || ACE_OS::strcmp (filtering_criteria,
-				 nr_entry->criteria ()) == 0))
-	{
-	  // Inform the caller that the <Event_Comm::Consumer> * is
-	  // already being used.
-
-	  ACE_THROW (Event_Comm::Notifier::CannotSubscribe ("Duplicate consumer and filtering criteria found.\n"));
-	}
+          && (ACE_OS::strcmp (filtering_criteria,
+                              "") == 0
+              || ACE_OS::strcmp (filtering_criteria,
+                                 nr_entry->criteria ()) == 0))
+        {
+          // Inform the caller that the <Event_Comm::Consumer> * is
+          // already being used.
+
+          ACE_THROW (Event_Comm::Notifier::CannotSubscribe ("Duplicate consumer and filtering criteria found.\n"));
+        }
     }
 
   // If we get this far then we didn't find a duplicate, so add the
@@ -203,7 +203,7 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
   Consumer_Entry *nr_entry;
   ACE_NEW (nr_entry,
            Consumer_Entry (consumer_ref,
-			   filtering_criteria));
+                           filtering_criteria));
 
   // Try to add new <Consumer_Entry> to the map.
   if (this->map_.bind (nr_entry->consumer(), nr_entry) == -1)
@@ -218,8 +218,8 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
 
 void
 Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
-			 const char *filtering_criteria,
-			 CORBA::Environment &ACE_TRY_ENV)
+                         const char *filtering_criteria
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    Event_Comm::Notifier::CannotUnsubscribe
@@ -227,7 +227,7 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Notifier_i::unsubscribe for %x\n",
-	      consumer_ref));
+              consumer_ref));
 
   Consumer_Entry *nr_entry = 0;
   MAP_ITERATOR mi (this->map_);
@@ -249,22 +249,22 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
 
       // Look for a match ..
       if (consumer_ref->_is_equivalent (me->ext_id_)
-	  && (ACE_OS::strcmp (filtering_criteria, "") == 0
-	      || ACE_OS::strcmp (filtering_criteria,
-				 nr_entry->criteria ()) == 0))
-	{
-	  ACE_DEBUG ((LM_DEBUG,
+          && (ACE_OS::strcmp (filtering_criteria, "") == 0
+              || ACE_OS::strcmp (filtering_criteria,
+                                 nr_entry->criteria ()) == 0))
+        {
+          ACE_DEBUG ((LM_DEBUG,
                       "removed entry %x with criteria \"%s\"\n",
                       consumer_ref,
                       filtering_criteria));
-	  found = 1;
-	  // @@ This is a hack, we need a better approach!
-	  if (this->map_.unbind (me->ext_id_,
-				 nr_entry) == -1)
-	    ACE_THROW (Event_Comm::Notifier::CannotUnsubscribe ("Internal map unbind failed."));
-	  else
-	    delete nr_entry;
-	}
+          found = 1;
+          // @@ This is a hack, we need a better approach!
+          if (this->map_.unbind (me->ext_id_,
+                                 nr_entry) == -1)
+            ACE_THROW (Event_Comm::Notifier::CannotUnsubscribe ("Internal map unbind failed."));
+          else
+            delete nr_entry;
+        }
     }
 
   if (found == 0)
@@ -274,8 +274,8 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
 // Disconnect all the consumers, giving them the <reason>.
 
 void
-Notifier_i::disconnect (const char *reason,
-			CORBA::Environment &ACE_TRY_ENV)
+Notifier_i::disconnect (const char *reason
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -301,13 +301,13 @@ Notifier_i::disconnect (const char *reason,
                   consumer_ref));
       ACE_TRY
         {
-          consumer_ref->disconnect (reason,
-                                    ACE_TRY_ENV);
+          consumer_ref->disconnect (reason
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
-	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception\n");
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception\n");
         }
       ACE_ENDTRY;
 
@@ -329,13 +329,13 @@ Notifier_i::disconnect (const char *reason,
 // Notify all consumers whose filtering criteria match the event.
 
 void
-Notifier_i::push (const Event_Comm::Event &event,
-		  CORBA::Environment &ACE_TRY_ENV)
+Notifier_i::push (const Event_Comm::Event &event
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "in Notifier_i::send_notification = %s\n",
-	      (const char *) event.tag_));
+              (const char *) event.tag_));
   MAP_ITERATOR mi (this->map_);
   int count = 0;
 
@@ -355,31 +355,31 @@ Notifier_i::push (const Event_Comm::Event &event,
 
       // Do a regular expression comparison to determine matching.
       if (ACE_OS::strcmp ("", criteria) == 0 // Everything matches the wildcard.
-	  || ACE_OS::step (event.tag_, regexp) != 0)
+          || ACE_OS::step (event.tag_, regexp) != 0)
 #endif // #if defined (ACE_HAS_REGEX)
         // if ACE_HAS_REGEX has not been defined,
         // let everything through.
-	{
-	  ACE_DEBUG ((LM_DEBUG,
+        {
+          ACE_DEBUG ((LM_DEBUG,
                       "string %s matched regexp \"%s\" for client %x\n",
-		      (const char *) event.tag_,
-		      me->int_id_->criteria (),
-		      consumer_ref));
-	  ACE_TRY
+                      (const char *) event.tag_,
+                      me->int_id_->criteria (),
+                      consumer_ref));
+          ACE_TRY
             {
-              consumer_ref->push (event,
-				  ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
+              consumer_ref->push (event
+                                  TAO_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
             }
-	  ACE_CATCHANY
+          ACE_CATCHANY
             {
-	      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                                    "Unexpected exception\n");
               continue;
             }
-	  ACE_ENDTRY;
-	  count++;
-	}
+          ACE_ENDTRY;
+          count++;
+        }
     }
 
   if (count == 1)
@@ -404,8 +404,8 @@ Consumer_i::~Consumer_i (void)
 // occurred.
 
 void
-Consumer_i::push (const Event_Comm::Event &event,
-		  CORBA::Environment &)
+Consumer_i::push (const Event_Comm::Event &event
+                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *tmpstr = event.tag_;
@@ -419,8 +419,8 @@ Consumer_i::push (const Event_Comm::Event &event,
 // <Event_Comm::Notifier>.
 
 void
-Consumer_i::disconnect (const char *reason,
-			CORBA::Environment &)
+Consumer_i::disconnect (const char *reason
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index 3477437422c..ec27c355bab 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -56,13 +56,13 @@ public:
   void set_reactor (ACE_Reactor *reactor);
   // set the <ACE_Reactor> to use when quitting.
 
-  virtual void push (const Event_Comm::Event & event,
-                     CORBA::Environment &TAO_TRY_ENV)
+  virtual void push (const Event_Comm::Event & event
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Pass the <event> to the <Consumer>.
 
-  virtual void disconnect (const char * reason,
-                           CORBA::Environment &TAO_TRY_ENV)
+  virtual void disconnect (const char * reason
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Disconnect the <Consumer> from the <Notifier>, giving it the
@@ -93,20 +93,20 @@ public:
   Notifier_i (size_t size_hint = Notifier_i::DEFAULT_SIZE);
   // Initialize a Notifier_i object with the specified size hint.
 
-  virtual void disconnect (const char *reason,
-                           CORBA::Environment &TAO_TRY_ENV)
+  virtual void disconnect (const char *reason
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect all the receivers, giving them the <reason>.
 
-  virtual void push (const Event_Comm::Event &event,
-                     CORBA::Environment &TAO_TRY_ENV)
+  virtual void push (const Event_Comm::Event &event
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send the <event> to all the consumers who have subscribed and who
   // match the filtering criteria.
 
    virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
-                           const char * filtering_criteria,
-                           CORBA::Environment &TAO_TRY_ENV)
+                           const char * filtering_criteria
+                           TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((
                       CORBA::SystemException,
                       Event_Comm::Notifier::CannotSubscribe
@@ -115,8 +115,8 @@ public:
   // <filtering_criteria> applied by the <Notifier>.
 
  void unsubscribe (Event_Comm::Consumer *consumer,
-                    const char *filtering_criteria,
-                    CORBA::Environment &TAO_TRY_ENV)
+                    const char *filtering_criteria
+                    TAO_ENV_ARG_DECL)
    ACE_THROW_SPEC ((
                     CORBA::SystemException,
                     Event_Comm::Notifier::CannotUnsubscribe
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 795c52b6e43..f540f1fd367 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -79,8 +79,8 @@ Notifier_Handler::notifier (Event_Comm::Notifier *notifier)
 
 int
 Notifier_Handler::init (int argc,
-			char *argv[],
-			ShutdownCallback* _shutdowncallback)
+                        char *argv[],
+                        ShutdownCallback* _shutdowncallback)
 {
   // set the callback
  shutdowncallback = _shutdowncallback;
@@ -90,25 +90,25 @@ Notifier_Handler::init (int argc,
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+        this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialization of the naming service.
@@ -124,16 +124,16 @@ Notifier_Handler::init (int argc,
       CORBA::string_dup (NOTIFIER_BIND_NAME);
 
       CORBA::Object_var notifier_obj =
-       this->naming_client_->resolve (notifier_ref_name,
-				      ACE_TRY_ENV);
+       this->naming_client_->resolve (notifier_ref_name
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
-         Event_Comm::Notifier::_narrow (notifier_obj.in (),
-					ACE_TRY_ENV);
+         Event_Comm::Notifier::_narrow (notifier_obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
   }
  ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index c69a5885e51..40451d57576 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -27,8 +27,8 @@ Notifier_Server::close (void)
   ACE_TRY_NEW_ENV
     {
       // disconnect all the consumers.
-      this->servant_.disconnect ("notifier shutdown.",
-                                 ACE_TRY_ENV);
+      this->servant_.disconnect ("notifier shutdown."
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Name the object.
@@ -37,8 +37,8 @@ Notifier_Server::close (void)
       notifier_obj_name[0].id =
         CORBA::string_dup (NOTIFIER_BIND_NAME);
 
-      this->naming_server_->unbind (notifier_obj_name,
-                                    ACE_TRY_ENV);
+      this->naming_server_->unbind (notifier_obj_name
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instruct the ORB to shutdown.
@@ -57,7 +57,7 @@ Notifier_Server::close (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -76,7 +76,7 @@ Notifier_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
       // Register the object implementation with the POA.
       Event_Comm::Notifier_var notifier_obj =
-        this->servant_._this (ACE_TRY_ENV);
+        this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Name the object.
@@ -88,8 +88,8 @@ Notifier_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
       // Now, attach the object name to the context.
       this->naming_server_->bind (notifier_obj_name,
-                                  notifier_obj.in (),
-                                  ACE_TRY_ENV);
+                                  notifier_obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -107,16 +107,16 @@ Notifier_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 // Initialize the server.
 int
 Notifier_Server::init (int argc,
-                       char *argv[],
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char *argv[]
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create the child poa under the root POA.
 
  if (this->orb_manager_.init_child_poa (argc,
                                         argv,
-                                        "child_poa",
-                                        ACE_TRY_ENV) == -1)
+                                        "child_poa"
+                                        TAO_ENV_ARG_PARAMETER) == -1)
 
    ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
@@ -124,26 +124,26 @@ Notifier_Server::init (int argc,
                       -1);
  ACE_CHECK_RETURN (-1);
 
- this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+ this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
  ACE_CHECK_RETURN (-1);
 
  // Activate the servant in the POA.
  CORBA::String_var str =
    this->orb_manager_.activate_under_child_poa (NOTIFIER_BIND_NAME,
-                                                 &this->servant_,
-                                                ACE_TRY_ENV);
+                                                 &this->servant_
+                                                TAO_ENV_ARG_PARAMETER);
 
- return this->init_naming_service (ACE_TRY_ENV);
+ return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
-Notifier_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Notifier_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the notifier server...\n"));
 
   // Run the main event loop for the ORB.
-  this->orb_manager_.run (ACE_TRY_ENV);
+  this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index d4014e23bb6..8f09294582d 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -35,10 +35,10 @@ public:
   ~Notifier_Server (void);
   // Destructor.
 
- int init (int argc, char *argv[], CORBA::Environment &env);
+ int init (int argc, char *argv[] TAO_ENV_ARG_DECL);
   // Initialize the Server state.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   int close (void);
@@ -48,7 +48,7 @@ public:
   // Reactor accessor.
 
 private:
-  int init_naming_service (CORBA::Environment &env);
+  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Initialises the name server and registers the Notifier server
   // object name with the name server.
 
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index e88962f7049..64953cb2dbb 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -48,9 +48,9 @@ Supplier_Input_Handler::initialize (Notifier_Handler *notifier)
        TAO_ORB_Core_instance ()->reactor (),
        TAO_ORB_Core_instance ()->thr_mgr ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "register_stdin_handler"),
-		      -1);
+                       "%p\n",
+                       "register_stdin_handler"),
+                      -1);
 
 
   return 0;
@@ -66,7 +66,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
   // Read up to BUFSIZ worth of data from ACE_HANDLE h.
 
   if (ACE_OS::fgets (buf,
-		     sizeof buf - 1,
+                     sizeof buf - 1,
                      stdin) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -79,12 +79,12 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
 
       // Null terminate the buffer, replacing the '\n' with '\0'.
       if (buf[n - 1] == '\n')
-	buf[n - 1] = '\0';
+        buf[n - 1] = '\0';
       else
-	buf[n] = '\0';
+        buf[n] = '\0';
       ACE_DEBUG ((LM_DEBUG,
-		  "notifying for event %s\n",
-		  buf));
+                  "notifying for event %s\n",
+                  buf));
     }
 
 
@@ -109,8 +109,8 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
           // reference...  event.value_ = ...
 
           // Forward <Event> to all <Consumers>.
-          notifier->push (event, ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
+          notifier->push (event TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index f8cbc83c9bb..bb8ea19c6fb 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -22,7 +22,7 @@ Notifier::run (void)
 {
   ACE_TRY_NEW_ENV
     {
-      ns_.run (ACE_TRY_ENV);
+      ns_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -36,7 +36,7 @@ Notifier::Notifier (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      ns_.init (argc, argv, ACE_TRY_ENV);
+      ns_.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 4c7b91e4828..6f4e45d8c7c 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -73,12 +73,12 @@ Identity_Client::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -100,19 +100,19 @@ Identity_Client::init (int argc,
 }
 
 int
-Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
+Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized \n"));
 
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
-    orb->string_to_object (this->group_factory_ior_,
-                           ACE_TRY_ENV);
+    orb->string_to_object (this->group_factory_ior_
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   Load_Balancer::Object_Group_Factory_var factory =
-    Load_Balancer::Object_Group_Factory::_narrow (obj.in (),
-                                                  ACE_TRY_ENV);
+    Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (factory.in ()))
@@ -130,12 +130,12 @@ Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
               "Identity_Client: Requesting Object Group "
               "with id <%s>\n", group_name));
   Load_Balancer::Object_Group_var object_group =
-    factory->resolve (group_name,
-                      ACE_TRY_ENV);
+    factory->resolve (group_name
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // List <Object_Group>'s id.
-  CORBA::String_var id = object_group->id (ACE_TRY_ENV);
+  CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ACE_OS::strcmp (id.in (), group_name) != 0)
@@ -150,7 +150,7 @@ Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
               group_name));
 
   Load_Balancer::Member_ID_List_var id_list =
-    object_group->members (ACE_TRY_ENV);
+    object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -177,19 +177,19 @@ Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
 
   for (size_t ind = 0; ind < this->number_of_invocations_; ++ind)
     {
-      obj = object_group->resolve (ACE_TRY_ENV);
+      obj = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      identity_object = Identity::_narrow (obj.in (),
-                                           ACE_TRY_ENV);
+      identity_object = Identity::_narrow (obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       if (CORBA::is_nil (identity_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Identity_Client: cannot narrow an object received from"
                            "<Object_Group::resolve> to <Identity>\n"),
                           -1);
-      identity_object->get_name (identity.out (),
-                                 ACE_TRY_ENV);
+      identity_object->get_name (identity.out ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -212,10 +212,10 @@ main (int argc, char *argv[])
   if (client.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      result = client.run (ACE_TRY_ENV);
+      result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index ea79ad1881c..cb25fd2a0c3 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -69,12 +69,12 @@ Identity_Server::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -88,12 +88,12 @@ Identity_Server::init (int argc,
       // <Object_Group>s, one random and one rr.
       CORBA::ORB_var orb = orb_manager_.orb ();
       CORBA::Object_var obj =
-        orb->string_to_object (this->group_factory_ior_,
-                               ACE_TRY_ENV);
+        orb->string_to_object (this->group_factory_ior_
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Load_Balancer::Object_Group_Factory_var factory =
-        Load_Balancer::Object_Group_Factory::_narrow (obj.in (),
-                                                      ACE_TRY_ENV);
+        Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -107,8 +107,8 @@ Identity_Server::init (int argc,
                   "Group with id <Identity, Random>\n"));
 
       Load_Balancer::Object_Group_var random_group =
-        factory->make_random ("Identity, Random",
-                              ACE_TRY_ENV);
+        factory->make_random ("Identity, Random"
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -116,8 +116,8 @@ Identity_Server::init (int argc,
                   "Object Group with id <Identity, Round Robin>\n"));
 
       Load_Balancer::Object_Group_var rr_group =
-        factory->make_round_robin ("Identity, Round Robin",
-                                   ACE_TRY_ENV);
+        factory->make_round_robin ("Identity, Round Robin"
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the requested number of <Identity> objects, and
@@ -129,8 +129,8 @@ Identity_Server::init (int argc,
                   "with <Identity, Random> Object Group\n",
                     random_objects_));
       create_objects (random_objects_,
-                      random_group.in (),
-                      ACE_TRY_ENV);
+                      random_group.in ()
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -138,8 +138,8 @@ Identity_Server::init (int argc,
                   "with <Identity, Round Robin> Object Group\n",
                     random_objects_));
       create_objects (rr_objects_,
-                      rr_group.in (),
-                      ACE_TRY_ENV);
+                      rr_group.in ()
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -155,8 +155,8 @@ Identity_Server::init (int argc,
 
 void
 Identity_Server::create_objects (size_t number_of_objects,
-                                 Load_Balancer::Object_Group_ptr group,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 Load_Balancer::Object_Group_ptr group
+                                 TAO_ENV_ARG_DECL)
 {
   // Create the specified number of servants, and register each one
   // with the provided <Object_Group>.
@@ -175,30 +175,30 @@ Identity_Server::create_objects (size_t number_of_objects,
                         CORBA::NO_MEMORY ());
       ACE_CHECK;
       PortableServer::ServantBase_var s = identity_servant;
-      orb_manager_.activate (identity_servant,
-                             ACE_TRY_ENV);
+      orb_manager_.activate (identity_servant
+                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       Load_Balancer::Member member;
       member.id = CORBA::string_dup (id);
-      member.obj = identity_servant->_this (ACE_TRY_ENV);
+      member.obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Bind the servant in the <Object_Group>.
-      group->bind (member, ACE_TRY_ENV);
+      group->bind (member TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 int
-Identity_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Identity_Server: Initialized \n"));
 
   int result;
 
-  result = this->orb_manager_.run (ACE_TRY_ENV);
+  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -217,10 +217,10 @@ main (int argc, char *argv[])
   if (server.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      result = server.run (ACE_TRY_ENV);
+      result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h
index a4336dc7972..698d5c89806 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.h
+++ b/TAO/examples/Load_Balancing/Identity_Server.h
@@ -49,7 +49,7 @@ public:
   // Performs all the initializations necessary before going into the
   // ORB event loop.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
@@ -57,8 +57,8 @@ private:
   // Parses the commandline arguments.
 
   void create_objects (size_t number_of_objects,
-                       Load_Balancer::Object_Group_ptr group,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       Load_Balancer::Object_Group_ptr group
+                       TAO_ENV_ARG_DECL);
   // Creates the specified number of identity objects, and registers
   // each one with the provided <Object_Group>.  Identity servants are
   // given names
diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp
index 20e57a25206..ff364494541 100644
--- a/TAO/examples/Load_Balancing/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing/Identity_i.cpp
@@ -24,8 +24,8 @@ Identity_i::~Identity_i (void)
 }
 
 void
-Identity_i::get_name (CORBA::String_out name,
-                      CORBA::Environment & )
+Identity_i::get_name (CORBA::String_out name
+                      TAO_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h
index 7d490030ba2..281ca40f138 100644
--- a/TAO/examples/Load_Balancing/Identity_i.h
+++ b/TAO/examples/Load_Balancing/Identity_i.h
@@ -36,9 +36,8 @@ public:
   ~Identity_i (void);
   // Destructor.
 
-  virtual void get_name (CORBA::String_out name,
-                         CORBA::Environment &ACE_TRY_ENV =
-                         CORBA::Environment::default_environment ())
+  virtual void get_name (CORBA::String_out name
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the name of this object.
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
index bc7d72f5827..9bc3e9a90ba 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -32,31 +32,31 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id,
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_round_robin (const char * id,
-                                          CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::make_round_robin (const char * id
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
   return make_group (0,
-                     id,
-                     ACE_TRY_ENV);
+                     id
+                     TAO_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_random (const char * id,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::make_random (const char * id
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
   return make_group (1,
-                     id,
-                     ACE_TRY_ENV);
+                     id
+                     TAO_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
-                                    const char * id,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const char * id
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -89,10 +89,10 @@ Object_Group_Factory_i::make_group (int random,
       ACE_Auto_Basic_Ptr<Object_Group_i> temp (group_servant);
 
       // Register with the poa, begin using ref. counting.
-      group = group_servant->_this (ACE_TRY_ENV);
+      group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (group._retn ());
 
-      group_servant->_remove_ref (ACE_TRY_ENV);
+      group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
       temp.release ();
 
@@ -122,8 +122,8 @@ Object_Group_Factory_i::make_group (int random,
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::resolve (const char * id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::resolve (const char * id
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -139,8 +139,8 @@ Object_Group_Factory_i::resolve (const char * id,
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::list_groups (int random,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::list_groups (int random
+                                     TAO_ENV_ARG_DECL)
 {
   Load_Balancer::Group_List * list;
 
@@ -181,17 +181,17 @@ Object_Group_Factory_i::list_groups (int random,
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (0, ACE_TRY_ENV);
+  return list_groups (0 TAO_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (1, ACE_TRY_ENV);
+  return list_groups (1 TAO_ENV_ARG_PARAMETER);
 }
 
 Object_Group_i::Object_Group_i (const char * id,
@@ -214,15 +214,15 @@ Object_Group_i::~Object_Group_i (void)
 }
 
 char *
-Object_Group_i::id (CORBA::Environment &)
+Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
 }
 
 void
-Object_Group_i::bind (const Load_Balancer::Member & member,
-                      CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::bind (const Load_Balancer::Member & member
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::duplicate_member))
 {
@@ -256,8 +256,8 @@ Object_Group_i::bind (const Load_Balancer::Member & member,
 }
 
 void
-Object_Group_i::unbind (const char * id,
-                        CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::unbind (const char * id
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -286,8 +286,8 @@ Object_Group_i::unbind (const char * id,
 }
 
 CORBA::Object_ptr
-Object_Group_i::resolve_with_id (const char * id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::resolve_with_id (const char * id
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -302,7 +302,7 @@ Object_Group_i::resolve_with_id (const char * id,
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list;
@@ -331,21 +331,21 @@ Object_Group_i::members (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Object_Group_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -366,18 +366,18 @@ Random_Object_Group::~Random_Object_Group (void)
 }
 
 void
-Random_Object_Group::destroy (CORBA::Environment &ACE_TRY_ENV)
+Random_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
   my_factory_->remove_group (id_, 1);
 
-  Object_Group_i::destroy (ACE_TRY_ENV);
+  Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-Random_Object_Group::resolve (CORBA::Environment &ACE_TRY_ENV)
+Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -416,18 +416,18 @@ RR_Object_Group::~RR_Object_Group (void)
 }
 
 void
-RR_Object_Group::destroy (CORBA::Environment &ACE_TRY_ENV)
+RR_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
   my_factory_->remove_group (id_, 0);
 
-  Object_Group_i::destroy (ACE_TRY_ENV);
+  Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-RR_Object_Group::resolve (CORBA::Environment &ACE_TRY_ENV)
+RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -458,8 +458,8 @@ RR_Object_Group::resolve (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-RR_Object_Group::unbind (const char *id,
-                         CORBA::Environment &ACE_TRY_ENV)
+RR_Object_Group::unbind (const char *id
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index 8bfd67b0c0d..cf997db1d6c 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -58,8 +58,8 @@ public:
 
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id,
-                                                    CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Object_Group_ptr make_round_robin (const char * id
+                                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -68,8 +68,8 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id,
-                                               CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Object_Group_ptr make_random (const char * id
+                                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -78,22 +78,22 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  Load_Balancer::Object_Group_ptr resolve (const char * id,
-                                           CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Object_Group_ptr resolve (const char * id
+                                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
   // Locates and returns an <Object_Group> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
@@ -115,16 +115,16 @@ private:
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              const char * id
+                                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // This function factors out common code in <make_round_robin> and
   // <make_random>.  Creates a random <Object_Group> if <random> parameter is
   // set to 1 and round robin <Object_Group> if it is 0.
 
-  Load_Balancer::Group_List * list_groups (int random,
-                                           CORBA::Environment &ACE_TRY_ENV);
+  Load_Balancer::Group_List * list_groups (int random
+                                           TAO_ENV_ARG_DECL);
   // This function factors out common code in <random_groups> and
   // <round_robin_groups>.  Returns a sequence of its random
   // groups if <random> parameter is set to 1 and a sequence of its
@@ -170,12 +170,12 @@ public:
 
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (CORBA::Environment &ACE_TRY_ENV)
+  char * id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get group's id.
 
-  void bind (const Load_Balancer::Member & member,
-             CORBA::Environment &ACE_TRY_ENV)
+  void bind (const Load_Balancer::Member & member
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_member));
   // Adds a new <member> to the <Object_Group>.  Note that each
@@ -183,15 +183,15 @@ public:
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id,
-               CORBA::Environment &ACE_TRY_ENV)
+  void unbind (const char * id
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
-  CORBA::Object_ptr resolve (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member)) = 0;
   // Returns a member object from this <Object_Group> in accordance with
@@ -199,19 +199,19 @@ public:
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  CORBA::Object_ptr resolve_with_id (const char * id,
-                                     CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr resolve_with_id (const char * id
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV)
+  void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -265,13 +265,13 @@ public:
   ~Random_Object_Group (void);
   // Destructor.
 
-  CORBA::Object_ptr resolve (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
   // the "random" load balancing policy.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV)
+  void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -294,21 +294,21 @@ public:
   ~RR_Object_Group (void);
   // Destructor.
 
-  void unbind (const char * id,
-               CORBA::Environment &ACE_TRY_ENV)
+  void unbind (const char * id
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  CORBA::Object_ptr resolve (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
   // the "round robin" load balancing policy.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV)
+  void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index 04a4cca0a98..336a60f8174 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -65,12 +65,12 @@ Load_Balancing_Service::init (int argc,
   int result;
   CORBA::String_var ior;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -86,8 +86,8 @@ Load_Balancing_Service::init (int argc,
                       Object_Group_Factory_i (),
                       -1);
       PortableServer::ServantBase_var s = factory_servant;
-      ior = orb_manager_.activate (factory_servant,
-                                   ACE_TRY_ENV);
+      ior = orb_manager_.activate (factory_servant
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior.in () == 0)
@@ -118,14 +118,14 @@ Load_Balancing_Service::init (int argc,
 
 
 int
-Load_Balancing_Service::run (CORBA::Environment &ACE_TRY_ENV)
+Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Load_Balancer: Initialized \n"));
 
   int result;
 
-  result = this->orb_manager_.run (ACE_TRY_ENV);
+  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -144,10 +144,10 @@ main (int argc, char *argv[])
   if (factory.init (argc, argv) == -1)
     return 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      result = factory.run (ACE_TRY_ENV);
+      result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 14f9b340346..33baf763aa6 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -81,8 +81,8 @@ Identity_Client::init (int argc,
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -104,13 +104,13 @@ Identity_Client::init (int argc,
 }
 
 int
-Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
+Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
-    orb->string_to_object (this->group_factory_ior_,
-                           ACE_TRY_ENV);
+    orb->string_to_object (this->group_factory_ior_
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (obj.in () == 0)
@@ -120,8 +120,8 @@ Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
                       -1);
 
   Load_Balancer::Object_Group_Factory_var factory =
-    Load_Balancer::Object_Group_Factory::_narrow (obj.in (),
-                                                  ACE_TRY_ENV);
+    Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (factory.in ()))
@@ -156,8 +156,8 @@ Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
 #endif /*TAO_MEASURE_STATS*/
       // Remote call
       object_group =
-        factory->resolve (group_name,
-                          ACE_TRY_ENV);
+        factory->resolve (group_name
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::String_var iorstring =
@@ -187,13 +187,13 @@ Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
     }
 
   // List <Object_Group>'s id.
-  CORBA::String_var id = object_group->id (ACE_TRY_ENV);
+  CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Object Group's id is: %s\n\n", id.in ()));
 
   // List all <Object_Group>s members.
   Load_Balancer::Member_ID_List_var id_list =
-    object_group->members (ACE_TRY_ENV);
+    object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG,
               "The group contains %d members:\n",
@@ -211,15 +211,15 @@ Identity_Client::run (CORBA::Environment &ACE_TRY_ENV)
 
   for (size_t ind = 0; ind < this->number_of_invocations_; ++ind)
     {
-      objref = object_group->resolve (ACE_TRY_ENV);
+      objref = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      obj = orb->string_to_object (objref.in (),
-                                   ACE_TRY_ENV);
+      obj = orb->string_to_object (objref.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      identity_object = Identity::_narrow (obj.in (),
-                                           ACE_TRY_ENV);
+      identity_object = Identity::_narrow (obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (identity_object.in ()))
@@ -256,7 +256,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = client.run (ACE_TRY_ENV);
+      result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 12b37f2bcb7..d99c6355b72 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -61,8 +61,8 @@ Identity_Server::init (int argc,
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -72,20 +72,20 @@ Identity_Server::init (int argc,
 
       // Lifespan policy
       policies[0] =
-        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                               ACE_TRY_ENV);
+        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT
+                                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
-        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                                          ACE_TRY_ENV);
+        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->persistent_POA_  =
         this->orb_manager_.root_poa()->create_POA ("persistent_server",
                                                    this->orb_manager_.poa_manager (),
-                                                   policies,
-                                                   ACE_TRY_ENV);
+                                                   policies
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -94,7 +94,7 @@ Identity_Server::init (int argc,
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -112,7 +112,7 @@ Identity_Server::init (int argc,
 }
 
 int
-Identity_Server::register_groups (CORBA::Environment &ACE_TRY_ENV)
+Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
 {
 
 
@@ -121,13 +121,13 @@ Identity_Server::register_groups (CORBA::Environment &ACE_TRY_ENV)
   // <Object_Group>s, one random and one rr.
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
-    orb->string_to_object (this->group_factory_ior_,
-                           ACE_TRY_ENV);
+    orb->string_to_object (this->group_factory_ior_
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Load_Balancer::Object_Group_Factory_var factory =
-    Load_Balancer::Object_Group_Factory::_narrow (obj.in (),
-                                                  ACE_TRY_ENV);
+    Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (factory.in ()))
@@ -140,8 +140,8 @@ Identity_Server::register_groups (CORBA::Environment &ACE_TRY_ENV)
   // Unbind the previously registered random group.
   ACE_TRY_EX (UNBIND_RANDOM)
     {
-      factory->unbind_random ("Random group",
-                              ACE_TRY_ENV);
+      factory->unbind_random ("Random group"
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (UNBIND_RANDOM);
     }
   ACE_CATCHANY
@@ -154,8 +154,8 @@ Identity_Server::register_groups (CORBA::Environment &ACE_TRY_ENV)
   // Unbind the previously registered round robin group
   ACE_TRY_EX (UNBIND_ROUND)
     {
-      factory->unbind_round_robin ("Round Robin group",
-                                   ACE_TRY_ENV);
+      factory->unbind_round_robin ("Round Robin group"
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (UNBIND_ROUND);
     }
   ACE_CATCHANY
@@ -168,13 +168,13 @@ Identity_Server::register_groups (CORBA::Environment &ACE_TRY_ENV)
 
   // We want to make two groups Random & Round Robin.
   Load_Balancer::Object_Group_var random_group =
-    factory->make_random ("Random group",
-                          ACE_TRY_ENV);
+    factory->make_random ("Random group"
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Load_Balancer::Object_Group_var rr_group =
-    factory->make_round_robin ("Round Robin group",
-                               ACE_TRY_ENV);
+    factory->make_round_robin ("Round Robin group"
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -182,14 +182,14 @@ Identity_Server::register_groups (CORBA::Environment &ACE_TRY_ENV)
   // register them with the random and round robin
   // <Object_Group>s.
   this->create_objects (random_objects_,
-                        random_group.in (),
-                        ACE_TRY_ENV);
+                        random_group.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
   this->create_objects (rr_objects_,
-                        rr_group.in (),
-                        ACE_TRY_ENV);
+                        rr_group.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -197,8 +197,8 @@ Identity_Server::register_groups (CORBA::Environment &ACE_TRY_ENV)
 
 void
 Identity_Server::create_objects (size_t number_of_objects,
-                                 Load_Balancer::Object_Group_ptr group,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 Load_Balancer::Object_Group_ptr group
+                                 TAO_ENV_ARG_DECL)
 {
   // Create the specified number of servants, and register each one
   // with the provided <Object_Group>.
@@ -218,23 +218,23 @@ Identity_Server::create_objects (size_t number_of_objects,
       ACE_CHECK;
 
       PortableServer::ServantBase_var s = identity_servant;
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Object_var obj = identity_servant->_this (ACE_TRY_ENV);
+      CORBA::Object_var obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Load_Balancer::Member member;
       member.id = CORBA::string_dup (id);
       member.obj =
-        this->orb_manager_.orb ()->object_to_string (obj.in (),
-                                                     ACE_TRY_ENV);
+        this->orb_manager_.orb ()->object_to_string (obj.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Do an unbind and then bind
       ACE_TRY_EX (UNBIND)
         {
-          group->unbind (id, ACE_TRY_ENV);
+          group->unbind (id TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (UNBIND);
         }
       ACE_CATCHANY
@@ -245,18 +245,18 @@ Identity_Server::create_objects (size_t number_of_objects,
       ACE_ENDTRY;
 
       // Bind the servant in the random <Object_Group>.
-      group->bind (member, ACE_TRY_ENV);
+      group->bind (member TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
     }
 }
 
 int
- Identity_Server::run (CORBA::Environment &ACE_TRY_ENV)
+ Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   int result;
 
-  result = this->orb_manager_.run (ACE_TRY_ENV);
+  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -282,10 +282,10 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = server.register_groups (ACE_TRY_ENV);
+      result = server.register_groups (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      result = server.run (ACE_TRY_ENV);
+      result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index 595a1a2fc7a..7ee31f5fd29 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
@@ -52,18 +52,18 @@ public:
   // Performs all the initializations necessary before going into the
   // ORB event loop.
 
-  int register_groups (CORBA::Environment &ACE_TRY_ENV);
+  int register_groups (TAO_ENV_SINGLE_ARG_DECL);
 
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
 
 
   void create_objects (size_t number_of_objects,
-                       Load_Balancer::Object_Group_ptr group,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       Load_Balancer::Object_Group_ptr group
+                       TAO_ENV_ARG_DECL);
   // Creates the specified number of identity objects, and registers
   // each one with the provided <Object_Group>.  Identity servants are
   // given names
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
index a7b704a354a..16ac105669f 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
@@ -26,15 +26,15 @@ Identity_i::~Identity_i (void)
 }
 
 void
-Identity_i::get_name (CORBA::String_out name,
-                      CORBA::Environment &)
+Identity_i::get_name (CORBA::String_out name
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
 }
 
 PortableServer::POA_ptr
-Identity_i::_default_POA (CORBA::Environment &)
+Identity_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h
index 5728161ad9f..0e381b99b4c 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h
@@ -37,17 +37,16 @@ public:
   ~Identity_i (void);
   // Destructor.
 
-  virtual void get_name (CORBA::String_out name,
-                         CORBA::Environment &ACE_TRY_ENV =
-                         CORBA::Environment::default_environment ())
+  virtual void get_name (CORBA::String_out name
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the name of this object.
 
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &ACE_TRY_ENV)
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Method for the POA that will return the persistent POA_ptr stored
   // in here..
-  
+
 private:
 
   CORBA::String_var name_;
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 0b18896e7e5..8448a84b8c6 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -39,7 +39,7 @@ Object_Group_Factory_i::~Object_Group_Factory_i (void)
 }
 
 PortableServer::POA_ptr
-Object_Group_Factory_i::_default_POA (CORBA::Environment &)
+Object_Group_Factory_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
@@ -47,8 +47,8 @@ Object_Group_Factory_i::_default_POA (CORBA::Environment &)
 
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_round_robin (const char * id,
-                                          CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::make_round_robin (const char * id
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -73,13 +73,13 @@ Object_Group_Factory_i::make_round_robin (const char * id,
     }
 
   return this->make_group (0,
-                           id,
-                           ACE_TRY_ENV);
+                           id
+                           TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Object_Group_Factory_i::unbind_round_robin (const char * id,
-                                            CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::unbind_round_robin (const char * id
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -119,8 +119,8 @@ Object_Group_Factory_i::unbind_round_robin (const char * id,
 }
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::make_random (const char * id,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::make_random (const char * id
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -145,14 +145,14 @@ Object_Group_Factory_i::make_random (const char * id,
     }
 
   return this->make_group (1,
-                           id,
-                           ACE_TRY_ENV);
+                           id
+                           TAO_ENV_ARG_PARAMETER);
 }
 
 
 void
-Object_Group_Factory_i::unbind_random (const char * id,
-                                       CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::unbind_random (const char * id
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -192,8 +192,8 @@ Object_Group_Factory_i::unbind_random (const char * id,
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
-                                    const char * id,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const char * id
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -237,15 +237,15 @@ Object_Group_Factory_i::make_group (int random,
   ACE_CHECK_RETURN (group._retn ());
 
   // Register with the poa, begin using ref. counting.
-  group = group_servant->_this (ACE_TRY_ENV);
+  group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (group._retn ());
 
-  group_servant->_remove_ref (ACE_TRY_ENV);
+  group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (group.in (),
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (group.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
 
@@ -286,8 +286,8 @@ Object_Group_Factory_i::make_group (int random,
 
 
   // Update the value of flags_
-  this->update_flags (random,
-                      ACE_TRY_ENV);
+  this->update_flags (random
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
   if (result == -1)
@@ -308,8 +308,8 @@ Object_Group_Factory_i::make_group (int random,
 
 
 Load_Balancer::Object_Group_ptr
-Object_Group_Factory_i::resolve (const char * id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::resolve (const char * id
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -358,7 +358,7 @@ Object_Group_Factory_i::resolve (const char * id,
     {
       this->mem_pool_->find (flags_name_bind,
                              (void *&)this->flags_);
-      this->update_objects (ACE_TRY_ENV);
+      this->update_objects (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
     }
 
@@ -374,13 +374,13 @@ Object_Group_Factory_i::resolve (const char * id,
                       0);
 
   CORBA_Object_var objref =
-    this->orb_->string_to_object (ior,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (ior
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
   Load_Balancer::Object_Group_ptr
-    object_group = Load_Balancer::Object_Group::_narrow (objref.in (),
-                                                         ACE_TRY_ENV);
+    object_group = Load_Balancer::Object_Group::_narrow (objref.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
@@ -402,8 +402,8 @@ Object_Group_Factory_i::resolve (const char * id,
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::list_groups (int random,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::list_groups (int random
+                                     TAO_ENV_ARG_DECL)
 {
   Load_Balancer::Group_List * list;
 
@@ -444,23 +444,23 @@ Object_Group_Factory_i::list_groups (int random,
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (0, ACE_TRY_ENV);
+  return list_groups (0 TAO_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (1, ACE_TRY_ENV);
+  return list_groups (1 TAO_ENV_ARG_PARAMETER);
 }
 
 
 void
-Object_Group_Factory_i::update_flags (int random,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::update_flags (int random
+                                      TAO_ENV_ARG_DECL)
 {
   //First check whether we have memory for flags_
   if (!this->flags_)
@@ -503,7 +503,7 @@ Object_Group_Factory_i::update_flags (int random,
 }
 
 void
-Object_Group_Factory_i::update_objects (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_Factory_i::update_objects (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Create an appropriate servant.
   Object_Group_i * group_servant = 0;
@@ -583,7 +583,7 @@ Object_Group_i::~Object_Group_i (void)
 
 
 PortableServer::POA_ptr
-Object_Group_i::_default_POA (CORBA::Environment &)
+Object_Group_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
@@ -591,22 +591,22 @@ Object_Group_i::_default_POA (CORBA::Environment &)
 
 
 char *
-Object_Group_i::id (CORBA::Environment & /*ACE_TRY_ENV*/)
+Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
 }
 
 void
-Object_Group_i::bind (const Load_Balancer::Member & member,
-                      CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::bind (const Load_Balancer::Member & member
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::duplicate_member))
 {
 
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (ACE_TRY_ENV);
+      ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       id += server_id_name_bind;
@@ -665,7 +665,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member,
   // member's id into <member_id_list_>.
 
   ACE_CString id = dll_name_bind;
-  id += this->id (ACE_TRY_ENV);
+  id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -698,15 +698,15 @@ Object_Group_i::bind (const Load_Balancer::Member & member,
 }
 
 void
-Object_Group_i::unbind (const char * id,
-                        CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::unbind (const char * id
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
   // Check whether the this->member_ is NULL
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (ACE_TRY_ENV);
+      ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       id += server_id_name_bind;
@@ -729,7 +729,7 @@ Object_Group_i::unbind (const char * id,
   if (this->member_id_list_ == 0)
     {
       ACE_CString id = dll_name_bind;
-      id += this->id (ACE_TRY_ENV);
+      id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->allocator_->find (id.c_str (),
@@ -752,8 +752,8 @@ Object_Group_i::unbind (const char * id,
 }
 
 char *
-Object_Group_i::resolve_with_id (const char * id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::resolve_with_id (const char * id
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -773,12 +773,12 @@ Object_Group_i::resolve_with_id (const char * id,
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list = 0;
 
-  this->read_from_memory (ACE_TRY_ENV);
+  this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Figure out the length of the list.
@@ -807,29 +807,29 @@ Object_Group_i::members (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Object_Group_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Object_Group_i::read_from_memory (CORBA::Environment &ACE_TRY_ENV)
+Object_Group_i::read_from_memory (TAO_ENV_SINGLE_ARG_DECL)
 {
     // Sanity check needs to be done in all the places
-  ACE_CString id = this->id (ACE_TRY_ENV);
+  ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!this->members_)
@@ -848,7 +848,7 @@ Object_Group_i::read_from_memory (CORBA::Environment &ACE_TRY_ENV)
   if (!this->member_id_list_)
     {
       id = dll_name_bind;
-      id += this->id (ACE_TRY_ENV);
+      id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->allocator_->find (id.c_str (),
@@ -871,12 +871,12 @@ Random_Object_Group::Random_Object_Group (const char *id,
 }
 
 char *
-Random_Object_Group::resolve (CORBA::Environment &ACE_TRY_ENV)
+Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
 
-  this->read_from_memory (ACE_TRY_ENV);
+  this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   size_t group_size = this->members_->current_size ();
@@ -911,13 +911,13 @@ RR_Object_Group::RR_Object_Group (const char *id,
 }
 
 char *
-RR_Object_Group::resolve (CORBA::Environment &ACE_TRY_ENV)
+RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
   char *objref = 0;
 
-  this->read_from_memory (ACE_TRY_ENV);
+  this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   size_t group_size = this->members_->current_size ();
@@ -948,15 +948,15 @@ RR_Object_Group::resolve (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-RR_Object_Group::unbind (const char *id,
-                         CORBA::Environment &ACE_TRY_ENV)
+RR_Object_Group::unbind (const char *id
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
 
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (ACE_TRY_ENV);
+      ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       id += server_id_name_bind;
@@ -982,7 +982,7 @@ RR_Object_Group::unbind (const char *id,
   if (this->member_id_list_ == 0)
     {
       ACE_CString id = dll_name_bind;
-      id += this->id (ACE_TRY_ENV);
+      id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->allocator_->find (id.c_str (),
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 888bc737f7a..5bc65fba26d 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -38,7 +38,7 @@ typedef ACE_Allocator_Adapter <ACE_Malloc<ACE_MMAP_MEMORY_POOL,
   TAO_SYNCH_MUTEX> > ALLOCATOR;
 
 typedef ACE_Hash_Map_With_Allocator<char *, char *> HASH_MAP;
-  
+
 class  Object_Group_Factory_i :
   public virtual POA_Load_Balancer::Object_Group_Factory,
   public virtual PortableServer::RefCountServantBase
@@ -66,15 +66,15 @@ public:
   // Destructor.
 
 
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &ACE_TRY_ENV)
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
   // Method for the POA that will return the persistent POA_ptr stored
-  // in here.. 
-  
+  // in here..
+
   // = Load_Balancer::Object_Group_Factory idl methods.
 
-  Load_Balancer::Object_Group_ptr make_round_robin (const char * id,
-                                                    CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Object_Group_ptr make_round_robin (const char * id
+                                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -83,14 +83,14 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_round_robin (const char *id,
-                           CORBA::Environment &ACE_TRY_ENV)
+  void unbind_round_robin (const char *id
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
-  
 
-  Load_Balancer::Object_Group_ptr make_random (const char * id,
-                                               CORBA::Environment &ACE_TRY_ENV)
+
+  Load_Balancer::Object_Group_ptr make_random (const char * id
+                                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -99,27 +99,27 @@ public:
   // factory, and hasn't been destroyed, a <duplicate_group>
   // exception is thrown.
 
-  void unbind_random (const char *id,
-                      CORBA::Environment &ACE_TRY_ENV)
+  void unbind_random (const char *id
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
-  
-  Load_Balancer::Object_Group_ptr resolve (const char * id,
-                                           CORBA::Environment &ACE_TRY_ENV)
+
+  Load_Balancer::Object_Group_ptr resolve (const char * id
+                                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
   // Locates and returns an <Object_Group IOR> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
@@ -130,35 +130,35 @@ private:
 
   CORBA::ORB_var orb_;
   // Our ORB
-  
+
   PortableServer::POA_var poa_;
   // Our POA
 
   // = Helper methods.
 
   Load_Balancer::Object_Group_ptr make_group (int random,
-                                              const char * id,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              const char * id
+                                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // This function factors out common code in <make_round_robin> and
   // <make_random>.  Creates a random <Object_Group> if <random> parameter is
   // set to 1 and round robin <Object_Group> if it is 0.
 
-  Load_Balancer::Group_List * list_groups (int random,
-                                           CORBA::Environment &ACE_TRY_ENV);
+  Load_Balancer::Group_List * list_groups (int random
+                                           TAO_ENV_ARG_DECL);
   // This function factors out common code in <random_groups> and
   // <round_robin_groups>.  Returns a sequence of its random
   // groups if <random> parameter is set to 1 and a sequence of its
   // round robin groups if it is 0.
-  
-  void update_flags (int random,
-                     CORBA::Environment &ACE_TRY_ENV);
+
+  void update_flags (int random
+                     TAO_ENV_ARG_DECL);
   // The helper that updates the vlaue of the variable flags_
 
-  void update_objects (CORBA::Environment &ACE_TRY_ENV);
+  void update_objects (TAO_ENV_SINGLE_ARG_DECL);
   // This rolls back the status of the objects in the POA if the
-  // service had failed.. 
+  // service had failed..
 
   HASH_MAP *random_groups_;
   // Map containing all random <Object_Group>s created by this factory.
@@ -177,8 +177,8 @@ private:
   // Services POA. If the value is 2 then the Random group object is
   // registered with the POA. If the value is 3 both of them are
   // registered with the POA.. The initial value would be 0 when this
-  // object initialises and binded as "FLAGS".. 
-  
+  // object initialises and binded as "FLAGS"..
+
   ACE_Throughput_Stats throughput_;
 
 };
@@ -211,17 +211,17 @@ public:
 
   // Persistent POA
   // Method for the POA
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &ACE_TRY_ENV)
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (CORBA::Environment &ACE_TRY_ENV)
+  char * id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get group's id.
 
-  void bind (const Load_Balancer::Member & member,
-             CORBA::Environment &ACE_TRY_ENV)
+  void bind (const Load_Balancer::Member & member
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_member));
   // Adds a new <member> to the <Object_Group>.  Note that each
@@ -229,15 +229,15 @@ public:
   // group already contains a member with the same <Member_ID>, a
   // <duplicate_member> exceptions is thrown.
 
-  void unbind (const char * id,
-               CORBA::Environment &ACE_TRY_ENV)
+  void unbind (const char * id
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
-  char * resolve (CORBA::Environment &ACE_TRY_ENV)
+  char * resolve (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member)) = 0;
   // Returns a member object from this <Object_Group> in accordance with
@@ -245,19 +245,19 @@ public:
   // ``round robin.''  If the group contains no members, <no_such_member>
   // exception is thrown.
 
-  char * resolve_with_id (const char * id,
-                          CORBA::Environment &ACE_TRY_ENV)
+  char * resolve_with_id (const char * id
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (CORBA::Environment &ACE_TRY_ENV)
+  Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV)
+  void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -266,7 +266,7 @@ public:
 
 protected:
 
-  void read_from_memory (CORBA::Environment &);
+  void read_from_memory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // This will replenish all the pointers that could have been lost
   // because of failure
 
@@ -309,7 +309,7 @@ public:
                        PortableServer::POA_ptr poa);
   // Constructor.
 
-  char * resolve (CORBA::Environment &ACE_TRY_ENV)
+  char * resolve (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
@@ -329,15 +329,15 @@ public:
                    PortableServer::POA_ptr poa);
   // Constructor.
 
-  void unbind (const char * id,
-               CORBA::Environment &ACE_TRY_ENV)
+  void unbind (const char * id
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  char * resolve (CORBA::Environment &ACE_TRY_ENV)
+  char * resolve (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index 9fc27d3795b..cf85e5681a4 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -69,8 +69,8 @@ Load_Balancing_Service::init (int argc,
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -86,20 +86,20 @@ Load_Balancing_Service::init (int argc,
 
       // Lifespan policy
       policies[0] =
-        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                               ACE_TRY_ENV);
+        this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT
+                                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
-        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                                          ACE_TRY_ENV);
+        this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_POA =
         this->orb_manager_.root_poa()->create_POA ("persistent",
                                                    this->orb_manager_.poa_manager (),
-                                                   policies,
-                                                   ACE_TRY_ENV);
+                                                   policies
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -108,7 +108,7 @@ Load_Balancing_Service::init (int argc,
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -121,13 +121,13 @@ Load_Balancing_Service::init (int argc,
 
       // Activate the POA manager
       //PortableServer::ServantBase_var s = factory_servant;
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var objref = factory_servant->_this ();
 
-      ior = this->orb_manager_.orb ()->object_to_string (objref.in (),
-                                                         ACE_TRY_ENV);
+      ior = this->orb_manager_.orb ()->object_to_string (objref.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior.in () == 0)
@@ -158,11 +158,11 @@ Load_Balancing_Service::init (int argc,
 
 
 int
-Load_Balancing_Service::run (CORBA::Environment &ACE_TRY_ENV)
+Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   int result;
 
-  result = this->orb_manager_.run (ACE_TRY_ENV);
+  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = factory.run (ACE_TRY_ENV);
+      result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 6a76e648b70..6a1cf278034 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -18,8 +18,8 @@ Logger_Factory_i::~Logger_Factory_i (void)
 }
 
 Logger_ptr
-Logger_Factory_i::make_logger (const char *name,
-                               CORBA::Environment &ACE_TRY_ENV)
+Logger_Factory_i::make_logger (const char *name
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
@@ -62,7 +62,7 @@ Logger_Factory_i::make_logger (const char *name,
   // registration attempt.
   // @@ Matt, this code doesn't seem right.  Can you please check with
   // Irfan and Carlos about whether this is the right thing to do?
-  return result->_this (ACE_TRY_ENV);
+  return result->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Logger_i::Logger_i (const char *name)
@@ -111,34 +111,34 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 }
 
 void
-Logger_i::log (const Logger::Log_Record &log_rec,
-               CORBA::Environment &ACE_TRY_ENV)
+Logger_i::log (const Logger::Log_Record &log_rec
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Logger_i::log2 (const Logger::Log_Record &log_rec,
-               CORBA::Environment &ACE_TRY_ENV)
+Logger_i::log2 (const Logger::Log_Record &log_rec
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER);
 }
 
 void
 Logger_i::logv2 (const Logger::Log_Record &log_rec,
-               Logger::Verbosity_Level verbosity,
-               CORBA::Environment &ACE_TRY_ENV)
+               Logger::Verbosity_Level verbosity
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity, ACE_TRY_ENV);
+  this->logv (log_rec, verbosity TAO_ENV_ARG_PARAMETER);
 }
 
 void
 Logger_i::logv (const Logger::Log_Record &log_rec,
-               Logger::Verbosity_Level verbosity,
-               CORBA::Environment &)
+               Logger::Verbosity_Level verbosity
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create an <ACE_Log_Record> to leverage existing logging
@@ -187,8 +187,8 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 }
 
 void
-Logger_i::verbosity (Logger::Verbosity_Level level,
-                     CORBA::Environment &)
+Logger_i::verbosity (Logger::Verbosity_Level level
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->verbosity_level_ = level;
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index 0c11bd6e257..c775c094e55 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -34,37 +34,32 @@ public:
   virtual ~Logger_i (void);
   // destructor
 
-  virtual void log (const Logger::Log_Record &log_rec,
-                    CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
+  virtual void log (const Logger::Log_Record &log_rec
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv (const Logger::Log_Record &log_rec,
-                     Logger::Verbosity_Level verbosity,
-                     CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
+                     Logger::Verbosity_Level verbosity
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-  virtual void log2 (const Logger::Log_Record &log_rec,
-                     CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ())
+  virtual void log2 (const Logger::Log_Record &log_rec
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv2 (const Logger::Log_Record &log_rec,
-                      Logger::Verbosity_Level verbosity,
-                      CORBA::Environment & ACE_TRY_ENV=
-                    TAO_default_environment ())
+                      Logger::Verbosity_Level verbosity
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
-   void verbosity (Logger::Verbosity_Level level,
-                  CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ())
+   void verbosity (Logger::Verbosity_Level level
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
   //  and SILENT}. Defaults to VERBOSE
@@ -98,9 +93,8 @@ public:
   ~Logger_Factory_i (void);
   // Destructor.
 
-  virtual Logger_ptr make_logger (const char *name,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ())
+  virtual Logger_ptr make_logger (const char *name
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function returns a logger with name <name>. If <name> is
   // unique, a new logger is created; else, a previously created
diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
index 67b106d5384..d8943451bf2 100644
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ b/TAO/examples/Logging/Logging_Service.cpp
@@ -14,16 +14,16 @@ main (int argc, char *argv[])
 
   Logger_Server log_server;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-   ACE_TRY
+  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_TRY
     {
-      int ret = log_server.init (argc, argv, ACE_TRY_ENV);
+      int ret = log_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret == -1)
         return 1;
       else
         {
-          log_server.run (ACE_TRY_ENV);
+          log_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 12fb1297a9a..16e55cac3b3 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -24,14 +24,14 @@ Logger_Server::parse_args (void)
         TAO_debug_level++;
         break;
       case 'n':  // Set factory name to cmnd line arg
-	service_name_ = get_opts.optarg;
-	break;
+        service_name_ = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            " [-d]"
-			   " [-n service-name]"
+                           " [-n service-name]"
                            "\n",
                            argv_ [0]),
                           -1);
@@ -43,8 +43,8 @@ Logger_Server::parse_args (void)
 
 int
 Logger_Server::init (int argc,
-		     char *argv[],
-		     CORBA::Environment &ACE_TRY_ENV)
+                     char *argv[]
+                     TAO_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -52,44 +52,44 @@ Logger_Server::init (int argc,
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
-					 argv,
-					 "child_poa",
-					 ACE_TRY_ENV) == -1)
+                                         argv,
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "init_child_poa"),
-		      -1);
+                       "%p\n",
+                       "init_child_poa"),
+                      -1);
 
   ACE_CHECK_RETURN (-1);
 
-  this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+  this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Parse the command line arguments.
   if (this->parse_args () != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "parse_args"),
-		      -1);
+                       "%p\n",
+                       "parse_args"),
+                      -1);
 
   // Activate the logger_factory.
   CORBA::String_var str =
     this->orb_manager_.activate_under_child_poa ("logger_factory",
-						 &this->factory_impl_,
-						 ACE_TRY_ENV);
+                                                 &this->factory_impl_
+                                                 TAO_ENV_ARG_PARAMETER);
     if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"The IOR is: <%s>\n",
-		str.in ()));
+                "The IOR is: <%s>\n",
+                str.in ()));
 
     // Initialize the naming service
-    int ret = this->init_naming_service (ACE_TRY_ENV);
+    int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
     if (ret != 0)
       ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "init_naming_service"),
-		      -1);
+                       "%p\n",
+                       "init_naming_service"),
+                      -1);
   else
     return 0;
 }
@@ -99,7 +99,7 @@ Logger_Server::init (int argc,
 // and logger_factory object.
 
 int
-Logger_Server::init_naming_service (CORBA::Environment& ACE_TRY_ENV)
+Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
 {
   // Get pointers to the ORB and child POA
   CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -107,11 +107,11 @@ Logger_Server::init_naming_service (CORBA::Environment& ACE_TRY_ENV)
 
   // Initialize the naming service
   if (this->my_name_server_.init (orb.in (),
-				  child_poa.in ()) == -1)
+                                  child_poa.in ()) == -1)
     return -1;
 
   // Create an instance of the Logger_Factory
-  Logger_Factory_var factory = this->factory_impl_._this (ACE_TRY_ENV);
+  Logger_Factory_var factory = this->factory_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //Register the logger_factory
@@ -119,17 +119,17 @@ Logger_Server::init_naming_service (CORBA::Environment& ACE_TRY_ENV)
   factory_name.length (1);
   factory_name[0].id = CORBA::string_dup ("Logger_Factory");
   this->my_name_server_->bind (factory_name,
-			       factory.in (),
-			       ACE_TRY_ENV);
+                               factory.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Logger_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Logger_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  int ret = this->orb_manager_.run (ACE_TRY_ENV);
+  int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index a5d1af2d28d..0f94019e7b2 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -57,15 +57,15 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &ACE_TRY_ENV);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the Logger_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the ORB.
 
-  Logger_ptr make_logger (const char *name,
-                          CORBA::Environment &ACE_TRY_ENV);
+  Logger_ptr make_logger (const char *name
+                          TAO_ENV_ARG_DECL);
   // This function creates and returns a logger with the given <name>.
   // Currently, <name> is unused.
 
@@ -73,7 +73,7 @@ private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Initialises the name server and registers logger_factory with the
   // name server.
 
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index 168a705f8f6..2941345f45d 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -28,7 +28,7 @@ Logger_Client::init (int argc, char *argv[])
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (TAO_debug_level > 0)
@@ -37,8 +37,8 @@ Logger_Client::init (int argc, char *argv[])
       // Initialize the ORB
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              "internet",
-                              ACE_TRY_ENV);
+                              "internet"
+                              TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0)
@@ -50,7 +50,7 @@ Logger_Client::init (int argc, char *argv[])
         return -1;
 
       // Initialize the naming service
-      int ret = this->init_naming_service (ACE_TRY_ENV);
+      int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,7 +58,7 @@ Logger_Client::init (int argc, char *argv[])
                            "services.\n"),
                           -1);
       // Create the logger instances
-      ret = this->init_loggers (ACE_TRY_ENV);
+      ret = this->init_loggers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +79,7 @@ Logger_Client::init (int argc, char *argv[])
 }
 
 int
-Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Initialize the naming services
   if (my_name_client_.init (orb_.in ()) != 0)
@@ -94,8 +94,8 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
   factory_name[0].id = CORBA::string_dup ("Logger_Factory");
 
   CORBA::Object_var factory_ref =
-    my_name_client_->resolve (factory_name,
-                              ACE_TRY_ENV);
+    my_name_client_->resolve (factory_name
+                              TAO_ENV_ARG_PARAMETER);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "\nFactory_ref resolved\n"));
@@ -110,8 +110,8 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
   // Narrow the factory and check the success
   factory_ =
-    Logger_Factory::_narrow (factory_ref.in (),
-                             ACE_TRY_ENV);
+    Logger_Factory::_narrow (factory_ref.in ()
+                             TAO_ENV_ARG_PARAMETER);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -126,8 +126,8 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
   // If debugging, get the factory's IOR
   CORBA::String_var str =
-    orb_->object_to_string (factory_.in (),
-                            ACE_TRY_ENV);
+    orb_->object_to_string (factory_.in ()
+                            TAO_ENV_ARG_PARAMETER);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "The factory IOR is <%s>\n",
@@ -136,18 +136,18 @@ Logger_Client::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Logger_Client::init_loggers (CORBA::Environment &ACE_TRY_ENV)
+Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
   ACE_TRY
     {
-      this->logger_1_ = factory_->make_logger ("key1",
-                                               ACE_TRY_ENV);
+      this->logger_1_ = factory_->make_logger ("key1"
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->logger_2_ = factory_->make_logger ("key2",
-                                               ACE_TRY_ENV);
+      this->logger_2_ = factory_->make_logger ("key2"
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->logger_1_.in ()))
@@ -168,8 +168,8 @@ Logger_Client::init_loggers (CORBA::Environment &ACE_TRY_ENV)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "\nTrying to resolve already created logger..."));
-          Logger_var logger_3 = factory_->make_logger ("key1",
-                                                       ACE_TRY_ENV);
+          Logger_var logger_3 = factory_->make_logger ("key1"
+                                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (logger_3.in ()))
@@ -195,7 +195,7 @@ Logger_Client::init_loggers (CORBA::Environment &ACE_TRY_ENV)
 int
 Logger_Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Create 3 Log_Records for the test
@@ -245,36 +245,36 @@ Logger_Client::run (void)
         }
 
       // Change the verbosity.
-      this->logger_1_->verbosity (Logger::VERBOSE_LITE, ACE_TRY_ENV);
+      this->logger_1_->verbosity (Logger::VERBOSE_LITE TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the first Log_Record (VERBOSE_LITE)
-      this->logger_1_->log (rec1, ACE_TRY_ENV);
+      this->logger_1_->log (rec1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the verbosity again.
-      this->logger_2_->verbosity (Logger::VERBOSE, ACE_TRY_ENV);
+      this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the second Log_Record (VERBOSE)
-      this->logger_2_->log (rec2, ACE_TRY_ENV);
+      this->logger_2_->log (rec2 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the verbosity again
-      this->logger_2_->verbosity (Logger::SILENT, ACE_TRY_ENV);
+      this->logger_2_->verbosity (Logger::SILENT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the third log record using logv() (this shows if the
       // verbosity level overrides the logger's verbosity level)
-      this->logger_2_->logv (rec3, Logger::VERBOSE, ACE_TRY_ENV);
+      this->logger_2_->logv (rec3, Logger::VERBOSE TAO_ENV_ARG_PARAMETER);
 
       // Change the verbosity again (so that regular log msgs can be
       // seen again)
-      this->logger_2_->verbosity (Logger::VERBOSE, ACE_TRY_ENV);
+      this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the fourth record using log2()
-      this->logger_2_->log2 (rec4, ACE_TRY_ENV);
+      this->logger_2_->log2 (rec4 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index a0e98b33d34..c44e47bf731 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -65,15 +65,15 @@ Server<Servant>::parse_args (void)
 template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
-                       char *argv[],
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char *argv[]
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -102,8 +102,8 @@ Server<Servant>::init (const char *servant_name,
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_,
-                                                     ACE_TRY_ENV);
+                                                     &this->servant_
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -131,10 +131,10 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (CORBA::Environment &env)
+Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -237,15 +237,15 @@ Client<InterfaceObj, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    name,
-                                    ACE_TRY_ENV);
+                                    name
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -257,7 +257,7 @@ Client<InterfaceObj, Var>::init (const char *name,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_, ACE_TRY_ENV);
+            this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -266,8 +266,8 @@ Client<InterfaceObj, Var>::init (const char *name,
                                "invalid ior <%s>\n",
                                this->ior_),
                               -1);
-          this->server_ = InterfaceObj::_narrow (server_object.in (),
-                                                 ACE_TRY_ENV);
+          this->server_ = InterfaceObj::_narrow (server_object.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -290,7 +290,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &)
+Client<InterfaceObj, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 
   return 0;
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index d5f6e17fad1..d7216d4b449 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -51,8 +51,8 @@ public:
 
   int init (const char *servant_name,
             int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -60,7 +60,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
 protected:
@@ -121,7 +121,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (CORBA::Environment &);
+  int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize naming service
 
 protected:
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index fa7d17b334e..27fef1387c5 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -18,7 +18,7 @@ Checkpoint_Client_i::run (const char *name,
   ACE_Time_Value now (ACE_OS::gettimeofday ());
   ACE_OS::srand ((unsigned int) now.sec () );
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -41,14 +41,14 @@ Checkpoint_Client_i::run (const char *name,
                                            new Temperature_impl (temperature)));
       t_e->origin_id_ (KITCHEN);
       t_e->do_print ();
-      checkpoint->put_event (t_e, ACE_TRY_ENV);
+      checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       temperature = random_number (25,30);
       t_e = new Temperature_impl (temperature);
       t_e->origin_id_ (BATHROOM);
       t_e->do_print ();
-      checkpoint->put_event (t_e, ACE_TRY_ENV);
+      checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Point point = { random_number (0,4),
@@ -58,7 +58,7 @@ Checkpoint_Client_i::run (const char *name,
                                         new Position_impl (point)));
       p_e->origin_id_ (JONAS);
       p_e->do_print ();
-      checkpoint->put_event (p_e, ACE_TRY_ENV);
+      checkpoint->put_event (p_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -69,13 +69,13 @@ Checkpoint_Client_i::run (const char *name,
                                        new Log_Msg_impl (urgent, a_text)));
       l_e->origin_id_ (JONAS);
       l_e->do_print ();
-      checkpoint->put_event (l_e, ACE_TRY_ENV);
+      checkpoint->put_event (l_e TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n"));
 
-      Event_List_var list (checkpoint->get_critical_events (ACE_TRY_ENV));
+      Event_List_var list (checkpoint->get_critical_events (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       for (Event_List_Iterator i (list); i.next (); i.advance ())
@@ -84,7 +84,7 @@ Checkpoint_Client_i::run (const char *name,
         }
 
       if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (ACE_TRY_ENV);
+        checkpoint->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 9a33d49367e..605c614f27d 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -18,7 +18,7 @@ Event_impl::~Event_impl ()
 }
 
 void
-Event_impl::do_print (CORBA::Environment &)
+Event_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG((LM_DEBUG, "(time %d origin %d)  ",
              (CORBA::ULong) this->time_(),
@@ -54,10 +54,10 @@ Temperature_impl::~Temperature_impl ()
 }
 
 void
-Temperature_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Temperature_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The timestamp
-  Event_impl::do_print (ACE_TRY_ENV);
+  Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() ));
@@ -91,51 +91,51 @@ Position_impl::~Position_impl ()
 }
 
 void
-Position_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Position_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The timestamp
-  Event_impl::do_print (ACE_TRY_ENV);
+  Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Float x =
-    this->x(ACE_TRY_ENV);
+    this->x(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::Float y =
-    this->y(ACE_TRY_ENV);
+    this->y(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::Float z =
-    this->z(ACE_TRY_ENV);
+    this->z(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n",
              x, y, z));
 }
 
-CORBA::Float Position_impl::x (CORBA::Environment &)
+CORBA::Float Position_impl::x (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->xyz()[0];
 }
 
-void Position_impl::x (CORBA::Float x, CORBA::Environment &)
+void Position_impl::x (CORBA::Float x TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->xyz()[0] = x;
 }
 
-CORBA::Float Position_impl::y (CORBA::Environment &)
+CORBA::Float Position_impl::y (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->xyz()[1];
 }
 
-void Position_impl::y (CORBA::Float y, CORBA::Environment &)
+void Position_impl::y (CORBA::Float y TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->xyz()[1] = y;
 }
 
-CORBA::Float Position_impl::z (CORBA::Environment &)
+CORBA::Float Position_impl::z (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->xyz()[2];
 }
 
-void Position_impl::z (CORBA::Float z, CORBA::Environment &)
+void Position_impl::z (CORBA::Float z TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->xyz()[2] = z;
 }
@@ -169,10 +169,10 @@ Log_Msg_impl::~Log_Msg_impl ()
 }
 
 void
-Log_Msg_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Log_Msg_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The timestamp
-  Event_impl::do_print (ACE_TRY_ENV);
+  Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->urgency () > 0)
@@ -221,20 +221,20 @@ Event_List_Link_impl::~Event_List_Link_impl ()
 }
 
 Event*
-Event_List_Link_impl::get_event (CORBA::Environment &)
+Event_List_Link_impl::get_event (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->my_event ();
 }
 
 Event_List_Link*
-Event_List_Link_impl::get_next_link (CORBA::Environment &)
+Event_List_Link_impl::get_next_link (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->next ();
 }
 
 void
-Event_List_Link_impl::attach_next_link (Event_List_Link *n,
-                                        CORBA::Environment &)
+Event_List_Link_impl::attach_next_link (Event_List_Link *n
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->next (n);
 }
@@ -264,7 +264,7 @@ Event_List_impl::~Event_List_impl ()
 }
 
 void
-Event_List_impl::store_event (Event* e, CORBA::Environment &)
+Event_List_impl::store_event (Event* e TAO_ENV_ARG_DECL_NOT_USED)
 {
   // This operation should perform atomically and should
   // guard against the access to the list from another thread.
@@ -405,8 +405,8 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl ()
 
 
 CORBA::Boolean
-Temperature_Criterion_impl::is_critical (Event* e,
-                                         CORBA::Environment &)
+Temperature_Criterion_impl::is_critical (Event* e
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Downcast to a temperature.
   Temperature* t = Temperature::_downcast (e);
@@ -423,7 +423,7 @@ Temperature_Criterion_impl::is_critical (Event* e,
 
 
 void
-Temperature_Criterion_impl::do_print (CORBA::Environment &)
+Temperature_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
              this->origin_id_ () ));
@@ -462,7 +462,7 @@ Position_Criterion_impl::~Position_Criterion_impl ()
 
 
 CORBA::Boolean
-Position_Criterion_impl::is_critical (Event* e, CORBA::Environment &)
+Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED)
 {
   Position* p = Position::_downcast (e);
   // Is Event really a Position ?
@@ -483,13 +483,13 @@ Position_Criterion_impl::is_critical (Event* e, CORBA::Environment &)
 
 
 void
-Position_Criterion_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
+Position_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG((LM_DEBUG,
              "Alarm boundary for events with origin id %d is the box\n",
              this->origin_id_ () ));
-  this->leftbottom ()->do_print(ACE_TRY_ENV);
-  this->topright ()->do_print(ACE_TRY_ENV);
+  this->leftbottom ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->topright ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Position_Criterion_factory::~Position_Criterion_factory ()
@@ -515,8 +515,8 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
 
 
 CORBA::Boolean
-Log_Msg_Criterion_impl::is_critical (Event* e,
-                                     CORBA::Environment &)
+Log_Msg_Criterion_impl::is_critical (Event* e
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   Log_Msg* lm = Log_Msg::_downcast (e);
 
@@ -530,7 +530,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e,
 
 
 void
-Log_Msg_Criterion_impl::do_print (CORBA::Environment &)
+Log_Msg_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG((LM_DEBUG,
              "All log messages with urgency greater zero are registered.\n" ));
@@ -564,8 +564,8 @@ Criterion_List_impl::~Criterion_List_impl ()
 }
 
 void
-Criterion_List_impl::store_criterion (Criterion *c,
-                                      CORBA::Environment &)
+Criterion_List_impl::store_criterion (Criterion *c
+                                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (!my_list ())
     {
@@ -578,7 +578,7 @@ Criterion_List_impl::store_criterion (Criterion *c,
 }
 
 CORBA::Boolean
-Criterion_List_impl::is_critical (Event *e, CORBA::Environment &)
+Criterion_List_impl::is_critical (Event *e TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Try all criterions. Walking the list is efficient enough for
   // demonstration.
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index b6cad373a1d..ea8ce9b29f1 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -48,7 +48,7 @@ class Event_impl : public virtual OBV_Event,
   Event_impl ();
   virtual ~Event_impl ();
 
-  virtual void do_print (CORBA::Environment &ACE_TRY_EN);
+  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
   // Implementation of the do_print () operation the valuetype should have.
   // All operations in valuetypes are virtual.
 
@@ -119,7 +119,7 @@ public:
 
   virtual ~Temperature_impl ();
 
-  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
   // Overrides Event_impl::do_print (). Note that a new declaration
   // in IDL in a derived class is not allowed.
 };
@@ -145,15 +145,15 @@ public:
   Position_impl (Point &p);
   virtual ~Position_impl ();
 
-  virtual CORBA::Float x (CORBA::Environment &ACE_TRY_ENV);
-  virtual void x (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
-  virtual CORBA::Float y (CORBA::Environment &ACE_TRY_ENV);
-  virtual void y (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
-  virtual CORBA::Float z (CORBA::Environment &ACE_TRY_ENV);
-  virtual void z (CORBA::Float, CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Float x (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void x (CORBA::Float TAO_ENV_ARG_DECL);
+  virtual CORBA::Float y (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void y (CORBA::Float TAO_ENV_ARG_DECL);
+  virtual CORBA::Float z (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void z (CORBA::Float TAO_ENV_ARG_DECL);
   //These are the attributes
 
-  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
 };
 
 class Position_factory : public Position_init
@@ -178,7 +178,7 @@ public:
   Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
   virtual ~Log_Msg_impl ();
 
-  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
 };
 
 class Log_Msg_factory : public Log_Msg_init
@@ -210,12 +210,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link,
   Event_List_Link_impl (Event *e);
   virtual ~Event_List_Link_impl ();
 
-  Event *get_event (CORBA::Environment &ACE_TRY_ENV);
+  Event *get_event (TAO_ENV_SINGLE_ARG_DECL);
 
  private:
-  Event_List_Link *get_next_link (CORBA::Environment &ACE_TRY_ENV);
+  Event_List_Link *get_next_link (TAO_ENV_SINGLE_ARG_DECL);
 
-  void attach_next_link (Event_List_Link * chain, CORBA::Environment &ACE_TRY_ENV);
+  void attach_next_link (Event_List_Link * chain TAO_ENV_ARG_DECL);
   // Attach a chain at the end.
 };
 
@@ -239,9 +239,9 @@ class Event_List_impl : public virtual OBV_Event_List,
   Event_List_impl ();
   virtual ~Event_List_impl ();
 
-  void store_event (Event* e, CORBA::Environment &ACE_TRY_ENV);
+  void store_event (Event* e TAO_ENV_ARG_DECL);
 
-  Event_List_Link *get_first_link(CORBA::Environment &ACE_TRY_ENV);
+  Event_List_Link *get_first_link(TAO_ENV_SINGLE_ARG_DECL);
   // The iterator needs it.
 
  private:
@@ -317,8 +317,8 @@ public:
 
   virtual ~Temperature_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
-  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
+  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
 };
 
 class Temperature_Criterion_factory : public Temperature_Criterion_init
@@ -343,8 +343,8 @@ public:
                            Position *tr);
   virtual ~Position_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
-  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
+  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
 };
 
 class Position_Criterion_factory : public Position_Criterion_init
@@ -365,8 +365,8 @@ public:
   Log_Msg_Criterion_impl ();
   virtual ~Log_Msg_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e, CORBA::Environment &ACE_TRY_ENV);
-  virtual void do_print (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
+  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
 };
 
 class Log_Msg_Criterion_factory : public Log_Msg_Criterion_init
@@ -385,8 +385,8 @@ class Criterion_List_impl : public virtual OBV_Criterion_List,
   Criterion_List_impl ();
   virtual ~Criterion_List_impl ();
 
-  void store_criterion (Criterion *c, CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean is_critical (Event *e, CORBA::Environment &ACE_TRY_ENV);
+  void store_criterion (Criterion *c TAO_ENV_ARG_DECL);
+  CORBA::Boolean is_critical (Event *e TAO_ENV_ARG_DECL);
 };
 
 
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 3715d0f4743..c21b0b8960c 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -109,8 +109,8 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
 
 
 void
-Checkpoint_i::put_event (Event *event,
-                        CORBA::Environment &)
+Checkpoint_i::put_event (Event *event
+                        TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In general this function would be a dispatcher which looks at the
@@ -140,7 +140,7 @@ Checkpoint_i::put_event (Event *event,
 
 
 Event_List *
-Checkpoint_i::get_critical_events (CORBA::Environment &)
+Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The skeleton should not steal our list by decrementing
@@ -157,7 +157,7 @@ Checkpoint_i::get_critical_events (CORBA::Environment &)
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (CORBA::Environment &)
+Checkpoint_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
index 00e14a571b2..3f3c0c00a2e 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -36,17 +36,17 @@ public:
   // Destructor.
 
   virtual void put_event (
-        Event * e,
-        CORBA::Environment &ACE_TRY_ENV
+        Event * e
+        TAO_ENV_ARG_DECL
   )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Event_List * get_critical_events (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
   )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index 80ca0fc570c..e04247695cd 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tCheckpoint Event_Types server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       if (server.init ("Event_Types_Checkpoint",
                        argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 843161b5c86..4e4930562bb 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -60,8 +60,8 @@ public:
                      CORBA::ORB_ptr orb);
 
   CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name,
-                                  CORBA_Environment &ACE_TRY_ENV)
+                                  const char *name
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::PolicyList first_poa_policies_;
@@ -82,16 +82,16 @@ Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager
 
 CORBA::Boolean
 Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                    const char *name,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const char *name
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (name, "firstPOA") == 0)
     {
       PortableServer::POA_var child = parent->create_POA (name,
                                                           this->poa_manager_.in (),
-                                                          this->first_poa_policies_,
-                                                          ACE_TRY_ENV);
+                                                          this->first_poa_policies_
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Creation of firstPOA is over. Destroy the Policy objects.
@@ -99,25 +99,25 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
            i < this->first_poa_policies_.length ();
            ++i)
         {
-          this->first_poa_policies_[i]->destroy (ACE_TRY_ENV);
+          this->first_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
 
-      child->the_activator (this,
-                            ACE_TRY_ENV);
+      child->the_activator (this
+                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       Reference_Counted_Foo *foo_impl = new Reference_Counted_Foo (this->orb_.in (),
                                                                    child.in (),
                                                                    28);
 
-      child->set_servant (foo_impl,
-                          ACE_TRY_ENV);
+      child->set_servant (foo_impl
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // This means that the ownership of <foo_impl> now belongs to
       // the POA.
-      foo_impl->_remove_ref (ACE_TRY_ENV);
+      foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Finally everything is fine
@@ -127,8 +127,8 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
     {
       PortableServer::POA_var child = parent->create_POA (name,
                                                           this->poa_manager_.in (),
-                                                          this->second_poa_policies_,
-                                                          ACE_TRY_ENV);
+                                                          this->second_poa_policies_
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Creation of secondPOA is over. Destroy the Policy objects.
@@ -136,7 +136,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
            i < this->second_poa_policies_.length ();
            ++i)
         {
-          this->second_poa_policies_[i]->destroy (ACE_TRY_ENV);
+          this->second_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
 
@@ -148,13 +148,13 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
         PortableServer::string_to_ObjectId ("third Foo");
 
       child->activate_object_with_id (oid.in (),
-                                      foo_impl,
-                                      ACE_TRY_ENV);
+                                      foo_impl
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // This means that the ownership of <foo_impl> now belongs to
       // the POA.
-      foo_impl->_remove_ref (ACE_TRY_ENV);
+      foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Finally everything is fine
@@ -264,15 +264,15 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -281,19 +281,19 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Adapter_Activator *adapter_activator =
@@ -303,8 +303,8 @@ main (int argc, char **argv)
       PortableServer::AdapterActivator_var adapter_activator_var =
         adapter_activator;
 
-      root_poa->the_activator (adapter_activator_var.in (),
-                               ACE_TRY_ENV);
+      root_poa->the_activator (adapter_activator_var.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var first_poa;
@@ -317,33 +317,33 @@ main (int argc, char **argv)
 
         // Id Assignment Policy
         policies[0] =
-          root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID,
-                                                 ACE_TRY_ENV);
+          root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
+                                                 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Lifespan policy
         policies[1] =
-          root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                            ACE_TRY_ENV);
+          root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Request Processing policy
         policies[2] =
-          root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT,
-                                                      ACE_TRY_ENV);
+          root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
+                                                      TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Id Uniqueness
         policies[3] =
-          root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
-                                                 ACE_TRY_ENV);
+          root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
+                                                 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Create the firstPOA under the RootPOA.
         first_poa = root_poa->create_POA ("firstPOA",
                                           poa_manager.in (),
-                                          policies,
-                                          ACE_TRY_ENV);
+                                          policies
+                                          TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -354,21 +354,21 @@ main (int argc, char **argv)
 
         // Id Assignment Policy
         policies[0] =
-          root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                                 ACE_TRY_ENV);
+          root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                                 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Lifespan policy
         policies[1] =
-          root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                            ACE_TRY_ENV);
+          root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Create the secondPOA under the firstPOA.
         second_poa = first_poa->create_POA ("secondPOA",
                                             poa_manager.in (),
-                                            policies,
-                                            ACE_TRY_ENV);
+                                            policies
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -378,17 +378,17 @@ main (int argc, char **argv)
                                             27);
 
       PortableServer::ObjectId_var first_oid =
-        root_poa->activate_object (&first_foo_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (&first_foo_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object Reference for the first_foo_impl object.
-      Foo_var first_foo = first_foo_impl._this (ACE_TRY_ENV);
+      Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var second_foo =
-        first_poa->create_reference ("IDL:Foo:1.0",
-                                     ACE_TRY_ENV);
+        first_poa->create_reference ("IDL:Foo:1.0"
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var third_oid =
@@ -396,21 +396,21 @@ main (int argc, char **argv)
 
       CORBA::Object_var third_foo =
         second_poa->create_reference_with_id (third_oid.in (),
-                                              "IDL:Foo:1.0",
-                                              ACE_TRY_ENV);
+                                              "IDL:Foo:1.0"
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_ior =
-        orb->object_to_string (second_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var third_ior =
-        orb->object_to_string (third_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -426,14 +426,14 @@ main (int argc, char **argv)
         return write_result;
 
       first_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
+                          1
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index e86fe3ffbfd..d2e003927e2 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -16,21 +16,21 @@ DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void)
 }
 
 DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb,
-                            PortableServer::POA_ptr poa,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            PortableServer::POA_ptr poa
+                            TAO_ENV_ARG_DECL)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
   // Get the POA Current object reference
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("POACurrent",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("POACurrent"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow the object reference to a POA Current reference
   this->poa_current_ =
-    PortableServer::Current::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+    PortableServer::Current::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -39,13 +39,13 @@ DatabaseImpl::Entry::~Entry (void)
 }
 
 void
-DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request,
-                             CORBA::Environment &ACE_TRY_ENV)
+DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request
+                             TAO_ENV_ARG_DECL)
 {
   // The servant determines the key associated with the database
   // entry represented by self.
   PortableServer::ObjectId_var oid =
-    this->poa_current_->get_object_id (ACE_TRY_ENV);
+    this->poa_current_->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now convert the id into a string
@@ -59,7 +59,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request,
   if (ACE_OS::strcmp (operation,
                       "_is_a") == 0)
     {
-      this->is_a (request, ACE_TRY_ENV);
+      this->is_a (request TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -67,8 +67,8 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request,
 }
 
 void
-DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request,
-                           CORBA::Environment &ACE_TRY_ENV)
+DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
+                           TAO_ENV_ARG_DECL)
 {
   CORBA::NVList_ptr list;
   this->orb_->create_list (0, list);
@@ -77,16 +77,16 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request,
 
   list->add_value ("value",
                    any_1,
-                   CORBA::ARG_IN,
-                   ACE_TRY_ENV);
+                   CORBA::ARG_IN
+                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  request->arguments (list,
-                      ACE_TRY_ENV);
+  request->arguments (list
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA_NamedValue_ptr nv = list->item (0,
-                                        ACE_TRY_ENV);
+  CORBA_NamedValue_ptr nv = list->item (0
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Any_ptr ap = nv->value ();
@@ -94,7 +94,7 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request,
   *ap >>= value;
 
   const char *object_id =
-    CORBA::_tc_Object->id (ACE_TRY_ENV);
+    CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean result;
@@ -109,37 +109,37 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request,
   CORBA::Any::from_boolean from_boolean (result);
   result_any <<= from_boolean;
 
-  request->set_result (result_any, ACE_TRY_ENV);
+  request->set_result (result_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::RepositoryId
 DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/,
-                                         PortableServer::POA_ptr,
-                                         CORBA::Environment &)
+                                         PortableServer::POA_ptr
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Entry::_default_POA (CORBA::Environment &)
+DatabaseImpl::Entry::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb,
-                            PortableServer::POA_ptr poa,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            PortableServer::POA_ptr poa
+                            TAO_ENV_ARG_DECL)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
     common_servant_ (orb,
-                     poa,
-                     ACE_TRY_ENV)
+                     poa
+                     TAO_ENV_ARG_PARAMETER)
 {
   ACE_CHECK;
 
-  this->poa_->set_servant (&this->common_servant_,
-                           ACE_TRY_ENV);
+  this->poa_->set_servant (&this->common_servant_
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -150,8 +150,8 @@ DatabaseImpl::Agent::~Agent (void)
 Database::Entry_ptr
 DatabaseImpl::Agent::create_entry (const char *key,
                                    const char *entry_type,
-                                   const Database::NVPairSequence &initial_attributes,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const Database::NVPairSequence &initial_attributes
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Duplicate_Key))
@@ -206,12 +206,12 @@ DatabaseImpl::Agent::create_entry (const char *key,
 
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (obj_id.in (),
-                                          repository_id.in (),
-                                          ACE_TRY_ENV);
+                                          repository_id.in ()
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Database::Entry::_nil ());
 
-  Database::Entry_var entry = Database::Entry::_narrow (obj.in (),
-                                                        ACE_TRY_ENV);
+  Database::Entry_var entry = Database::Entry::_narrow (obj.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Database::Entry::_nil ());
 
   return entry._retn ();
@@ -219,8 +219,8 @@ DatabaseImpl::Agent::create_entry (const char *key,
 
 Database::Entry_ptr
 DatabaseImpl::Agent::find_entry (const char *key,
-                                 const char *entry_type,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 const char *entry_type
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Not_Found))
@@ -252,12 +252,12 @@ DatabaseImpl::Agent::find_entry (const char *key,
         DatabaseImpl::entry_type_to_repository_id ("Entry");
       CORBA::Object_var obj =
         this->poa_->create_reference_with_id (obj_id.in (),
-                                              repository_id.in (),
-                                              ACE_TRY_ENV);
+                                              repository_id.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Database::Entry::_nil ());
 
-      entry = Database::Entry::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+      entry = Database::Entry::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Database::Entry::_nil ());
     }
   else
@@ -275,8 +275,8 @@ DatabaseImpl::Agent::find_entry (const char *key,
 
 void
 DatabaseImpl::Agent::destroy_entry (const char *key,
-                                    const char *entry_type,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const char *entry_type
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Unknown_Key))
@@ -310,14 +310,14 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
 }
 
 void
-DatabaseImpl::Agent::shutdown (CORBA::Environment &)
+DatabaseImpl::Agent::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Agent::_default_POA (CORBA::Environment &)
+DatabaseImpl::Agent::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index b6f9ba7146a..db60ffbd981 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -32,28 +32,28 @@ public:
   {
   public:
     Entry (CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa,
-           CORBA::Environment &);
+           PortableServer::POA_ptr poa
+           TAO_ENV_ARG_DECL_NOT_USED);
     ~Entry (void);
 
-    virtual void invoke (CORBA::ServerRequest_ptr request,
-                         CORBA::Environment &env);
+    virtual void invoke (CORBA::ServerRequest_ptr request
+                         TAO_ENV_ARG_DECL);
     // The invoke() method receives requests issued to any CORBA
     // object incarnated by the DSI servant and performs the
     // processing necessary to execute the request.
 
     virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
-                                                    PortableServer::POA_ptr poa,
-                                                    CORBA::Environment &env);
+                                                    PortableServer::POA_ptr poa
+                                                    TAO_ENV_ARG_DECL);
     // The _primary_interface() method receives an ObjectId value and
     // a POA_ptr as input parameters and returns a valid RepositoryId
     // representing the most-derived interface for that oid.
 
-    virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+    virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
     // Returns the default POA for this servant.
 
-    virtual void is_a (CORBA::ServerRequest_ptr request,
-                       CORBA::Environment &env);
+    virtual void is_a (CORBA::ServerRequest_ptr request
+                       TAO_ENV_ARG_DECL);
     // Handles the _is_a call
 
   protected:
@@ -71,36 +71,36 @@ public:
   {
   public:
     Agent (CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa,
-           CORBA::Environment &);
+           PortableServer::POA_ptr poa
+           TAO_ENV_ARG_DECL_NOT_USED);
     ~Agent (void);
 
     virtual Database::Entry_ptr create_entry (const char *key,
                                               const char *entry_type,
-                                              const Database::NVPairSequence &initial_attributes,
-                                              CORBA::Environment &env)
+                                              const Database::NVPairSequence &initial_attributes
+                                              TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Duplicate_Key));
 
     virtual Database::Entry_ptr find_entry (const char *key,
-                                            const char *entry_type,
-                                            CORBA::Environment &env)
+                                            const char *entry_type
+                                            TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Not_Found));
 
     virtual void destroy_entry (const char *key,
-                                const char *entry_type,
-                                CORBA::Environment &env)
+                                const char *entry_type
+                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Unknown_Key));
 
-    virtual void shutdown (CORBA::Environment &env)
+    virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+    virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
     // Returns the default POA for this servant.
 
   protected:
diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index 66cd569662c..57f7ca35020 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -99,7 +99,7 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   char str [255];
   // Initialize the ORB
@@ -110,7 +110,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
 
-                                            0, ACE_TRY_ENV);
+                                            0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the location of the
@@ -132,8 +132,8 @@ main (int argc, char **argv)
                       "CORBA::ORB::string_to_object");
 
       // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (IOR,
-                                                        ACE_TRY_ENV);
+      CORBA::Object_var object = orb->string_to_object (IOR
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str,
@@ -141,8 +141,8 @@ main (int argc, char **argv)
 
       // Narrow the object reference to a Database::Agent
       Database::Agent_var database_agent =
-        Database::Agent::_narrow (object.in (),
-                                  ACE_TRY_ENV);
+        Database::Agent::_narrow (object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Database::NVPairSequence employee_attributes (2);
@@ -168,15 +168,15 @@ main (int argc, char **argv)
       Database::Entry_var entry =
         database_agent->create_entry ("irfan",
                                       "Employee",
-                                      employee_attributes,
-                                      ACE_TRY_ENV);
+                                      employee_attributes
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "Database::Employee::_narrow");
 
       Database::Employee_var employee =
-        Database::Employee::_narrow (entry.in (),
-                                     ACE_TRY_ENV);
+        Database::Employee::_narrow (entry.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /*
@@ -189,27 +189,27 @@ main (int argc, char **argv)
 #if 0
       // Reset the id
       ACE_OS::strcpy (str, "Database::Employee::id");
-      employee->id (666, ACE_TRY_ENV);
+      employee->id (666 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
       ACE_OS::strcpy (str, "Database::Entry::find");
       // Find the employee
       entry = database_agent->find_entry ("irfan",
-                                          "Employee",
-                                          ACE_TRY_ENV);
+                                          "Employee"
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "Database::Entry::destroy");
       // Destroy the employee
       database_agent->destroy_entry ("irfan",
-                                     "Employee",
-                                     ACE_TRY_ENV);
+                                     "Employee"
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (shutdown_server)
         {
-          database_agent->shutdown (ACE_TRY_ENV);
+          database_agent->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 33678266e96..f7f099adf60 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -79,12 +79,12 @@ write_iors_to_file (const char *first_ior)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -93,17 +93,17 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA reference
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
-                                                                       ACE_TRY_ENV);
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ()
+                                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (5);
@@ -111,35 +111,35 @@ main (int argc, char **argv)
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                          TAO_ENV_ARG_PARAMETER);
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT,
-                                                    ACE_TRY_ENV);
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
+                                                    TAO_ENV_ARG_PARAMETER);
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
-                                                                policies,
-                                                                ACE_TRY_ENV);
+                                                                policies
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0;
@@ -147,31 +147,31 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Create a Database Agent Implementation object in first_poa
       DatabaseImpl::Agent database_agent_impl (orb.in (),
-                                               first_poa.in (),
-                                               ACE_TRY_ENV);
+                                               first_poa.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var database_agent_oid =
         PortableServer::string_to_ObjectId ("DatabaseAgent");
 
       first_poa->activate_object_with_id (database_agent_oid.in (),
-                                          &database_agent_impl,
-                                          ACE_TRY_ENV);
+                                          &database_agent_impl
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var database_agent =
-        first_poa->id_to_reference (database_agent_oid.in (), ACE_TRY_ENV);
+        first_poa->id_to_reference (database_agent_oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the "DatabaseAgent" object
       CORBA::String_var database_agent_ior =
-        orb->object_to_string (database_agent.in (), ACE_TRY_ENV);
+        orb->object_to_string (database_agent.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
@@ -182,11 +182,11 @@ main (int argc, char **argv)
         return write_result;
 
       // set the state of the poa_manager to active i.e ready to process requests
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 29fd3c344cf..a80188bd406 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -24,9 +24,9 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
     // Create the Default Descriptor Servant
     fd_servant_ (poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_, ACE_TRY_ENV);
+  poa->set_servant (&this->fd_servant_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -35,15 +35,15 @@ FileImpl::System::~System (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (CORBA::Environment &)
+FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
-                        CORBA::Long flags,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Long flags
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
@@ -72,13 +72,13 @@ FileImpl::System::open (const char *file_name,
   // from ACE_HANDLE string
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (oid.in (),
-                                          "IDL:File/Descriptor:1.0",
-                                          ACE_TRY_ENV);
+                                          "IDL:File/Descriptor:1.0"
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
   // Narrow the object reference to a File Descriptor
   File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in (), ACE_TRY_ENV);
+    File::Descriptor::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
@@ -96,26 +96,26 @@ FileImpl::Descriptor::~Descriptor (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (CORBA::Environment &)
+FileImpl::Descriptor::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
 {
   //
   // One way of getting our id.
   //
 
   // Get a reference to myself
-  File::Descriptor_var me = this->_this (ACE_TRY_ENV);
+  File::Descriptor_var me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid1 =
-    this->poa_->reference_to_id (me.in (), ACE_TRY_ENV);
+    this->poa_->reference_to_id (me.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -123,7 +123,7 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
   //
 
   PortableServer::ObjectId_var oid2 =
-    this->poa_->servant_to_id (this, ACE_TRY_ENV);
+    this->poa_->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -131,23 +131,23 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
   //
 
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0, ACE_TRY_ENV);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the POA Current object reference
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("POACurrent",
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references ("POACurrent"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Narrow the object reference to a POA Current reference
   PortableServer::Current_var poa_current =
-    PortableServer::Current::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+    PortableServer::Current::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   PortableServer::ObjectId_var oid3 =
-    poa_current->get_object_id (ACE_TRY_ENV);
+    poa_current->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   ACE_ASSERT (oid1.in () == oid2.in ());
@@ -162,12 +162,12 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Long
-FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
-                             CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   const CORBA::Octet *data = &buffer[0];
@@ -182,12 +182,12 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
 }
 
 File::Descriptor::DataBuffer *
-FileImpl::Descriptor::read (CORBA::Long num_bytes,
-                            CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::read (CORBA::Long num_bytes
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
@@ -205,12 +205,12 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes,
 
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
-                             CORBA::Long whence,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Long whence
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
@@ -223,11 +223,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Close the file corresponding to this object reference.
diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h
index cee4e41d63e..30c6c6f5e5b 100644
--- a/TAO/examples/POA/Default_Servant/File_i.h
+++ b/TAO/examples/POA/Default_Servant/File_i.h
@@ -34,35 +34,35 @@ public:
     ~Descriptor (void);
     // Destructor
 
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
     // Returns the default POA of this object
 
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer,
-                               CORBA::Environment &env)
+    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer
+                               TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // write buffer to File corresponding to this Descriptor
 
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes,
-                                                CORBA::Environment &env)
+    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes
+                                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
     // Reads num_bytes from the file and returns it
                        File::IOError));
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
-                                CORBA::Long whence,
-                                CORBA::Environment &env)
+                                CORBA::Long whence
+                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // seek to the offset in file from whence
 
-    virtual void destroy (CORBA::Environment &env)
+    virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
     // closes the file corresponding to the requested ObjectID
 
   private:
 
-    ACE_HANDLE fd (CORBA::Environment &env);
+    ACE_HANDLE fd (TAO_ENV_SINGLE_ARG_DECL);
     // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
@@ -80,12 +80,12 @@ public:
     ~System (void);
     //Destructor
 
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
-                               CORBA::Long flags,
-                               CORBA::Environment &env)
+                               CORBA::Long flags
+                               TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // Opens a file ,creates a Descriptor reference with the
diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index 3d0a86cc098..f3dcd132443 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -38,8 +38,8 @@ parse_args (int argc, char **argv)
     switch (c)
       {
       case 'd':
-	TAO_debug_level++;
-	break;
+        TAO_debug_level++;
+        break;
       case 'k':
         iorfile = get_opts.optarg;
         break;
@@ -54,8 +54,8 @@ parse_args (int argc, char **argv)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            "[-k <iorfile>]"
-			   "[-f <filename>]"
-			   "[-m <message>]"
+                           "[-f <filename>]"
+                           "[-m <message>]"
                            "\n",
                            argv [0]),
                           -1);
@@ -72,12 +72,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
@@ -105,19 +105,19 @@ main (int argc, char **argv)
       ior_buffer.alloc ()-> free (data);
       ACE_OS::close (input_file);
 
-      CORBA::Object_var object = orb->string_to_object (ior.c_str (),
-                                                        ACE_TRY_ENV);
+      CORBA::Object_var object = orb->string_to_object (ior.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a File::System
-      File::System_var file_system = File::System::_narrow (object.in (),
-                                                            ACE_TRY_ENV);
+      File::System_var file_system = File::System::_narrow (object.in ()
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creat the file filename i.e "test"
       File::Descriptor_var fd = file_system->open (filename,
-                                                   O_CREAT | O_RDWR,
-                                                   ACE_TRY_ENV);
+                                                   O_CREAT | O_RDWR
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int message_length = ACE_OS::strlen (message) + 1;
@@ -126,16 +126,16 @@ main (int argc, char **argv)
       File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1);
 
       // write the message to the file
-      fd->write (data_sent, ACE_TRY_ENV);
+      fd->write (data_sent TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //seek to the beginning of the file
-      fd->lseek (0, SEEK_SET, ACE_TRY_ENV);
+      fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Read back the written message
-      File::Descriptor::DataBuffer_var data_received = fd->read (message_length,
-                                                                 ACE_TRY_ENV);
+      File::Descriptor::DataBuffer_var data_received = fd->read (message_length
+                                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *result = (char *) &data_received[0];
@@ -145,7 +145,7 @@ main (int argc, char **argv)
                  result));
 
       // close the file
-      fd->destroy (ACE_TRY_ENV);
+      fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 1ff174593e0..87502cc2a18 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -58,12 +58,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -72,15 +72,15 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA reference
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_TRY_ENV);
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (5);
@@ -88,34 +88,34 @@ main (int argc, char **argv)
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, ACE_TRY_ENV);
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
-                                                                policies,
-                                                                ACE_TRY_ENV);
+                                                                policies
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0;
@@ -123,7 +123,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -134,17 +134,17 @@ main (int argc, char **argv)
         PortableServer::string_to_ObjectId ("FileSystem");
 
       first_poa->activate_object_with_id (file_system_oid.in (),
-                                          &file_system_impl,
-                                          ACE_TRY_ENV);
+                                          &file_system_impl
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var file_system =
-        first_poa->id_to_reference (file_system_oid.in (), ACE_TRY_ENV);
+        first_poa->id_to_reference (file_system_oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the "FileSystem" object
       CORBA::String_var file_system_ior =
-        orb->object_to_string (file_system.in (), ACE_TRY_ENV);
+        orb->object_to_string (file_system.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
@@ -160,11 +160,11 @@ main (int argc, char **argv)
       ACE_OS::fclose (output_file);
 
       // set the state of the poa_manager to active i.e ready to process requests
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 45845344730..2b53fafc97d 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -124,15 +124,15 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -141,19 +141,19 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the firstPOA to be created.
@@ -162,20 +162,20 @@ main (int argc, char **argv)
 
       // Id Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Threading policy
       policies[2] =
-        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL,
-                                        ACE_TRY_ENV);
+        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the firstPOA under the RootPOA.
@@ -183,17 +183,17 @@ main (int argc, char **argv)
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[2]->destroy (ACE_TRY_ENV);
+      policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Threading policy
       policies[2] =
-        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL,
-                                        ACE_TRY_ENV);
+        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the secondPOA under the firstPOA.
@@ -201,8 +201,8 @@ main (int argc, char **argv)
       PortableServer::POA_var second_poa =
         first_poa->create_POA (name.c_str (),
                                poa_manager.in (),
-                               policies,
-                               ACE_TRY_ENV);
+                               policies
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of POAs is over. Destroy the Policy objects.
@@ -210,7 +210,7 @@ main (int argc, char **argv)
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -229,12 +229,12 @@ main (int argc, char **argv)
       //  ObjectId activate_object(in Servant p_servant)
       //    raises (ServantAlreadyActive, WrongPolicy);
       PortableServer::ObjectId_var first_oid =
-        root_poa->activate_object (&first_foo_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (&first_foo_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object Reference for the first_foo_impl object.
-      Foo_var first_foo = first_foo_impl._this (ACE_TRY_ENV);
+      Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get ObjectId for object secondFoo and use that ObjectId to
@@ -246,12 +246,12 @@ main (int argc, char **argv)
         PortableServer::string_to_ObjectId ("secondFoo");
 
       first_poa->activate_object_with_id (second_oid.in (),
-                                          &second_foo_impl,
-                                          ACE_TRY_ENV);
+                                          &second_foo_impl
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object reference for second_foo_impl object.
-      Foo_var second_foo = second_foo_impl._this (ACE_TRY_ENV);
+      Foo_var second_foo = second_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get ObjectId for the string thirdPOA Create the object reference
@@ -272,21 +272,21 @@ main (int argc, char **argv)
 
       CORBA::Object_var third_foo =
         second_poa->create_reference_with_id (third_oid.in (),
-                                              "IDL:Foo:1.0",
-                                              ACE_TRY_ENV);
+                                              "IDL:Foo:1.0"
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_ior =
-        orb->object_to_string (second_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var third_ior =
-        orb->object_to_string (third_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -304,14 +304,14 @@ main (int argc, char **argv)
       // Activate third servant using its ObjectID.
       MyFooServant third_foo_impl (orb.in (), second_poa.in (), 29);
       second_poa->activate_object_with_id (third_oid.in (),
-                                           &third_foo_impl,
-                                           ACE_TRY_ENV);
+                                           &third_foo_impl
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_TIMEPROBE_PRINT;
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 871d89108c9..d13eed56c18 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -35,8 +35,8 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
       // Try to find child poa.
       PortableServer::POA_var child_poa =
         parent->find_POA (child_poa_name,
-                          activate,
-                          ACE_TRY_ENV);
+                          activate
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableServer::POA::AdapterNonExistent, foo)
@@ -54,32 +54,31 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
 int
 main (int argc, char **argv)
 {
-  //  CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // Initialize the ORB
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow Object reference to RootPOA to a POA reference.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in(), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to find a non-existant POA.  Since the Adapter Activator
@@ -94,23 +93,23 @@ main (int argc, char **argv)
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
-      root_poa->the_activator (activator.in (),
-                               ACE_TRY_ENV);
+      root_poa->the_activator (activator.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to find a childPOA of RootPOA named firstPOA
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa =
         root_poa->find_POA (name.c_str (),
-                            1,
-                            ACE_TRY_ENV);
+                            1
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       name = "secondPOA";
       PortableServer::POA_var second_poa =
         first_poa->find_POA (name.c_str (),
-                             1,
-                             ACE_TRY_ENV);
+                             1
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to find a non-existant POA.  Even though the Adapter
@@ -122,15 +121,15 @@ main (int argc, char **argv)
 
       // Get the names of all the POAs
       CORBA::String_var root_poa_name =
-        root_poa->the_name (ACE_TRY_ENV);
+        root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var first_poa_name =
-        first_poa->the_name (ACE_TRY_ENV);
+        first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_poa_name =
-        second_poa->the_name (ACE_TRY_ENV);
+        second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.cpp b/TAO/examples/POA/Forwarding/MyFooServant.cpp
index 8d7734fe759..ac7acfc29ef 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.cpp
+++ b/TAO/examples/POA/Forwarding/MyFooServant.cpp
@@ -18,42 +18,42 @@ MyFooServant::MyFooServant (CORBA::ORB_ptr orb,
 }
 
 CORBA::Long
-MyFooServant::doit (CORBA::Environment &)
+MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_++;
 }
 
 void
-MyFooServant::forward (CORBA::Environment &ACE_TRY_ENV)
+MyFooServant::forward (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Foo::Cannot_Forward))
 {
-  this->activator_.forward_requests (ACE_TRY_ENV);
+  this->activator_.forward_requests (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    this->poa_->servant_to_id (this,
-                               ACE_TRY_ENV);
+    this->poa_->servant_to_id (this
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->poa_->deactivate_object (id.in (),
-                                 ACE_TRY_ENV);
+  this->poa_->deactivate_object (id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 
 void
-MyFooServant::shutdown (CORBA::Environment &ACE_TRY_ENV)
+MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-MyFooServant::_default_POA (CORBA::Environment &)
+MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.cpp b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
index a3f0a00c98d..0e6a08ded10 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
@@ -19,10 +19,8 @@ MyFooServantActivator::incarnate (const PortableServer::ObjectId &,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Throw forward exception
@@ -45,7 +43,7 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &,
 }
 
 void
-MyFooServantActivator::forward_requests (CORBA::Environment &ACE_TRY_ENV)
+MyFooServantActivator::forward_requests (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->forward_to_.in ()))
     ACE_THROW (Foo::Cannot_Forward ());
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h
index 78269ba5d4c..affd047814f 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.h
@@ -47,7 +47,7 @@ public:
                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void forward_requests (CORBA::Environment &env);
+  void forward_requests (TAO_ENV_SINGLE_ARG_DECL);
   // Object should be forwarded from now on.
 
 private:
diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index 0908970d5d7..a4c79f67f2f 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -66,15 +66,15 @@ parse_args (int argc, char **argv)
 }
 
 void
-do_calls (Foo_ptr foo,
-          CORBA::Environment &ACE_TRY_ENV)
+do_calls (Foo_ptr foo
+          TAO_ENV_ARG_DECL)
 {
   for (int j = 1; j <= servers; j++)
     {
       for (int i = 1; i <= iterations; i++)
         {
           // Invoke the doit() method of the foo reference.
-          CORBA::Long result = foo->doit (ACE_TRY_ENV);
+          CORBA::Long result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Print the result of doit () method of the foo reference.
@@ -88,7 +88,7 @@ do_calls (Foo_ptr foo,
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Asking server to forward next time\n"));
-          foo->forward (ACE_TRY_ENV);
+          foo->forward (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -98,12 +98,12 @@ do_calls (Foo_ptr foo,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -114,19 +114,19 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR, ACE_TRY_ENV);
+        orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a Foo reference.
       Foo_var foo =
-        Foo::_narrow (object.in (), ACE_TRY_ENV);
+        Foo::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      do_calls (foo.in (),
-                ACE_TRY_ENV);
+      do_calls (foo.in ()
+                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      foo->shutdown (ACE_TRY_ENV);
+      foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index edfc788fd12..54e3a0d6bbf 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -63,8 +63,8 @@ parse_args (int argc, char **argv)
 }
 
 PortableServer::POA_ptr
-setup_poa (PortableServer::POA_ptr root_poa,
-           CORBA::Environment &ACE_TRY_ENV)
+setup_poa (PortableServer::POA_ptr root_poa
+           TAO_ENV_ARG_DECL)
 {
   // Policies for the childPOA to be created.
   CORBA::PolicyList policies (2);
@@ -72,18 +72,18 @@ setup_poa (PortableServer::POA_ptr root_poa,
 
   // Tell the POA to use a servant manager.
   policies[0] =
-    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER,
-                                                ACE_TRY_ENV);
+    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Allow implicit activation.
   policies[1] =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                 ACE_TRY_ENV);
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_TRY_ENV);
+    root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Create POA as child of RootPOA with the above policies.  This POA
@@ -91,8 +91,8 @@ setup_poa (PortableServer::POA_ptr root_poa,
   PortableServer::POA_var child_poa =
     root_poa->create_POA ("childPOA",
                           poa_manager.in (),
-                          policies,
-                          ACE_TRY_ENV);
+                          policies
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Creation of childPOAs is over. Destroy the Policy objects.
@@ -100,7 +100,7 @@ setup_poa (PortableServer::POA_ptr root_poa,
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_TRY_ENV);
+      policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (PortableServer::POA::_nil ());
     }
 
@@ -109,15 +109,15 @@ setup_poa (PortableServer::POA_ptr root_poa,
 
 MyFooServantActivator *
 create_servant_manager (CORBA::ORB_ptr orb,
-                        PortableServer::POA_ptr child_poa,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        PortableServer::POA_ptr child_poa
+                        TAO_ENV_ARG_DECL)
 {
   CORBA::Object_var forward_to;
   if (forward_to_ior)
     {
       forward_to =
-        orb->string_to_object (forward_to_ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (forward_to_ior
+                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -128,17 +128,17 @@ create_servant_manager (CORBA::ORB_ptr orb,
                   0);
 
   // Set MyFooServantActivator to be the servant activator.
-  child_poa->set_servant_manager (activator,
-                                  ACE_TRY_ENV);
+  child_poa->set_servant_manager (activator
+                                  TAO_ENV_ARG_PARAMETER);
   // For the code above, we're using the CORBA 3.0 servant manager
   // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
   // use the following code in place of the previous line:
   //
-  // PortableServer::ServantManager_var servant_activator = 
+  // PortableServer::ServantManager_var servant_activator =
   //   activator->_this ();
   //
   // child_poa->set_servant_manager (servant_activator.in (),
-  //                                 ACE_TRY_ENV);
+  //                                 TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   MyFooServant *servant = 0;
@@ -152,12 +152,12 @@ create_servant_manager (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var servant_var (servant);
 
   Foo_var foo =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var ior =
-    orb->object_to_string (foo.in (),
-                           ACE_TRY_ENV);
+    orb->object_to_string (foo.in ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -183,51 +183,51 @@ main (int argc,
   if (result == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
-        setup_poa (root_poa.in (),
-                   ACE_TRY_ENV);
+        setup_poa (root_poa.in ()
+                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ServantManager_var manager =
         create_servant_manager (orb.in (),
-                                child_poa.in (),
-                                ACE_TRY_ENV);
+                                child_poa.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
index aa975e40338..241d420cd47 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
@@ -20,7 +20,7 @@ ACE_RCSID(Generic_Servant, MyFooServant, "$Id$")
 
 // Constructor
 MyFooServant::MyFooServant (CORBA::ORB_ptr orb,
-			    PortableServer::POA_ptr poa,
+                            PortableServer::POA_ptr poa,
                             CORBA::Long value)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
@@ -35,27 +35,27 @@ MyFooServant::~MyFooServant (void)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-MyFooServant::_default_POA (CORBA::Environment &/*env*/)
+MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 CORBA::Long
-MyFooServant::doit (CORBA::Environment &/*env*/)
+MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
-MyFooServant::simply_doit (CORBA::Environment &/*env*/)
+MyFooServant::simply_doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-MyFooServant::timed_operation (CORBA::ULong timeout,
-                               CORBA::Environment &)
+MyFooServant::timed_operation (CORBA::ULong timeout
+                               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -69,10 +69,10 @@ MyFooServant::timed_operation (CORBA::ULong timeout,
 }
 
 void
-MyFooServant::shutdown (CORBA::Environment &ACE_TRY_ENV)
+MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h
index 7f92aa0c7e8..e3b14fceeda 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.h
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h
@@ -29,23 +29,23 @@ public:
   virtual ~MyFooServant (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
   // Returns the Default POA of this Servant object
 
-  virtual CORBA::Long doit (CORBA::Environment &env)
+  virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Simple doit method
 
-  virtual void simply_doit (CORBA::Environment &env)
+  virtual void simply_doit (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Even simpler doit method
 
-  virtual void timed_operation (CORBA::ULong timeout,
-                                CORBA::Environment &env)
+  virtual void timed_operation (CORBA::ULong timeout
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Timed operation.
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the ORB
 
diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp
index b96bf45b1e8..95254622d2a 100644
--- a/TAO/examples/POA/Generic_Servant/client.cpp
+++ b/TAO/examples/POA/Generic_Servant/client.cpp
@@ -155,15 +155,15 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -179,18 +179,18 @@ main (int argc, char **argv)
         }
 
       // Get an object reference from the argument string.
-      CORBA::Object_var object = orb->string_to_object (IOR,
-                                                        ACE_TRY_ENV);
+      CORBA::Object_var object = orb->string_to_object (IOR
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a Foo reference.
-      Foo_var foo = Foo::_narrow (object.in (),
-                                  ACE_TRY_ENV);
+      Foo_var foo = Foo::_narrow (object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (foo.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (foo.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -212,20 +212,20 @@ main (int argc, char **argv)
           if (oneway)
             {
               // Invoke the simply_doit() method of the foo reference.
-              foo->simply_doit (ACE_TRY_ENV);
+              foo->simply_doit (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (timed_operations)
             {
               // Invoke the timed_operation() method of the foo reference.
-              foo->timed_operation (timeout,
-                                    ACE_TRY_ENV);
+              foo->timed_operation (timeout
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               // Invoke the doit() method of the foo reference.
-              result = foo->doit (ACE_TRY_ENV);
+              result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -239,7 +239,7 @@ main (int argc, char **argv)
 
       if (shutdown_server)
         {
-          foo->shutdown (ACE_TRY_ENV);
+          foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index 978a46ea2f4..d0797662314 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -70,8 +70,6 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   // Obtain the servant else exception.
   PortableServer::Servant servant =
     (*servant_supplier_) (oid,
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index f8ce694703b..ce60de2ad7e 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -75,8 +75,6 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   PortableServer::Servant servant =
     (*servant_supplier_) (oid,
                           poa,
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 8003fd5c7c5..af6ac15c768 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -108,15 +108,14 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  //CORBA::Environment TAO_TRY_ENV;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              0,
-                              ACE_TRY_ENV);
+                              0
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -125,17 +124,17 @@ Server_i::init (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA",
-                                          ACE_TRY_ENV);
+        orb_->resolve_initial_references ("RootPOA"
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
-      root_poa_ = PortableServer::POA::_narrow (obj.in (),
-                                                ACE_TRY_ENV);
+      root_poa_ = PortableServer::POA::_narrow (obj.in ()
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (ACE_TRY_ENV);
+      poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -157,10 +156,9 @@ PortableServer::POA_ptr
 Server_i::create_poa (const char *name,
                       int servant_retention_policy)
 {
-  // CORBA::Environment TAO_TRY_ENV;
   PortableServer::POA_ptr my_poa = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -169,36 +167,36 @@ Server_i::create_poa (const char *name,
       // ID Assignment Policy.
       policies_[0] =
         root_poa_->create_id_assignment_policy
-        (PortableServer::USER_ID,
-         ACE_TRY_ENV);
+        (PortableServer::USER_ID
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy
-        (PortableServer::PERSISTENT,
-         ACE_TRY_ENV);
+        (PortableServer::PERSISTENT
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy
-        (PortableServer::USE_SERVANT_MANAGER,
-         ACE_TRY_ENV);
+        (PortableServer::USE_SERVANT_MANAGER
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
         policies_[3] =
           root_poa_->create_servant_retention_policy
-          (PortableServer::RETAIN,
-           ACE_TRY_ENV);
+          (PortableServer::RETAIN
+           TAO_ENV_ARG_PARAMETER);
 
       if (servant_retention_policy == 0)
         policies_[3] =
           root_poa_->create_servant_retention_policy
-          (PortableServer::NON_RETAIN,
-           ACE_TRY_ENV);
+          (PortableServer::NON_RETAIN
+           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -207,8 +205,8 @@ Server_i::create_poa (const char *name,
       // being RETAIN or NONRETAIN respectively.
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
-                                      policies_,
-                                      ACE_TRY_ENV);
+                                      policies_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the policy objects as they have been passed to
@@ -218,7 +216,7 @@ Server_i::create_poa (const char *name,
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -238,9 +236,7 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  // CORBA::Environment TAO_TRY_ENV;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -257,16 +253,16 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
       this->servant_activator_ = temp_servant_activator;
-      first_poa->set_servant_manager (this->servant_activator_.in (),
-                                      ACE_TRY_ENV);
+      first_poa->set_servant_manager (this->servant_activator_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous lines:
       //
       // this->servant_activator_ = temp_servant_activator->_this ();
-      // 
-      // first_poa->set_servant_manager (this->servant_activator_.in (),
-      //                                ACE_TRY_ENV);
+      //
+      // first_poa->set_servant_manager (this->servant_activator_.in ()
+      //                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a reference with user created ID in firstPOA which
@@ -275,8 +271,8 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
         PortableServer::string_to_ObjectId ("firstFoo");
 
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
-                                                        "IDL:Foo:1.0",
-                                                        ACE_TRY_ENV);
+                                                        "IDL:Foo:1.0"
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -294,8 +290,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  // CORBA::Environment TAO_TRY_ENV;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -311,18 +306,18 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
       this->servant_locator_ = temp_servant_locator;
-      second_poa->set_servant_manager (this->servant_locator_.in (),
-                                       ACE_TRY_ENV);
+      second_poa->set_servant_manager (this->servant_locator_.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous lines:
       //
       // this->servant_locator_ = temp_servant_locator->_this ();
-      // 
+      //
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
-      // second_poa->set_servant_manager (this->servant_locator_.in (),
-      //                                  ACE_TRY_ENV);
+      // second_poa->set_servant_manager (this->servant_locator_.in ()
+      //                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a reference with user created ID in second_poa
@@ -332,8 +327,8 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 
       second_foo_ =
         second_poa->create_reference_with_id (second_foo_oid.in (),
-                                              "IDL:Foo:1.0",
-                                              ACE_TRY_ENV);
+                                              "IDL:Foo:1.0"
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -351,9 +346,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int
 Server_i::run (void)
 {
-  // CORBA::Environment TAO_TRY_ENV;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -361,13 +354,13 @@ Server_i::run (void)
       // and secondPOA.
 
       CORBA::String_var first_foo_ior =
-        orb_->object_to_string (first_foo_.in (),
-                                ACE_TRY_ENV);
+        orb_->object_to_string (first_foo_.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
-        orb_->object_to_string (second_foo_.in (),
-                                ACE_TRY_ENV);
+        orb_->object_to_string (second_foo_.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -384,12 +377,12 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (ACE_TRY_ENV);
+      poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb_->run (ACE_TRY_ENV);
+      orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index b4a9419a61c..16528209a04 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -27,15 +27,15 @@
 ACE_RCSID(NewPOA, NewPOA, "$Id$")
 
 void
-print_poa (PortableServer::POA_ptr poa,
-           CORBA::Environment &ACE_TRY_ENV)
+print_poa (PortableServer::POA_ptr poa
+           TAO_ENV_ARG_DECL)
 {
   CORBA::String_var poa_name =
-    poa->the_name (ACE_TRY_ENV);
+    poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::OctetSeq_var poa_id =
-    poa->id (ACE_TRY_ENV);
+    poa->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -58,15 +58,15 @@ print_poa (PortableServer::POA_ptr poa,
               "\n"));
 
   PortableServer::POAList_var children =
-    poa->the_children (ACE_TRY_ENV);
+    poa->the_children (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong index = 0;
        index != children->length ();
        ++index)
     {
-      print_poa (children[index].in (),
-                 ACE_TRY_ENV);
+      print_poa (children[index].in ()
+                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -74,27 +74,26 @@ print_poa (PortableServer::POA_ptr poa,
 int
 main (int argc, char **argv)
 {
-  //  CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // The first step Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // _narrow() the Object to get the POA object, i.e., the root_poa.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the new POAs
@@ -103,12 +102,12 @@ main (int argc, char **argv)
 
       // Threading policy
       policies[0] =
-        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL, ACE_TRY_ENV);
+        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::TRANSIENT, ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::TRANSIENT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the firstPOA
@@ -116,8 +115,8 @@ main (int argc, char **argv)
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POA, i.e. firstPOA/secondPOA
@@ -125,8 +124,8 @@ main (int argc, char **argv)
       PortableServer::POA_var second_poa =
         first_poa->create_POA (name.c_str (),
                                PortableServer::POAManager::_nil (),
-                               policies,
-                               ACE_TRY_ENV);
+                               policies
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creating thirdPOA.
@@ -135,8 +134,8 @@ main (int argc, char **argv)
       PortableServer::POA_var third_poa =
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
@@ -145,26 +144,26 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Get the names of all the POAs and print them out.
 
       CORBA::String_var root_poa_name =
-        root_poa->the_name (ACE_TRY_ENV);
+        root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var first_poa_name =
-        first_poa->the_name (ACE_TRY_ENV);
+        first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_poa_name =
-        second_poa->the_name (ACE_TRY_ENV);
+        second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var third_poa_name =
-        third_poa->the_name (ACE_TRY_ENV);
+        third_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -174,8 +173,8 @@ main (int argc, char **argv)
                   second_poa_name.in (),
                   third_poa_name.in ()));
 
-      print_poa (root_poa.in (),
-                 ACE_TRY_ENV);
+      print_poa (root_poa.in ()
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
index 1266c4eaff9..f7d810d91b3 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -34,7 +34,6 @@ MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
   // Convert ObjectId to String.
 
   CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
@@ -47,9 +46,6 @@ MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid,
   else
     {
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-      //CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST ();
-      //env.exception (exception);
-      //return 0;
     }
 }
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index 2511134c251..12edc90e4f3 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -38,8 +38,6 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   // Convert ObjectID to String.
 
   CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
@@ -60,11 +58,6 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
   else
     {
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-      //
-      //CORBA::Exception *exception =
-      //  new CORBA::OBJECT_NOT_EXIST ();
-      //env.exception (exception);
-      //return 0;
     }
 }
 
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 685c584ef00..bc506124e27 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -100,12 +100,12 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -114,19 +114,19 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of RootPOA
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -135,24 +135,24 @@ main (int argc, char **argv)
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, ACE_TRY_ENV);
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var first_poa;
       {
         // Servant Retention Policy
         policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
+          root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_CString name = "firstPOA";
@@ -161,8 +161,8 @@ main (int argc, char **argv)
         // firstPOA will use SERVANT_ACTIVATOR because of RETAIN policy.
         first_poa = root_poa->create_POA (name.c_str (),
                                           poa_manager.in (),
-                                          policies,
-                                          ACE_TRY_ENV);
+                                          policies
+                                          TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
       }
@@ -171,7 +171,7 @@ main (int argc, char **argv)
       {
         // Servant Retention Policy
         policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, ACE_TRY_ENV);
+          root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_CString name = "secondPOA";
@@ -181,8 +181,8 @@ main (int argc, char **argv)
         // policy.
         second_poa = root_poa->create_POA (name.c_str (),
                                            poa_manager.in (),
-                                           policies,
-                                           ACE_TRY_ENV);
+                                           policies
+                                           TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
       }
@@ -194,7 +194,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -206,17 +206,17 @@ main (int argc, char **argv)
 
       // Set MyFooServantActivator object as the servant_manager of
       // firstPOA.
-      first_poa->set_servant_manager (activator,
-                                      ACE_TRY_ENV);
+      first_poa->set_servant_manager (activator
+                                      TAO_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
       //
-      // PortableServer::ServantManager_var servant_activator = 
+      // PortableServer::ServantManager_var servant_activator =
       //   activator->_this ();
-      // 
+      //
       // first_poa->set_servant_manager (servant_activator.in (),
-      //                                 ACE_TRY_ENV);
+      //                                 TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a reference with user created ID in firstPOA which uses
@@ -226,7 +226,7 @@ main (int argc, char **argv)
         PortableServer::string_to_ObjectId ("firstFoo");
 
       CORBA::Object_var first_foo =
-        first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0", ACE_TRY_ENV);
+        first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Allocate the servant activator.
@@ -237,8 +237,8 @@ main (int argc, char **argv)
 
       // Set MyFooServantLocator object as the servant Manager of
       // secondPOA.
-      second_poa->set_servant_manager (locator,
-                                       ACE_TRY_ENV);
+      second_poa->set_servant_manager (locator
+                                       TAO_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -247,7 +247,7 @@ main (int argc, char **argv)
       //   locator->_this ();
       //
       // second_poa->set_servant_manager (servant_locator.in (),
-      //                                  ACE_TRY_ENV);
+      //                                  TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a reference with user created ID in second_poa
@@ -258,19 +258,19 @@ main (int argc, char **argv)
 
       CORBA::Object_var second_foo =
         second_poa->create_reference_with_id (second_foo_oid.in (),
-                                              "IDL:Foo:1.0", ACE_TRY_ENV);
+                                              "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoke object_to_string on the references created in firstPOA and
       // secondPOA.
 
       CORBA::String_var first_foo_ior =
-        orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       CORBA::String_var second_foo_ior =
-        orb->object_to_string (second_foo.in (), ACE_TRY_ENV);
+        orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -285,11 +285,11 @@ main (int argc, char **argv)
         return write_result;
 
       // Set the poa_manager state to active, ready to process requests.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
index 3f6f762fd9d..53ac5c7f696 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -37,7 +37,6 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
   // Convert ObjectId to String.
    CORBA::String_var s =
      PortableServer::ObjectId_to_string (oid);
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index 0ec58cd5043..2155e074ab5 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -39,8 +39,6 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   // Convert ObjectID to String.
 
   CORBA::String_var s =
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 00294c8a752..41538165583 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -112,15 +112,15 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              0,
-                              ACE_TRY_ENV);
+                              0
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -129,17 +129,17 @@ Server_i::init (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA",
-                                          ACE_TRY_ENV);
+        orb_->resolve_initial_references ("RootPOA"
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
-      root_poa_ = PortableServer::POA::_narrow (obj.in (),
-                                                ACE_TRY_ENV);
+      root_poa_ = PortableServer::POA::_narrow (obj.in ()
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (ACE_TRY_ENV);
+      poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -163,7 +163,7 @@ Server_i::create_poa (const char *name,
 {
   PortableServer::POA_ptr my_poa = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       policies_.length (4);
@@ -171,37 +171,37 @@ Server_i::create_poa (const char *name,
       // ID Assignment Policy.
       policies_[0] =
         root_poa_->create_id_assignment_policy
-        (PortableServer::USER_ID,
-         ACE_TRY_ENV);
+        (PortableServer::USER_ID
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy
-        (PortableServer::PERSISTENT,
-         ACE_TRY_ENV);
+        (PortableServer::PERSISTENT
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy
-        (PortableServer::USE_SERVANT_MANAGER,
-         ACE_TRY_ENV);
+        (PortableServer::USE_SERVANT_MANAGER
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
         policies_[3] =
           root_poa_->create_servant_retention_policy
-          (PortableServer::RETAIN,
-           ACE_TRY_ENV);
+          (PortableServer::RETAIN
+           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (servant_retention_policy == 0)
         policies_[3] =
           root_poa_->create_servant_retention_policy
-          (PortableServer::NON_RETAIN,
-           ACE_TRY_ENV);
+          (PortableServer::NON_RETAIN
+           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -210,8 +210,8 @@ Server_i::create_poa (const char *name,
       // being RETAIN or NONRETAIN respectively.
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
-                                      policies_,
-                                      ACE_TRY_ENV);
+                                      policies_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the policy objects as they have been passed to
@@ -221,7 +221,7 @@ Server_i::create_poa (const char *name,
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -241,7 +241,7 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // An Servant Activator object is created which will activate
@@ -252,17 +252,17 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
-      first_poa->set_servant_manager (servant_activator_impl_,
-                                      ACE_TRY_ENV);
+      first_poa->set_servant_manager (servant_activator_impl_
+                                      TAO_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
       //
-      // PortableServer::ServantManager_var servant_activator = 
+      // PortableServer::ServantManager_var servant_activator =
       //   servant_activator_impl_->_this ();
       //
       // first_poa->set_servant_manager (servant_activator.in (),
-      //                                 ACE_TRY_ENV);
+      //                                 TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a reference with user created ID in firstPOA which
@@ -275,8 +275,8 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
                                                        "create_MyFoo");
 
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
-                                                        "IDL:Foo:1.0",
-                                                        ACE_TRY_ENV);
+                                                        "IDL:Foo:1.0"
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -294,7 +294,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // An Servant Locator object is created which will activate
@@ -305,16 +305,16 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
-      second_poa->set_servant_manager (servant_locator_impl_,
-                                       ACE_TRY_ENV);
+      second_poa->set_servant_manager (servant_locator_impl_
+                                       TAO_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
       // PortableServer::ServantManager_var servant_loactor =
       //   servant_loator_impl_->_this ();
-      // 
+      //
       // second_poa->set_servant_manager (servant_locator_impl_,
-      //                                  ACE_TRY_ENV);
+      //                                  TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a reference with user created ID in second_poa
@@ -327,8 +327,8 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
          "create_MyFoo");
       second_foo_ = second_poa->create_reference_with_id
         (second_foo_oid.in (),
-         "IDL:Foo:1.0",
-         ACE_TRY_ENV);
+         "IDL:Foo:1.0"
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -346,20 +346,20 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int
 Server_i::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
 
       CORBA::String_var first_foo_ior =
-        orb_->object_to_string (first_foo_.in (),
-                                ACE_TRY_ENV);
+        orb_->object_to_string (first_foo_.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
-        orb_->object_to_string (second_foo_.in (),
-                                ACE_TRY_ENV);
+        orb_->object_to_string (second_foo_.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -376,15 +376,15 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (ACE_TRY_ENV);
+      poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb_->run (ACE_TRY_ENV);
+      orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb_->destroy (ACE_TRY_ENV);
+      orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
index 7549c897e63..3b07f14c642 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
@@ -108,15 +108,15 @@ write_iors_to_file (const char *ior)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -125,19 +125,19 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a servant.
@@ -149,16 +149,16 @@ main (int argc, char **argv)
                       -1);
 
       // Get Object Reference for the foo_impl object.
-      Foo_var foo = foo_impl->_this (ACE_TRY_ENV);
+      Foo_var foo = foo_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This means that the ownership of <foo_impl> now belongs to
       // the POA.
-      foo_impl->_remove_ref (ACE_TRY_ENV);
+      foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
-      CORBA::String_var ior = orb->object_to_string (foo.in (), ACE_TRY_ENV);
+      CORBA::String_var ior = orb->object_to_string (foo.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -169,10 +169,10 @@ main (int argc, char **argv)
       if (write_result != 0)
         return write_result;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index b6ab90b0029..007bbf9aa05 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -26,30 +26,30 @@ ACE_RCSID(RootPOA, RootPOA, "$Id$")
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initilize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Resolve the initial references for the name RootPOA thus getting
       // an object of type CORBA::Object.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // apply _narrow on the object of type CORBA::Object, to make it
       // a POA class Object.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the name of the root POA.
       CORBA::String_var poa_name =
-        root_poa->the_name (ACE_TRY_ENV);
+        root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp
index 3306844d5d4..81e3d454956 100644
--- a/TAO/examples/POA/TIE/client.cpp
+++ b/TAO/examples/POA/TIE/client.cpp
@@ -90,47 +90,47 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
       double tmp = 1000 / elapsed_time.real_time;
 
       ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t = %0.06f ms, \n"
-		  "\tuser_time\t = %0.06f ms, \n"
-		  "\tsystem_time\t = %0.06f ms, \n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
-		  elapsed_time.user_time   < 0.0 ? 0.0 : elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time,
-		  tmp < 0.0 ? 0.0 : tmp));
+                  "\treal_time\t = %0.06f ms, \n"
+                  "\tuser_time\t = %0.06f ms, \n"
+                  "\tsystem_time\t = %0.06f ms, \n"
+                  "\t%0.00f calls/second\n",
+                  elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
+                  elapsed_time.user_time   < 0.0 ? 0.0 : elapsed_time.user_time,
+                  elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time,
+                  tmp < 0.0 ? 0.0 : tmp));
     }
   else
     ACE_ERROR ((LM_ERROR,
-		"\tNo time stats printed.  Zero iterations or error ocurred.\n"));
+                "\tNo time stats printed.  Zero iterations or error ocurred.\n"));
 }
 
-template <class T, class T_var> 
+template <class T, class T_var>
 class Test
 {
 public:
-  static void run (CORBA::ORB_ptr orb, 
-		   char *IOR,
-		   CORBA::Environment &ACE_TRY_ENV)
+  static void run (CORBA::ORB_ptr orb,
+                   char *IOR
+                   TAO_ENV_ARG_DECL)
   {
     if (IOR != 0)
       {
         // Get an object reference from the argument string.
-        CORBA::Object_var object = orb->string_to_object (IOR, ACE_TRY_ENV);
+        CORBA::Object_var object = orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        /*if (env.exception () != 0)
+        /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
           {
-            env.print_exception ("CORBA::ORB::string_to_object");
+            TAO_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object");
             return;
           }
         */
         // Try to narrow the object reference to a reference.
-        T_var foo = T::_narrow (object.in (), ACE_TRY_ENV);
+        T_var foo = T::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
-      
-        /*if (env.exception () != 0)
+
+        /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
           {
-            env.print_exception ("_narrow");
+            TAO_ENV_ARG_PARAMETER.print_exception ("_narrow");
             return;
           }
         */
@@ -145,10 +145,10 @@ public:
         for (i = 0; i < iterations ; i++)
           {
             // Invoke the doit() method on the reference.
-            result = foo->doit (ACE_TRY_ENV);
+            result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_CHECK;
           }
-     
+
         // stop the timer.
         timer.stop ();
         timer.elapsed_time (elapsed_time);
@@ -156,16 +156,16 @@ public:
         // compute average time.
         print_stats (elapsed_time, i);
 
-        /*if (env.exception () != 0)
+        /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
           {
-            env.print_exception ("doit");
+            TAO_ENV_ARG_PARAMETER.print_exception ("doit");
             return;
           }
         */
         // Print the result of doit () method on the reference.
         ACE_DEBUG ((LM_DEBUG,
                     "%d\n",
-                    result)); 
+                    result));
       }
   }
 };
@@ -173,51 +173,48 @@ public:
 int
 main (int argc, char **argv)
 {
-  //CORBA::Environment env;
-
-  
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
         // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
       if (parse_args_result != 0)
         return parse_args_result;
-  
+
       int i = 1;
 
-      Test<A, A_var>::run (orb.in (), 
-                           IOR[i++], 
-                           ACE_TRY_ENV);
+      Test<A, A_var>::run (orb.in (),
+                           IOR[i++]
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test<Outer::B, Outer::B_var>::run (orb.in (), 
-                                         IOR[i++], 
-                                         ACE_TRY_ENV);
+      Test<Outer::B, Outer::B_var>::run (orb.in (),
+                                         IOR[i++]
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), 
-                                                       IOR[i++], 
-                                                       ACE_TRY_ENV);
+      Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (),
+                                                       IOR[i++]
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test<A, A_var>::run (orb.in (),
-                           IOR[i++], 
-                           ACE_TRY_ENV);
+                           IOR[i++]
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test<Outer::B, Outer::B_var>::run (orb.in (), 
-                                         IOR[i++], 
-                                         ACE_TRY_ENV);
+      Test<Outer::B, Outer::B_var>::run (orb.in (),
+                                         IOR[i++]
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (), 
-                                                       IOR[i++], 
-                                                       ACE_TRY_ENV);
+      Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (),
+                                                       IOR[i++]
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index 72b13a2dfb4..c34a7549e4e 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -22,7 +22,7 @@ ACE_RCSID(TIE, server, "$Id$")
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   char str[256];
 
@@ -31,26 +31,26 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str, "CORBA::ORB_init");
 
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager");
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -61,13 +61,13 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
       // Lifespan policy
       policies[0] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::create_implicit_activation_policy");
       // Implicit activation policy
       policies[1] =
-        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION, ACE_TRY_ENV);
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
@@ -76,8 +76,8 @@ main (int argc, char **argv)
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -89,7 +89,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -119,34 +119,34 @@ main (int argc, char **argv)
 
       ACE_OS::strcpy (str, "POA_A::_this");
       // Get Object Reference for the a_impl object.
-      A_var a = a_impl._this (ACE_TRY_ENV);
+      A_var a = a_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       ACE_OS::strcpy (str, "POA_Outer::B::_this");
       // Get Object Reference for the b_impl object.
-      Outer::B_var b = b_impl._this (ACE_TRY_ENV);
+      Outer::B_var b = b_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "POA_Outer::Inner::C::_this");
       // Get Object Reference for the c_impl object.
-      Outer::Inner::C_var c = c_impl._this (ACE_TRY_ENV);
+      Outer::Inner::C_var c = c_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if defined (ACE_HAS_USING_KEYWORD)
       ACE_OS::strcpy (str, "POA_A::_this");
       // Get Object Reference for the a_tie_impl object.
-      A_var a_tie = a_tie_impl._this (ACE_TRY_ENV);
+      A_var a_tie = a_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "POA_Outer::B::_this");
       // Get Object Reference for the a_tie_impl object.
-      Outer::B_var b_tie = b_tie_impl._this (ACE_TRY_ENV);
+      Outer::B_var b_tie = b_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "POA_Outer::C::_this");
       // Get Object Reference for the c_tie_impl object.
-      Outer::Inner::C_var c_tie = c_tie_impl._this (ACE_TRY_ENV);
+      Outer::Inner::C_var c_tie = c_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* ACE_HAS_USING_KEYWORD */
@@ -154,23 +154,23 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (a.in (), ACE_TRY_ENV);
+        orb->object_to_string (a.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var second_ior =
-        orb->object_to_string (b.in (), ACE_TRY_ENV);
+        orb->object_to_string (b.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var third_ior =
-        orb->object_to_string (c.in (), ACE_TRY_ENV);
+        orb->object_to_string (c.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if defined (ACE_HAS_USING_KEYWORD)
       // Stringyfy all the object references and print them out.
       CORBA::String_var forth_ior =
-        orb->object_to_string (a_tie.in (), ACE_TRY_ENV);
+        orb->object_to_string (a_tie.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w");
@@ -203,13 +203,13 @@ main (int argc, char **argv)
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var fifth_ior =
-        orb->object_to_string (b_tie.in (), ACE_TRY_ENV);
+        orb->object_to_string (b_tie.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var sixth_ior =
-        orb->object_to_string (c_tie.in (), ACE_TRY_ENV);
+        orb->object_to_string (c_tie.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w");
@@ -229,10 +229,10 @@ main (int argc, char **argv)
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index c7f5bf8a6e3..447dc531ba2 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -67,15 +67,15 @@ Grid_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Make the Grid.
 
       Grid_ptr grid = client->make_grid (width_,
-                                         height_,
-                                         ACE_TRY_ENV);
+                                         height_
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -90,21 +90,21 @@ Grid_Client_i::run (const char *name,
               // Set a value on the grid
               grid->set (index_,
                          ctr,
-                         (value_ + ctr),
-                         ACE_TRY_ENV);
+                         (value_ + ctr)
+                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
-              
+
             }
         }
-      
+
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Setting a value for the grid\n"));
-      
+
       ACE_TRY_CHECK;
-      
+
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_TRY_ENV);
-	ACE_TRY_CHECK;
+        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
       }
 
     }
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 8a03929cf5b..29f586b7808 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -62,8 +62,8 @@ Grid_i::~Grid_i (void)
 void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
-             CORBA::Long value,
-             CORBA::Environment &ACE_TRY_ENV)
+             CORBA::Long value
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -80,8 +80,8 @@ Grid_i::set (CORBA::Short x,
 
 CORBA::Long
 Grid_i::get (CORBA::Short x,
-             CORBA::Short y,
-             CORBA::Environment &ACE_TRY_ENV)
+             CORBA::Short y
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -97,30 +97,30 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (CORBA::Environment &)
+Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (CORBA::Environment &)
+Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
-Grid_i::width (CORBA::Short x,
-               CORBA::Environment &)
+Grid_i::width (CORBA::Short x
+               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
-Grid_i::height (CORBA::Short y,
-                CORBA::Environment &)
+Grid_i::height (CORBA::Short y
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
@@ -128,7 +128,7 @@ Grid_i::height (CORBA::Short y,
 
 // Destroy the grid
 void
-Grid_i::destroy (CORBA::Environment & )
+Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
@@ -179,8 +179,8 @@ Grid_Factory_i::~Grid_Factory_i (void)
 
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
-                           CORBA::Short height,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Short height
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -215,7 +215,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   grid_ptr->set_pool (pool_t_);
 
   // Register the Grid pointer.
-  return grid_ptr->_this (ACE_TRY_ENV);
+  return grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Set the ORB pointer.
@@ -228,7 +228,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (CORBA::Environment &)
+Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -240,7 +240,7 @@ Grid_Factory_i::shutdown (CORBA::Environment &)
 }
 
 void
-Grid_Factory_i::cleanup (CORBA::Environment &)
+Grid_Factory_i::cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *name = "Array";
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index ea6e06cc8de..8598f2a4658 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -42,16 +42,16 @@ public:
 
 
   virtual Grid_ptr make_grid (CORBA::Short,
-                              CORBA::Short,
-                              CORBA::Environment &_env)
+                              CORBA::Short
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
-  virtual void cleanup (CORBA::Environment & )
+  virtual void cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Do a clean up of the memory map
 
@@ -98,40 +98,40 @@ public:
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (CORBA_Environment &)
+  virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (CORBA_Environment &)
+  virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
-  virtual void width (CORBA::Short,
-                      CORBA_Environment &)
+  virtual void width (CORBA::Short
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the width of the grid.
 
-  virtual void height (CORBA::Short,
-                       CORBA_Environment &)
+  virtual void height (CORBA::Short
+                       TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
-                    CORBA::Long,
-                    CORBA::Environment &)
+                    CORBA::Long
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
-                           CORBA::Short,
-                           CORBA::Environment &)
+                           CORBA::Short
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (CORBA::Environment &)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the grid.
 
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index fc3a9fa015c..d394ed0279e 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -58,42 +58,42 @@ Persistent_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Make the Grid.
       Grid_ptr grid = client->make_grid (width_,
-                                         height_,
-                                         ACE_TRY_ENV);
+                                         height_
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Made the grid succesfully\n"));
-      
+
 
       for (CORBA::Short index_ = 0; index_ < height_; index_++)
         {
           for (CORBA::Short ctr = 0; ctr < width_; ctr++)
             {
               CORBA::Long ret_val = grid->get (index_,
-                                               ctr,
-                                               ACE_TRY_ENV);
+                                               ctr
+                                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
                           "Grid value [%d][%d] =  %d \n",index_, ctr,ret_val));
             }
         }
-                
+
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_TRY_ENV);
-	ACE_TRY_CHECK;
+        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
       }
 
       if (this->remove_ == 1) {
-        client->cleanup (ACE_TRY_ENV);
-	ACE_TRY_CHECK;
+        client->cleanup (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
       }
     }
   ACE_CATCH (CORBA::UserException, range_ex)
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index 26c45b0dd80..647be2151c8 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -68,15 +68,15 @@ Server<Servant>::parse_args (void)
 template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
-                       char *argv[],
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char *argv[]
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -108,8 +108,8 @@ Server<Servant>::init (const char *servant_name,
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_,
-                                                     ACE_TRY_ENV);
+                                                     &this->servant_
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -117,12 +117,12 @@ Server<Servant>::init (const char *servant_name,
                   str.in ()));
 
       if (this->ior_output_file_)
-	{
-	  ACE_OS::fprintf (this->ior_output_file_,
-			   "%s",
-			   str.in ());
-	  ACE_OS::fclose (this->ior_output_file_);
-	}
+        {
+          ACE_OS::fprintf (this->ior_output_file_,
+                           "%s",
+                           str.in ());
+          ACE_OS::fclose (this->ior_output_file_);
+        }
 
     }
   ACE_CATCHANY
@@ -138,10 +138,10 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant> int
-Server<Servant>::run (CORBA::Environment &ACE_TRY_ENV)
+Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL)
 {
     // Run the main event loop for the ORB.
-  int ret = this->orb_manager_.run (ACE_TRY_ENV);
+  int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ret == -1)
@@ -245,15 +245,15 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -263,7 +263,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_, ACE_TRY_ENV);
+            this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -272,8 +272,8 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
                                "invalid ior <%s>\n",
                                this->ior_),
                               -1);
-          this->server_ = InterfaceObj::_narrow (server_object.in (),
-                                                 ACE_TRY_ENV);
+          this->server_ = InterfaceObj::_narrow (server_object.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index d0b689a685b..ac770997e38 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -46,8 +46,8 @@ public:
 
   int init (const char *servant_name,
             int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -55,7 +55,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
  protected:
@@ -120,7 +120,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (CORBA::Environment &);
+  int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Initialize naming service
 
 protected:
@@ -142,7 +142,7 @@ protected:
   char *ior_;
   // IOR of the obj ref of the server.
 
-  CORBA::Environment env_;
+  CORBA::Environment TAO_ENV_SINGLE_ARG_PARAMETER_;
   // Environment variable.
 
   int naming_;
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index d2f159e12a6..76fa1e1d145 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -13,18 +13,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tGrid server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       if (server.init ("Grid",
                        argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
index 4adda921381..1200d20bd2d 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
@@ -37,7 +37,7 @@ UDP_Client_i::svc (void)
   client_name += "_";
   client_name += pid;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -50,28 +50,28 @@ UDP_Client_i::svc (void)
         {
           udp_->invoke (corba_client_name.in (),
                         udpHandler_.inout (),
-                        i,
-                        ACE_TRY_ENV);
+                        i
+                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
                       "invoked %s %d, going to wait %d ms\n",
                       corba_client_name.in (),
                       i,
-          					  delay_));
+                                                  delay_));
           ACE_Time_Value tv (0, delay_ * 1000);
           ACE_OS::sleep (tv);  // wait to not flood the server
         }
 
       // shut down remote ORB
-      udp_->shutdown (ACE_TRY_ENV);
+      udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (0, 500); // 50ms
       ACE_OS::sleep (tv);  // let the previous request go through
 
       // Shut down local ORB, trigger the end of the ORB event loop
-	  // in the main thread.
+          // in the main thread.
       orb_->shutdown ();
 
     }
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
index 0e0241fe3e9..1027ecb86f8 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
@@ -29,8 +29,8 @@ UDP_i::orb (CORBA::ORB_ptr o)
 void
 UDP_i::invoke (const char * client_name,
                UDP_ptr udpHandler,
-               CORBA::Long request_id,
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Long request_id
+               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -61,8 +61,8 @@ UDP_i::invoke (const char * client_name,
         {
           udpHandler->invoke (client_name,
                               UDP::_nil (),
-                              request_id,
-                              ACE_TRY_ENV);
+                              request_id
+                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -78,7 +78,7 @@ UDP_i::invoke (const char * client_name,
 // Shutdown.
 
 void
-UDP_i::shutdown (CORBA::Environment & )
+UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
index f64e27f3b22..4ed19a5aa01 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
@@ -46,11 +46,11 @@ public:
 
   virtual void invoke (const char *client_name,
                        UDP_ptr udpHandler,
-                       CORBA::Long request_id,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Long request_id
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
index 097c10c62c6..56c304b6d1a 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
@@ -79,18 +79,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       UDP_var udp_var =
-        UDP::_narrow (object.in (), ACE_TRY_ENV);
+        UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (udp_var.in ()))
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -111,14 +111,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
       udp_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udp_i._this (ACE_TRY_ENV);
+        udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -143,17 +143,17 @@ main (int argc, char *argv[])
 
       // ORB loop, will be shut down by our client thread
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
-                         0, // wait for completion
-                         ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client->wait ();
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
index 05b288aee3d..174014990d7 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
@@ -66,11 +66,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -79,11 +79,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Install a persistent POA in order to achieve a persistent IOR
@@ -91,26 +91,26 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT,
-                                         ACE_TRY_ENV);
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policies[1] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies,
-                             ACE_TRY_ENV);
+                             policies
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[0]->destroy (ACE_TRY_ENV);
+      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[1]->destroy (ACE_TRY_ENV);
+      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -124,26 +124,26 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("UDP_Object");
 
       persistent_poa->activate_object_with_id (id.in (),
-                                               &udp_i,
-                                               ACE_TRY_ENV);
+                                               &udp_i
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        persistent_poa->id_to_reference (id.in (),
-                                         ACE_TRY_ENV);
+        persistent_poa->id_to_reference (id.in ()
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
-      UDP_var udp_var = UDP::_narrow (obj.in (), ACE_TRY_ENV);
+      UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
 
-      // UDP_var udp_var = udp_i._this (ACE_TRY_ENV);
+      // UDP_var udp_var = udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (udp_var.in ()))
         ACE_DEBUG ((LM_DEBUG,
                     "Failed to narrow correct object reference.\n"));
 
       CORBA::String_var ior =
-        orb->object_to_string (udp_var.in (), ACE_TRY_ENV);
+        orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -161,7 +161,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /*
@@ -171,7 +171,7 @@ main (int argc, char *argv[])
       udpHandler_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udpHandler_i._this (ACE_TRY_ENV);
+        udpHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -182,17 +182,17 @@ main (int argc, char *argv[])
       client->activate ();
       */
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
-                         0, // wait for completion
-                         ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //delete client;
@@ -200,7 +200,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index f5ecdec245f..75639141928 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -34,7 +34,7 @@ UDP_PerformanceClient::svc ()
   ACE_CString client_name ("UDP");
 
   ACE_TCHAR pid[256];
-  ACE_OS::sprintf (pid, 
+  ACE_OS::sprintf (pid,
                    "%u",
                    ACE_static_cast (u_int, ACE_OS::getpid ()));
   client_name += "_";
@@ -45,14 +45,14 @@ UDP_PerformanceClient::svc ()
 
   ACE_TRY_NEW_ENV
     {
-      CORBA::String_var corba_client_name = 
+      CORBA::String_var corba_client_name =
         CORBA::string_dup (client_name.c_str ());
 
-      UDP_var udpHandler_var = udpHandler_->_this (ACE_TRY_ENV);
+      UDP_var udpHandler_var = udpHandler_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      udp_->setResponseHandler (udpHandler_var.in (),
-                                ACE_TRY_ENV);
+      udp_->setResponseHandler (udpHandler_var.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_High_Res_Timer timer;
@@ -63,18 +63,18 @@ UDP_PerformanceClient::svc ()
                       micro_seconds,
                       delta_micro_seconds));
 
-          ACE_Time_Value tv (0, micro_seconds); 
+          ACE_Time_Value tv (0, micro_seconds);
           timer.start ();
           for (ACE_UINT32 j = 1;
                j <= burst_messages_;
                j++)
             {
               udp_->invoke (corba_client_name.in (),
-                            j,
-                            ACE_TRY_ENV);
-              
+                            j
+                            TAO_ENV_ARG_PARAMETER);
+
               ACE_TRY_CHECK;
-              
+
               if (micro_seconds)
                 {
                   ACE_OS::sleep (tv);
@@ -83,21 +83,21 @@ UDP_PerformanceClient::svc ()
            timer.stop ();
 
           ACE_Time_Value tv1 (1,0); // 1 s
-          ACE_OS::sleep (tv1);  
+          ACE_OS::sleep (tv1);
 
           ACE_UINT32 current_wrong_messages =
             udpHandler_->getWrongMessagesCount ();
 
-          ACE_UINT32 current_message_count = 
+          ACE_UINT32 current_message_count =
             udpHandler_->getMessagesCount ();
-            
+
           // Reset expected request ID
-          udp_->reset (corba_client_name.in (),
-                       ACE_TRY_ENV);
+          udp_->reset (corba_client_name.in ()
+                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Give the reset a chance to propagate back to us
-          ACE_OS::sleep (tv);  
+          ACE_OS::sleep (tv);
 
 
           if (current_wrong_messages == 0)
@@ -106,7 +106,7 @@ UDP_PerformanceClient::svc ()
                 {
                   delta_micro_seconds /= 2;
                 }
-              
+
               if (micro_seconds >= delta_micro_seconds)
                 micro_seconds -= delta_micro_seconds;
             }
@@ -117,19 +117,19 @@ UDP_PerformanceClient::svc ()
                   if (delta_micro_seconds < ACE_INT32_MAX)
                     delta_micro_seconds *= 2;
                 }
-                
+
               if (micro_seconds < (ACE_UINT32_MAX - delta_micro_seconds))
                 micro_seconds += delta_micro_seconds;
             }
           last_wrong_messages_ = current_wrong_messages;
 
-          
+
           if (current_message_count == 0)
             {
               ACE_DEBUG ((LM_DEBUG,
                           "\nError: No callbacks received!\n\n"));
             }
-          
+
 
             {
               ACE_Time_Value tv;
@@ -145,25 +145,25 @@ UDP_PerformanceClient::svc ()
                           tv.msec (),
                           burst_messages_,
                           calls_per_second));
-	    }
-	  
+            }
+
           if (delta_micro_seconds <= final_delta_micro_seconds_
-	      && current_wrong_messages == 0)
-	    {
+              && current_wrong_messages == 0)
+            {
               break;
             }
-	}
-      
+        }
+
       // shut down remote ORB
-      udp_->shutdown (ACE_TRY_ENV);
+      udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Time_Value tv (0, 50); // 50ms 
+      ACE_Time_Value tv (0, 50); // 50ms
       ACE_OS::sleep (tv);  // let the previous request go through
 
       // Shut down local ORB, trigger the end of the ORB event loop
-	    // in the main thread.
-      orb_->shutdown (0, ACE_TRY_ENV);
+            // in the main thread.
+      orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -172,7 +172,7 @@ UDP_PerformanceClient::svc ()
       return -1;
     }
   ACE_ENDTRY;
-  
+
 
   return 0;
 }
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index 9071fa68605..409902492b7 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -29,21 +29,21 @@ UDP_i::orb (CORBA::ORB_ptr orb)
 
 
 void
-UDP_i::setResponseHandler (UDP_ptr udpHandler,
-                           CORBA::Environment &)
+UDP_i::setResponseHandler (UDP_ptr udpHandler
+                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (udpHandler))
     ACE_DEBUG ((LM_DEBUG,
-		"response handler is nil\n"));
+                "response handler is nil\n"));
 
   this->responseHandler_ = UDP::_duplicate (udpHandler);
 }
 
 void
 UDP_i::invoke (const char * client_name,
-               CORBA::Long request_id,
-               CORBA::Environment &ACE_TRY_ENV)
+               CORBA::Long request_id
+               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -79,8 +79,8 @@ UDP_i::invoke (const char * client_name,
       if (!CORBA::is_nil (responseHandler_.in ()))
         {
           responseHandler_->invoke (client_name,
-                                    request_id,
-                                    ACE_TRY_ENV);
+                                    request_id
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -95,8 +95,8 @@ UDP_i::invoke (const char * client_name,
 
 
 void
-UDP_i::reset (const char * client_name,
-              CORBA::Environment &ACE_TRY_ENV)
+UDP_i::reset (const char * client_name
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -108,8 +108,8 @@ UDP_i::reset (const char * client_name,
                                 0);
       if (!CORBA::is_nil (responseHandler_.in ()))
         {
-          responseHandler_->reset (client_name,
-                                   ACE_TRY_ENV);
+          responseHandler_->reset (client_name
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -123,8 +123,8 @@ UDP_i::reset (const char * client_name,
 
 // Shutdown.
 
-void 
-UDP_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+void
+UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -134,13 +134,13 @@ UDP_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
   ACE_TRY
     {
       // Instruct the ORB to shutdown.
-      this->orb_->shutdown (0, ACE_TRY_ENV);
+      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception: orb->run");
+                           "Caught exception: orb->run");
     }
   ACE_ENDTRY;
 }
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
index e993c6a42ac..292d4bff2bb 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
@@ -38,21 +38,21 @@ public:
   ~UDP_i (void);
   // Destructor
 
-  virtual void setResponseHandler (UDP_ptr udpHandler,
-                                   CORBA::Environment &ACE_TRY_ENV)
+  virtual void setResponseHandler (UDP_ptr udpHandler
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void invoke (const char *client_name,
-                       CORBA::Long request_id,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Long request_id
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void reset (const char * client_name,
-                      CORBA::Environment &ACE_TRY_ENV)
+  virtual void reset (const char * client_name
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index a9e59afcf02..ab85fa6cc8a 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -78,18 +78,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceClient", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "PerformanceClient" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       UDP_var udp_var =
-        UDP::_narrow (object.in (), ACE_TRY_ENV);
+        UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (udp_var.in ()))
@@ -103,7 +103,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -112,14 +112,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
@@ -129,7 +129,7 @@ main (int argc, char *argv[])
       udp_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udp_i._this (ACE_TRY_ENV);
+        udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -143,17 +143,17 @@ main (int argc, char *argv[])
       client->activate ();
 
       // ORB loop, will be shut down by our client thread
-      orb->run (ACE_TRY_ENV);  // Fetch responses
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
 
       root_poa->destroy (1, // ethernalize objects
-                         0, // wait for completion
-                                                             ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-            orb->destroy (ACE_TRY_ENV);
+            orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // it is save to delete the client, because the client was actually
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
index c7fadb8e7ab..4e5f0e63977 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
@@ -68,13 +68,13 @@ static void *svc (void *arg)
 
   ACE_TRY_NEW_ENV
     {
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception: orb->run");
+                           "Caught exception: orb->run");
     }
   ACE_ENDTRY;
   return 0;
@@ -86,11 +86,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceServer", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "PerformanceServer" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -99,11 +99,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Install a persistent POA in order to achieve a persistent IOR
@@ -112,26 +112,26 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT,
-                                         ACE_TRY_ENV);
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies,
-                             ACE_TRY_ENV);
+                             policies
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[0]->destroy (ACE_TRY_ENV);
+      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[1]->destroy (ACE_TRY_ENV);
+      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -145,17 +145,17 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("UDP_Object");
 
       persistent_poa->activate_object_with_id (id.in (),
-                                               &udp_i,
-                                               ACE_TRY_ENV);
+                                               &udp_i
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        persistent_poa->id_to_reference (id.in (),
-                                         ACE_TRY_ENV);
+        persistent_poa->id_to_reference (id.in ()
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
-      UDP_var udp_var = UDP::_narrow (obj.in (), ACE_TRY_ENV);
+      UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (udp_var.in ()))
@@ -163,7 +163,7 @@ main (int argc, char *argv[])
                     "Failed to narrow correct object reference.\n"));
 
       CORBA::String_var ior =
-        orb->object_to_string (udp_var.in (), ACE_TRY_ENV);
+        orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -181,7 +181,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (orb_threads > 1)
@@ -189,17 +189,17 @@ main (int argc, char *argv[])
                                                   svc,
                                                   orb.in ());
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
 
       root_poa->destroy (1, // ethernalize objects
-                         0, // wait for completion
-                                                             ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-            orb->destroy (ACE_TRY_ENV);
+            orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Thread_Manager::instance ()->wait ();
@@ -207,7 +207,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 5c3fe9b567a..7358ff679cb 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -68,16 +68,16 @@ int main (int argc, char *argv[])
       CORBA::ORB_var orb =
           CORBA::ORB_init (argc,
                            argv,
-                           "ORB_Test_Client",
-                           ACE_TRY_ENV);
+                           "ORB_Test_Client"
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->string_to_object (iorFile, ACE_TRY_ENV);
+        orb->string_to_object (iorFile TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -89,8 +89,8 @@ int main (int argc, char *argv[])
         }
 
       CORBA::String_var string =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -103,7 +103,7 @@ int main (int argc, char *argv[])
 
       //ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -143,7 +143,7 @@ Client::svc (void)
 
       // This sets up the connector, so that we do not incur
       // the overhead on the first call in the loop.
-      server_->sendCharSeq (charSeq, ACE_TRY_ENV);
+      server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       timer.start ();
@@ -153,10 +153,10 @@ Client::svc (void)
         {
           client_count++;
 
-          server_->sendCharSeq (charSeq, ACE_TRY_ENV);
+          server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          //server_->sendOctetSeq (octetSeq, ACE_TRY_ENV);
+          //server_->sendOctetSeq (octetSeq TAO_ENV_ARG_PARAMETER);
 
           //ACE_DEBUG ((LM_DEBUG, "."));
         }
@@ -177,7 +177,7 @@ Client::svc (void)
                   dur / this->niterations_,
                   1000000 / (dur / this->niterations_)));
 
-      server_->shutdown (ACE_TRY_ENV);
+      server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index 42b762bde3d..d8931bf0556 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -39,11 +39,11 @@ int main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "ORB_Test_Server", ACE_TRY_ENV);
+                         "ORB_Test_Server" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,26 +52,26 @@ int main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_i server_impl (orb.in ());
 
-      PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl, ACE_TRY_ENV);
+      PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in (), ACE_TRY_ENV);
+      CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Simple_Server_var server = Simple_Server::_narrow (objOne.in (), ACE_TRY_ENV);
+      Simple_Server_var server = Simple_Server::_narrow (objOne.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-              orb->object_to_string (server.in (), ACE_TRY_ENV);
+              orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -89,24 +89,24 @@ int main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index 38b8604432e..fa6a8f0d36e 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -10,7 +10,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Server_i::sendCharSeq (const Char_Seq &, CORBA::Environment&)
+Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
@@ -18,7 +18,7 @@ Simple_Server_i::sendCharSeq (const Char_Seq &, CORBA::Environment&)
 }
 
 void
-Simple_Server_i::sendOctetSeq (const Octet_Seq &, CORBA::Environment&)
+Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
@@ -26,8 +26,8 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq &, CORBA::Environment&)
 }
 
 CORBA::Long
-Simple_Server_i::get_number (CORBA::Long, 
-                             CORBA::Environment&)
+Simple_Server_i::get_number (CORBA::Long
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long tmp = Simple_Server_count;
@@ -36,20 +36,20 @@ Simple_Server_i::get_number (CORBA::Long,
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Simple_Server_i::shutdown\n"));
   ACE_TRY
     {
-      this->orb_->shutdown (0, ACE_TRY_ENV);
+      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
     }
   ACE_ENDTRY;
 }
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
index 0b4513e1572..fe54f70163b 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
@@ -31,18 +31,18 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void sendCharSeq (const Char_Seq & charSeq, CORBA::Environment&)
+  void sendCharSeq (const Char_Seq & charSeq TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void sendOctetSeq (const Octet_Seq & octetSeq, CORBA::Environment&)
+  void sendOctetSeq (const Octet_Seq & octetSeq TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-    
-  CORBA::Long get_number (CORBA::Long num, CORBA::Environment&)
+
+  CORBA::Long get_number (CORBA::Long num TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index eb31f25435a..726b8a5b163 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -35,7 +35,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
       factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder");
       if (this->quoterNamingContext_var_.ptr () != 0)
-        this->quoterNamingContext_var_->unbind (factory_Finder_Name, ACE_TRY_ENV);
+        this->quoterNamingContext_var_->unbind (factory_Finder_Name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -48,8 +48,8 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
 
 int
 Quoter_Factory_Finder_Server::init (int argc,
-                                    char *argv[],
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    char *argv[]
+                                    TAO_ENV_ARG_DECL)
 {
   const char *exception_message = "Null Message";
 
@@ -57,8 +57,8 @@ Quoter_Factory_Finder_Server::init (int argc,
     {
       exception_message = "While ORB_Manager::init";
       if (this->orb_manager_.init (argc,
-                                   argv,
-                                   ACE_TRY_ENV) == -1)
+                                   argv
+                                   TAO_ENV_ARG_PARAMETER) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "init"),
@@ -67,7 +67,7 @@ Quoter_Factory_Finder_Server::init (int argc,
 
       // Activate the POA manager
       exception_message = "While activating the POA manager";
-      int result = this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      int result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -87,8 +87,8 @@ Quoter_Factory_Finder_Server::init (int argc,
       // Activate the object.
       exception_message = "Failure while activating the Quoter Factory Finder Impl";
       CORBA::String_var str  =
-        this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_,
-                                     ACE_TRY_ENV);
+        this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the IOR.
@@ -102,7 +102,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       // Get the Naming Service object reference.
       exception_message = "While resolving the Name Service";
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -112,8 +112,8 @@ Quoter_Factory_Finder_Server::init (int argc,
       // Narrow the object reference to a Naming Context.
       exception_message = "While narrowing the Naming Context";
       CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (namingObj_var.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IDL_Quoter naming context.
@@ -123,13 +123,13 @@ Quoter_Factory_Finder_Server::init (int argc,
 
       exception_message = "While resolving the Quoter Naming Context";
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName, ACE_TRY_ENV);
+        namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While narrowing the Quoter Naming Context";
       quoterNamingContext_var_ =
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -143,13 +143,13 @@ Quoter_Factory_Finder_Server::init (int argc,
       quoter_Factory_Finder_Name_[0].id = CORBA::string_dup ("Quoter_Factory_Finder");
 
       exception_message = "Factory_Factory::_this";
-      CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(ACE_TRY_ENV);
+      CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While binding the Factory Finder";
       quoterNamingContext_var_->bind (quoter_Factory_Finder_Name_,
-                                      ff_obj.in (),
-                                      ACE_TRY_ENV);
+                                      ff_obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -168,13 +168,13 @@ Quoter_Factory_Finder_Server::init (int argc,
 }
 
 int
-Quoter_Factory_Finder_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Quoter_Factory_Finder_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Factory_Finder_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_TRY_ENV);
+  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -223,14 +223,14 @@ main (int argc, char *argv [])
 
   ACE_TRY_NEW_ENV
     {
-      int result = quoter_Factory_Finder_Server.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK; 
+      int result = quoter_Factory_Finder_Server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
       if (result == -1)
         return 1;
       else
         {
-          quoter_Factory_Finder_Server.run (ACE_TRY_ENV);
+          quoter_Factory_Finder_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 97c46b0b1f0..44844e12947 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -37,10 +37,10 @@ public:
   ~Quoter_Factory_Finder_Server (void);
   // Destructor
 
-  int init (int argc, char *argv[], CORBA::Environment& env);
+  int init (int argc, char *argv[] TAO_ENV_ARG_DECL);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
   u_int parse_args (void);
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 08544d72b94..023e2ec6c8d 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -37,8 +37,8 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
 
 
 CosLifeCycle::Factories *
-Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key,
-                                         CORBA::Environment &ACE_TRY_ENV)
+Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
+                                         TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory))
 {
@@ -54,7 +54,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key,
     // Get the Naming Service object reference.
     exception_message = "While resolving the Name Service";
     CORBA::Object_var namingObj_var =
-      orb_ptr->resolve_initial_references ("NameService", ACE_TRY_ENV);
+      orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (namingObj_var.in ()))
@@ -64,8 +64,8 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key,
     // Narrow the object reference to a Naming Context.
     exception_message = "While narrowing the Naming Context";
     CosNaming::NamingContext_var namingContext_var =
-      CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                         ACE_TRY_ENV);
+      CosNaming::NamingContext::_narrow (namingObj_var.in ()
+                                         TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Take the key supplied to search for a Quoter Factory
@@ -74,7 +74,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key,
     // Try to get a reference to a Quoter Factory
     exception_message = "While resolving the Factory Object";
     CORBA::Object_var quoterFactoryObject_var =
-      namingContext_var->resolve (factoryName, ACE_TRY_ENV);
+      namingContext_var->resolve (factoryName TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Check if it is a valid Quoter Factory reference
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index 81bf7dad2c1..8d7beeea56c 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -28,11 +28,11 @@ public:
   Quoter_Factory_Finder_i (int debug_level = 1);
   ~Quoter_Factory_Finder_i (void);
 
-  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key,
-                                                    CORBA::Environment &_tao_environment)
+  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key
+                                                    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory));
-  // Returns a squence of Factories if factories matching the
+  // Returns a sequence of Factories if factories matching the
   // factory_key were found. If no factory was found, then the
   // NoFactory exception, defined in CosLifeCycle, is raised.
 
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index d2fdbe0b8c6..735a6968beb 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -35,7 +35,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
       generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
       if (this->quoterNamingContext_var_.ptr () != 0)
-        this->quoterNamingContext_var_->unbind (generic_Factory_Name,ACE_TRY_ENV);
+        this->quoterNamingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -51,8 +51,8 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
 
 int
 Quoter_Generic_Factory_Server::init (int argc,
-                                     char *argv[],
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     char *argv[]
+                                     TAO_ENV_ARG_DECL)
 {
   const char *exception_message = "Null Message";
 
@@ -61,7 +61,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       int result = 0;
       // Initialize the ORB Manager
       exception_message = "While initing the orb_manager";
-      result = this->orb_manager_.init (argc, argv, ACE_TRY_ENV);
+      result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -69,7 +69,7 @@ Quoter_Generic_Factory_Server::init (int argc,
 
       // Activate the POA manager
       exception_message = "While activating the POA manager";
-      result = this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -87,8 +87,8 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Activate the object.
       exception_message = "While activating the Generic Factory";
       CORBA::String_var str  =
-        this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_,
-                                     ACE_TRY_ENV);
+        this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the IOR.
@@ -103,7 +103,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Get the Naming Service object reference.
       exception_message = "While getting the Naming Service Reference";
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -113,8 +113,8 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Narrow the object reference to a Naming Context.
       exception_message = "While narrowing the Naming Context";
       CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (namingObj_var.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingContext_var.in ()))
@@ -133,14 +133,14 @@ Quoter_Generic_Factory_Server::init (int argc,
 
       exception_message = "While resolving the Quoter";
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName,
-                                    ACE_TRY_ENV);
+        namingContext_var->resolve (quoterContextName
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While narrowing the Quoter";
       quoterNamingContext_var_ =
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -154,13 +154,13 @@ Quoter_Generic_Factory_Server::init (int argc,
       quoter_Generic_Factory_Name[0].id = CORBA::string_dup ("Quoter_Generic_Factory");
 
       exception_message = "Generic_Factory::_this";
-      CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(ACE_TRY_ENV);
+      CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While binding the Generic Factory";
       quoterNamingContext_var_->bind (quoter_Generic_Factory_Name,
-                                      gf_obj.in (),
-                                      ACE_TRY_ENV);
+                                      gf_obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -180,29 +180,29 @@ Quoter_Generic_Factory_Server::init (int argc,
 
         exception_message = "While resolving the Life Cycle Service";
         CORBA::Object_var life_Cycle_Service_Obj_var =
-          namingContext_var->resolve (life_Cycle_Service_Name,
-                                      ACE_TRY_ENV);
+          namingContext_var->resolve (life_Cycle_Service_Name
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         exception_message = "While narrowing the Life Cycle Service";
         LifeCycleService::Life_Cycle_Service_var  life_Cycle_Service_var =
-          LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in (),
-                                                         ACE_TRY_ENV);
+          LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (this->debug_level_ >= 2)
           ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Have a proper reference to Life Cycle Service.\n"));
 
         exception_message = "While _this on Generic Factory";
-        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(ACE_TRY_ENV);
+        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         exception_message = "While registering the generic factory";
         life_Cycle_Service_var->register_factory ("Quoter_Generic_Factory",  // name
                                                   "Bryan 503",               // location
                                                   "Generic Factory",         // description
-                                                  object_var.in (),
-                                                  ACE_TRY_ENV);
+                                                  object_var.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (this->debug_level_ >= 2)
@@ -224,13 +224,13 @@ Quoter_Generic_Factory_Server::init (int argc,
 }
 
 int
-Quoter_Generic_Factory_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Quoter_Generic_Factory_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Generic_Factory_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_TRY_ENV);
+  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -283,12 +283,12 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       if (quoter_Generic_Factory_Server.init (argc,
-                                              argv,
-                                              ACE_TRY_ENV) == -1)
+                                              argv
+                                              TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          quoter_Generic_Factory_Server.run (ACE_TRY_ENV);
+          quoter_Generic_Factory_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 61ca9cbce73..0c1de6c0cd5 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -38,11 +38,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment& env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   u_int parse_args (void);
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index 59851056278..d22e7ee8e87 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -33,8 +33,8 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
 }
 
 CORBA::Boolean
-Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &,
-                                    CORBA::Environment &)
+Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &
+                                    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -43,8 +43,8 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &,
 
 
 CosNaming::NamingContext_ptr
-Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key,
-                                              CORBA::Environment &ACE_TRY_ENV)
+Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key
+                                              TAO_ENV_ARG_DECL)
 {
   CosNaming::NamingContext_var quoterNamingContext_var;
   ACE_TRY
@@ -55,7 +55,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_ptr->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -64,8 +64,8 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Narrow the object reference to a Naming Context.
       CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (namingObj_var.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name quoterContextName (1);  // max = 1
@@ -74,12 +74,12 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Get the IDL_Quoter naming context.
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName, ACE_TRY_ENV);
+        namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       quoterNamingContext_var =
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -95,8 +95,8 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
 CORBA::Object_ptr
 Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
-                                         const CosLifeCycle::Criteria &,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                         const CosLifeCycle::Criteria &
+                                         TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -106,8 +106,8 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
   ACE_TRY
     {
       CosNaming::NamingContext_var quoterNamingContext_var =
-        this->get_naming_context (factory_key,
-                                  ACE_TRY_ENV);
+        this->get_naming_context (factory_key
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ** now a proper reference to the quoter naming context is
@@ -119,7 +119,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
 
       // Try to get a reference to a Quoter Factory
       CORBA::Object_var quoterFactoryObject_var =
-        quoterNamingContext_var->resolve (factory_Name, ACE_TRY_ENV);
+        quoterNamingContext_var->resolve (factory_Name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We were able to get a reference to Quoter Factory.
@@ -130,8 +130,8 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
         }
 
       Stock::Quoter_Factory_var factory_var =
-        Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in (),
-                                        ACE_TRY_ENV);
+        Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory_var.in ()))
@@ -146,8 +146,8 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
 
       // Now retrieve the Quoter obj ref corresponding to the key.
       quoter_var =
-        factory_var->create_quoter ("test",
-                                    ACE_TRY_ENV);
+        factory_var->create_quoter ("test"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ > 1)
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index f9066ee3a9e..e0477100101 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -29,15 +29,15 @@ public:
   Quoter_Generic_Factory_i (int debug_level = 1);
   ~Quoter_Generic_Factory_i (void);
 
-  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key,
-                           CORBA::Environment &_env_there)
+  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key
+                           TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
-                                   const CosLifeCycle::Criteria &the_criteria,
-                                   CORBA::Environment &_env_there)
+                                   const CosLifeCycle::Criteria &the_criteria
+                                   TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -47,8 +47,8 @@ public:
   // request to a more concrete Factory.
 
 private:
-  CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key,
-                                                   CORBA::Environment &);
+  CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key
+                                                   TAO_ENV_ARG_DECL_NOT_USED);
   // a helper to get the proper naming context.
 
   int debug_level_;
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 388116bfee3..d24ba43056e 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -45,7 +45,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 
 // Initialize everything in the factory
 
-int Quoter_Factory_i::init (CORBA::Environment &ACE_TRY_ENV)
+int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_RETURN (this->my_quoters_,
                   Quoter_i *[this->quoter_num_],
@@ -62,18 +62,18 @@ int Quoter_Factory_i::init (CORBA::Environment &ACE_TRY_ENV)
       const char *location_string = "POA::activate";
       ACE_TRY
         {
-          this->poa_ptr_->activate_object (this->my_quoters_[i], ACE_TRY_ENV);
+          this->poa_ptr_->activate_object (this->my_quoters_[i] TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           location_string = "_this";
-          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_TRY_ENV);
+          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           location_string = "CORBA::ORB::object_to_string";
           // Stringify the object reference and print it out.
           CORBA::String_var quoter_ior =
-            TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in (),
-                                                              ACE_TRY_ENV);
+            TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in ()
+                                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -92,8 +92,8 @@ int Quoter_Factory_i::init (CORBA::Environment &ACE_TRY_ENV)
 // Return the quoter by the id <name>.
 
 Stock::Quoter_ptr
-Quoter_Factory_i::create_quoter (const char *,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Quoter_Factory_i::create_quoter (const char *
+                                 TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Quoter))
 {
@@ -102,7 +102,7 @@ Quoter_Factory_i::create_quoter (const char *,
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_));
 
-  return my_quoters_[this->next_quoter_]->_this (ACE_TRY_ENV);
+  return my_quoters_[this->next_quoter_]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
@@ -130,8 +130,8 @@ Quoter_i::~Quoter_i (void)
 // For now, just return 42.  It was a good day on Wall Street.
 
 CORBA::Long
-Quoter_i::get_quote (char const *,
-                     class CORBA_Environment &)
+Quoter_i::get_quote (char const *
+                     TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Stock,
                        Stock::Invalid_Quoter))
@@ -144,8 +144,8 @@ Quoter_i::get_quote (char const *,
 
 CosLifeCycle::LifeCycleObject_ptr
 Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
-                const CosLifeCycle::Criteria &/*the_criteria*/,
-                CORBA::Environment &ACE_TRY_ENV)
+                const CosLifeCycle::Criteria &/*the_criteria*/
+                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotCopyable,
@@ -177,7 +177,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
       // Find an appropriate factory over there.
       exception_message = "While trying to find a factory.\n";
       CosLifeCycle::Factories *factories_ptr =
-        there->find_factories (factoryKey, ACE_TRY_ENV);
+        there->find_factories (factoryKey TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now it is known that there is at least one factory.
@@ -191,8 +191,8 @@ CosLifeCycle::LifeCycleObject::_nil ();
         // Narrow it to a Quoter Factory.
         exception_message = "While narrowing.\n";
         CosLifeCycle::GenericFactory_var generic_Factory_var =
-          CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr,
-                                                 ACE_TRY_ENV);
+          CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr
+                                                 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (generic_Factory_var.in ()))
@@ -214,12 +214,12 @@ CosLifeCycle::LifeCycleObject::_nil ();
           exception_message = "While creating an object";
           CORBA::Object_var quoterObject_var =
             generic_Factory_var->create_object (genericFactoryName,
-                                                criteria,
-                                                ACE_TRY_ENV);
+                                                criteria
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           exception_message = "While narrowing object";
-          quoter_var = Stock::Quoter::_narrow (quoterObject_var.in(), ACE_TRY_ENV);
+          quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (quoter_var.in ()))
@@ -271,8 +271,8 @@ CosLifeCycle::LifeCycleObject::_nil ();
 
 void
 Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
-                const CosLifeCycle::Criteria & /* the_criteria */,
-                CORBA::Environment &ACE_TRY_ENV)
+                const CosLifeCycle::Criteria & /* the_criteria */
+                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotMovable,
@@ -289,7 +289,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (CORBA::Environment &)
+Quoter_i::remove (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NotRemovable))
 {
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index 79b642a1204..6408ad5f0bc 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -43,8 +43,8 @@ public:
   ~Quoter_i (void);
   // Destructor
 
-  virtual CORBA::Long get_quote (const char *stock_name,
-                                 CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::Long get_quote (const char *stock_name
+                                 TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Stock,
                        Stock::Invalid_Quoter));
@@ -53,8 +53,8 @@ public:
   // = Lifecycle methods
 
   virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there,
-                                                  const CosLifeCycle::Criteria &the_criteria,
-                                                  CORBA::Environment &_tao_environment)
+                                                  const CosLifeCycle::Criteria &the_criteria
+                                                  TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotCopyable,
@@ -63,8 +63,8 @@ public:
   // Make a copy of this object
 
   virtual void move (CosLifeCycle::FactoryFinder_ptr there,
-                     const CosLifeCycle::Criteria &the_criteria,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     const CosLifeCycle::Criteria &the_criteria
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotMovable,
@@ -72,7 +72,7 @@ public:
                        CosLifeCycle::CannotMeetCriteria));
   // Move this object using <there>
 
-  virtual void remove (CORBA::Environment &ACE_TRY_ENV)
+  virtual void remove (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NotRemovable));
   // Removes the object.
@@ -105,11 +105,11 @@ public:
   ~Quoter_Factory_i (void);
   // Destructor.
 
-  int init (CORBA::Environment &ACE_TRY_ENV);
+  int init (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize everything in the factory
 
-  virtual Stock::Quoter_ptr create_quoter (const char *name,
-                                           CORBA::Environment &ACE_TRY_ENV)
+  virtual Stock::Quoter_ptr create_quoter (const char *name
+                                           TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Quoter));
   // Return the quoter by the id <name>.
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 8f369d7c6b3..34773dd301c 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -89,7 +89,7 @@ Quoter_Client::run (void)
   ACE_TRY_NEW_ENV
     {
       exception_message = "While using get_quote ()";
-      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware", ACE_TRY_ENV);
+      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 1)
@@ -101,8 +101,8 @@ Quoter_Client::run (void)
       exception_message = "While copying the quoter";
       CORBA::Object_var quoterObj_var =
         this->quoter_var_->copy (factory_Finder_var_.in (),
-                                 criteria,
-                                 ACE_TRY_ENV);
+                                 criteria
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (quoterObj_var.in()))
@@ -113,8 +113,8 @@ Quoter_Client::run (void)
       // Narrow it to the actual Quoter interface
       exception_message = "While narrowing the quoter";
       Stock::Quoter_var copied_quoter_var =
-        Stock::Quoter::_narrow (quoterObj_var.in (),
-                                ACE_TRY_ENV);
+        Stock::Quoter::_narrow (quoterObj_var.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (copied_quoter_var.in()))
@@ -126,7 +126,7 @@ Quoter_Client::run (void)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object.\n"));
 
       exception_message = "While using get_quote () on copied object";
-      q = copied_quoter_var->get_quote ("ACE Hardware", ACE_TRY_ENV);
+      q = copied_quoter_var->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 1)
@@ -163,7 +163,7 @@ Quoter_Client::init_naming_service (void)
     {
       // Resolve the Naming Service
       CORBA::Object_var naming_obj =
-        orb_->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -173,7 +173,7 @@ Quoter_Client::init_naming_service (void)
 
       exception_message = "While narrowing the naming context";
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -189,8 +189,8 @@ Quoter_Client::init_naming_service (void)
 
       exception_message = "While resolving the factory finder";
       CORBA::Object_var factory_obj =
-        naming_context->resolve (quoterFactoryFinderName,
-                                 ACE_TRY_ENV);
+        naming_context->resolve (quoterFactoryFinderName
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -198,8 +198,8 @@ Quoter_Client::init_naming_service (void)
 
       exception_message = "While narrowing the factory finder";
       factory_Finder_var_ =
-        Stock::Quoter_Factory_Finder::_narrow (factory_obj.in (),
-                                               ACE_TRY_ENV);
+        Stock::Quoter_Factory_Finder::_narrow (factory_obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory_Finder_var_.in ()))
@@ -233,7 +233,7 @@ Quoter_Client::init_naming_service (void)
       // Find an appropriate factory over there.
       exception_message = "While finding factories";
       CosLifeCycle::Factories *factories_ptr =
-          factory_Finder_var_->find_factories (factoryName, ACE_TRY_ENV);
+          factory_Finder_var_->find_factories (factoryName TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (factories_ptr == 0)
@@ -251,8 +251,8 @@ Quoter_Client::init_naming_service (void)
       if (factories_ptr->length () >= 1)
         {
           // everything is ok, at least one factory is there
-          CosLifeCycle::Factory_ptr factory = (*factories_ptr)[0]; 
-          quoter_FactoryObj_var = factory; 
+          CosLifeCycle::Factory_ptr factory = (*factories_ptr)[0];
+          quoter_FactoryObj_var = factory;
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -262,8 +262,8 @@ Quoter_Client::init_naming_service (void)
       // Narrow it to a Quoter Generic Factory
       exception_message = "While narrowing the factory";
       generic_Factory_var_ =
-        CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in (),
-                                               ACE_TRY_ENV);
+        CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->generic_Factory_var_.in ()))
@@ -307,8 +307,8 @@ Quoter_Client::init (int argc, char **argv)
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -337,11 +337,11 @@ Quoter_Client::init (int argc, char **argv)
 
       CORBA::Object_var quoterObject_var =
         this->generic_Factory_var_->create_object (genericFactoryName,
-                                                   criteria,
-                                                   ACE_TRY_ENV);
+                                                   criteria
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in(), ACE_TRY_ENV);
+      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index fe6c3545344..8c49f7f9a53 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -61,14 +61,14 @@ Quoter_Server::parse_args (void)
 
 int
 Quoter_Server::init (int argc,
-                    char* argv[],
-                    CORBA::Environment &ACE_TRY_ENV)
+                    char* argv[]
+                    TAO_ENV_ARG_DECL)
 {
   const char *exception_message = "Null Message";
   ACE_TRY
     {
       exception_message = "While ORB Manager init";
-      int result = this->orb_manager_.init (argc, argv, ACE_TRY_ENV);
+      int result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -91,19 +91,19 @@ Quoter_Server::init (int argc,
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        this->orb_manager_.orb()->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        this->orb_manager_.orb()->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       exception_message = "While narrowing the root pos";
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       exception_message = "While getting the POA Manager";
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (quoter_Factory_i_ptr_,
@@ -112,7 +112,7 @@ Quoter_Server::init (int argc,
                       0);
 
       exception_message = "While initing the quoter factory";
-      quoter_Factory_i_ptr_->init (ACE_TRY_ENV);
+      quoter_Factory_i_ptr_->init (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var quoter_Factory_oid =
@@ -120,23 +120,23 @@ Quoter_Server::init (int argc,
 
       exception_message = "While activating quoter factory";
       root_poa->activate_object_with_id (quoter_Factory_oid.in (),
-                                         quoter_Factory_i_ptr_,
-                                         ACE_TRY_ENV);
+                                         quoter_Factory_i_ptr_
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object reference for first_foo_impl object.
       exception_message = "While quoter_Factor::_this";
-      Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_TRY_ENV);
+      Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringify the object reference and print it out.
       exception_message = "While object_to_string";
       CORBA::String_var quoter_Factory_ior =
-        this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in (), ACE_TRY_ENV);
+        this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While activating the POA Manager";
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the IOR.
@@ -151,7 +151,7 @@ Quoter_Server::init (int argc,
     }
   ACE_ENDTRY;
 
-  return this->init_naming_service (ACE_TRY_ENV);
+  return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
@@ -159,7 +159,7 @@ Quoter_Server::init (int argc,
 // and Quoter_factory object.
 
 int
-Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   const char *exception_message = "Null Message";
   ACE_TRY
@@ -167,7 +167,7 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
       CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb();
 
       CORBA::Object_var naming_obj =
-        orb_ptr->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -177,7 +177,7 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
       exception_message = "While narrowing naming context";
       namingContext_var_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name quoterContextName (1);
@@ -186,7 +186,7 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 
       exception_message = "While binding a new context";
       CosNaming::NamingContext_var quoterNameContext =
-        namingContext_var_->bind_new_context (quoterContextName, ACE_TRY_ENV);
+        namingContext_var_->bind_new_context (quoterContextName TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Register the quoter_factory name with the IDL_quoter Naming
@@ -196,13 +196,13 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
       quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory");
 
       exception_message = "While using factory _this";
-      Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (ACE_TRY_ENV);
+      Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While binding factory";
       quoterNameContext->bind (quoterFactoryContextName,
-                               quoter_factory_var.in (),
-                               ACE_TRY_ENV);
+                               quoter_factory_var.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -217,13 +217,13 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Quoter_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Quoter_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_TRY_ENV);
+  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -239,12 +239,12 @@ Quoter_Server::~Quoter_Server (void)
       factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_name[1].id = CORBA::string_dup ("Quoter_Factory");
       if (this->namingContext_var_.ptr () != 0)
-        this->namingContext_var_->unbind (factory_name, ACE_TRY_ENV);
+        this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       factory_name.length (1);
       if (this->namingContext_var_.ptr () != 0)
-        this->namingContext_var_->unbind (factory_name, ACE_TRY_ENV);
+        this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -265,13 +265,13 @@ main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      int result = quoter_server.init (argc, argv, ACE_TRY_ENV);
+      int result = quoter_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
         return 1;
 
-      quoter_server.run (ACE_TRY_ENV);
+      quoter_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index b9ed6395ce5..b3b238981b0 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -52,17 +52,17 @@ public:
   ~Quoter_Server (void);
   // Destructor
 
-  int init (int argc, char *argv[], CORBA::Environment& env);
+  int init (int argc, char *argv[] TAO_ENV_ARG_DECL);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (CORBA::Environment &env);
+  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Initializes the name server and registers cubit factory with the
   // name server.
 
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 6bf017d1cfe..f35e7f21db3 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -86,25 +86,25 @@ Server<Servant>::test_for_ins (CORBA::String_var ior)
                 this->ins_,
                 ior.in ()));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("IORTable"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (),
-                                  ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
         }
 
-      adapter->bind (this->ins_, ior.in (), ACE_TRY_ENV);
+      adapter->bind (this->ins_, ior.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -119,15 +119,15 @@ Server<Servant>::test_for_ins (CORBA::String_var ior)
 template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
-                       char *argv[],
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char *argv[]
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -170,8 +170,8 @@ Server<Servant>::init (const char *servant_name,
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_,
-                                                     ACE_TRY_ENV);
+                                                     &this->servant_
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -204,10 +204,10 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (CORBA::Environment &env)
+Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -229,20 +229,20 @@ Server<Servant>::register_name (void)
   bindName.length (1);
   bindName[0].id = CORBA::string_dup (name);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // (re)Bind the object.
   ACE_TRY
     {
-      CORBA::Object_var object = servant_._this (ACE_TRY_ENV);
+      CORBA::Object_var object = servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       naming_server_->rebind (bindName,
-                              object.in(),
-                              ACE_TRY_ENV);
+                              object.in()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test for INS.
@@ -374,15 +374,15 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -392,7 +392,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_, ACE_TRY_ENV);
+            this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -401,8 +401,8 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
                                "invalid ior <%s>\n",
                                this->ior_),
                               -1);
-          this->server_ = INTERFACE_OBJECT::_narrow (server_object.in (),
-                                                 ACE_TRY_ENV);
+          this->server_ = INTERFACE_OBJECT::_narrow (server_object.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (this->naming_ == 1)
@@ -411,7 +411,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
           ACE_DEBUG((LM_DEBUG,
                      "Using the Naming Service \n"));
           this->name_ = ACE_const_cast (char *, name);
-          int retv = this->obtain_initial_references (ACE_TRY_ENV);
+          int retv = this->obtain_initial_references (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (retv ==-1)
             return -1;
@@ -436,7 +436,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
 
 
 template <class INTERFACE_OBJECT, class Var> int
-Client<INTERFACE_OBJECT, Var>::obtain_initial_references (CORBA::Environment &ACE_TRY_ENV)
+Client<INTERFACE_OBJECT, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY
@@ -454,12 +454,12 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (CORBA::Environment &AC
       server_name[0].id =
       CORBA::string_dup (this->name_);
       CORBA::Object_var obj =
-        naming_client_->resolve (server_name,
-                                ACE_TRY_ENV);
+        naming_client_->resolve (server_name
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->server_ = INTERFACE_OBJECT::_narrow (obj.in (),
-                                             ACE_TRY_ENV);
+      this->server_ = INTERFACE_OBJECT::_narrow (obj.in ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 45faa61e3fb..83c3431521a 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -47,8 +47,8 @@ public:
 
   int init (const char *servant_name,
             int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -56,7 +56,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   int test_for_ins (CORBA::String_var ior);
@@ -127,7 +127,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (CORBA::Environment &);
+  int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize naming service
 
 protected:
@@ -155,9 +155,6 @@ protected:
   char *name_;
   // Name to be usred for the naming service
 
-  CORBA::Environment env_;
-  // Environment variable.
-
   Var server_;
   // Server object
 
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index d8164c3a611..02be9d03647 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -50,8 +50,8 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager)
 
 Bank::Account_ptr
 AccountManager_i::open (const char *name,
-                        CORBA::Float initial_balance,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Float initial_balance
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Account_i *result = 0;
@@ -98,14 +98,14 @@ AccountManager_i::open (const char *name,
 // Shutdown.
 
 void
-AccountManager_i::close (Bank::Account_ptr account,
-                         CORBA::Environment &ACE_TRY_ENV)
+AccountManager_i::close (Bank::Account_ptr account
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       CORBA::String_var name =
-        CORBA::string_dup (account->name (ACE_TRY_ENV));
+        CORBA::string_dup (account->name (TAO_ENV_SINGLE_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -130,7 +130,7 @@ AccountManager_i::close (Bank::Account_ptr account,
 }
 
 void
-AccountManager_i::shutdown (CORBA::Environment &)
+AccountManager_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index 4548856102a..d3883ae9036 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -54,18 +54,18 @@ public:
   // Destructor.
 
   virtual Bank::Account_ptr open (const char *name,
-                                  CORBA::Float initial_balance,
-                                  CORBA::Environment &_env)
+                                  CORBA::Float initial_balance
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the Account interface with the given name from the server.
   // Put the initial balance specified in the new account.
 
-  virtual void close (Bank::Account_ptr,
-                      CORBA::Environment &env)
+  virtual void close (Bank::Account_ptr
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Close the given account.
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index e889fea0c2c..5e04b7c3b67 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -12,7 +12,7 @@ Account_i::Account_i (void)
 }
 
 Account_i::Account_i (const char *name,
-		      CORBA::Float balance)
+                      CORBA::Float balance)
 
   : balance_ (balance),
     name_ (CORBA::string_dup (name))
@@ -37,23 +37,23 @@ Account_i::orb (CORBA::ORB_ptr o)
 // Return the current balance on the server.
 
 CORBA::Float
-Account_i::balance (CORBA::Environment &)
+Account_i::balance (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return balance_;
 }
 
 void
-Account_i::deposit (CORBA::Float deposit,
-		    CORBA::Environment &)
+Account_i::deposit (CORBA::Float deposit
+                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   balance_ += deposit;
 }
 
 void
-Account_i::withdraw (CORBA::Float withdrawl,
-		     CORBA::Environment &ACE_TRY_ENV)
+Account_i::withdraw (CORBA::Float withdrawl
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Bank::Account::Overdraft))
 {
@@ -64,15 +64,15 @@ Account_i::withdraw (CORBA::Float withdrawl,
 }
 
 char *
-Account_i::name (CORBA::Environment &)
+Account_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
-Account_i::name (const char *name,
-		 CORBA::Environment &)
+Account_i::name (const char *name
+                 TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (name);
diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h
index 915b7312d45..6108e950ffc 100644
--- a/TAO/examples/Simple/bank/Account_i.h
+++ b/TAO/examples/Simple/bank/Account_i.h
@@ -42,27 +42,27 @@ public:
   ~Account_i (void);
   // Destructor.
 
-  virtual CORBA::Float balance (CORBA::Environment &env)
+  virtual CORBA::Float balance (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Get the current balance in the account.
 
-  virtual char *name (CORBA::Environment &env)
+  virtual char *name (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the name of the <Account> holder.
 
-  virtual void name (const char *name,
-                     CORBA::Environment &env)
+  virtual void name (const char *name
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the name of the <Account> holder.
 
-  virtual void deposit (CORBA::Float,
-                        CORBA::Environment &env)
+  virtual void deposit (CORBA::Float
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit money in the account.
 
-  virtual void withdraw (CORBA::Float,
-                         CORBA::Environment &env)
+  virtual void withdraw (CORBA::Float
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Bank::Account::Overdraft));
   // Withdraw money in the account.
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
index a26d169690c..fa5c5974368 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp
@@ -32,7 +32,7 @@ Bank_Client_i::run (const char *name,
     {
       this->check_accounts ();
       if (client.shutdown () == 1)
-        client->shutdown (ACE_TRY_ENV);
+        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -52,17 +52,17 @@ Bank_Client_i::check_accounts (void )
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for account with same name\n"));
-      this->test_for_same_name (ACE_TRY_ENV);
+      this->test_for_same_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for account with different names\n"));
-      this->test_for_different_name (ACE_TRY_ENV);
+      this->test_for_different_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for overdrafts\n"));
-      this->test_for_overdraft (ACE_TRY_ENV);
+      this->test_for_overdraft (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -78,33 +78,33 @@ Bank_Client_i::check_accounts (void )
 // a same name can be opened
 
 void
-Bank_Client_i::test_for_same_name (CORBA::Environment &ACE_TRY_ENV)
+Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   const char *name = "Name";
   CORBA::Float initial_bal = 0.00;
 
   Bank::Account_var acct_id1 = client->open (name,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
+                                             initial_bal
+                                             TAO_ENV_ARG_PARAMETER);
 
   Bank::Account_var acct_id2 = client->open (name,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
+                                             initial_bal
+                                             TAO_ENV_ARG_PARAMETER);
 
   ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *) acct_id2.in ()) != 0);
 
-  client->close (acct_id1.in (),
-                 ACE_TRY_ENV);
+  client->close (acct_id1.in ()
+                 TAO_ENV_ARG_PARAMETER);
 
-  client->close (acct_id2.in (),
-                 ACE_TRY_ENV);
+  client->close (acct_id2.in ()
+                 TAO_ENV_ARG_PARAMETER);
 }
 
 // This method tests whether an account with different names can be opened
 
 void
-Bank_Client_i::test_for_different_name (CORBA::Environment &ACE_TRY_ENV)
+Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL)
 {
   const char *name1 = "Name1";
   const char *name2 = "Name2";
@@ -112,40 +112,40 @@ Bank_Client_i::test_for_different_name (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Float initial_bal = 0.0;
 
   Bank::Account_var acct_id1 = client->open (name1,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
+                                             initial_bal
+                                             TAO_ENV_ARG_PARAMETER);
 
   Bank::Account_var acct_id2 = client->open (name2,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
+                                             initial_bal
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *)acct_id2.in ()) == 0);
 
-  client->close (acct_id1.in (),
-                 ACE_TRY_ENV);
+  client->close (acct_id1.in ()
+                 TAO_ENV_ARG_PARAMETER);
 
-  client->close (acct_id2.in (),
-                 ACE_TRY_ENV);
+  client->close (acct_id2.in ()
+                 TAO_ENV_ARG_PARAMETER);
 }
 
 // This method tests the Overdraft exception.
 
 void
-Bank_Client_i::test_for_overdraft (CORBA::Environment &ACE_TRY_ENV)
+Bank_Client_i::test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   CORBA::Float initial_bal = 100.0;
   const char *name = "Name";
-  Bank::Account_var acct_id = client->open (name, initial_bal, ACE_TRY_ENV);
+  Bank::Account_var acct_id = client->open (name, initial_bal TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  acct_id->deposit (100.00, ACE_TRY_ENV);
+  acct_id->deposit (100.00 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
-  CORBA::Float bal = acct_id->balance (ACE_TRY_ENV);
+
+  CORBA::Float bal = acct_id->balance (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   acct_id->withdraw (bal + 20);
 
-  client->close (acct_id.in (), ACE_TRY_ENV);
+  client->close (acct_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index 3918c242fb7..cc28654f821 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -16,12 +16,12 @@ main (int argc, char *argv[])
     {
       if (server.init ("Bank",
                        argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp
index 5b36c2067c0..9a3a71e375e 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.cpp
+++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp
@@ -42,8 +42,8 @@ Broadcaster_i::~Broadcaster_i (void)
 
 void
 Broadcaster_i::add (Receiver_ptr receiver,
-                    const char *nickname,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const char *nickname
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
@@ -67,8 +67,8 @@ Broadcaster_i::add (Receiver_ptr receiver,
 
   ACE_TRY
     {
-      this->broadcast (broadcast_string.fast_rep (),
-		       ACE_TRY_ENV);
+      this->broadcast (broadcast_string.fast_rep ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -81,8 +81,8 @@ Broadcaster_i::add (Receiver_ptr receiver,
 }
 
 void
-Broadcaster_i::remove (Receiver_ptr receiver,
-                       CORBA::Environment &ACE_TRY_ENV)
+Broadcaster_i::remove (Receiver_ptr receiver
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -117,15 +117,15 @@ Broadcaster_i::remove (Receiver_ptr receiver,
     + " left the chat"
     + " ****\n";
 
-  this->broadcast (broadcast_string.fast_rep (),
-                   ACE_TRY_ENV);
+  this->broadcast (broadcast_string.fast_rep ()
+                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Broadcaster_i::say (Receiver_ptr receiver,
-                    const char *text,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const char *text
+                    TAO_ENV_ARG_DECL)
  ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -145,14 +145,14 @@ Broadcaster_i::say (Receiver_ptr receiver,
            // behave well on other ORBs since <_is_equivalent> isn't
            // guaranteed to differentiate object references.
           if ((*iter).receiver_.in ()->_is_equivalent (receiver) == 1)
-	    sender_nickname = (*iter).nickname_;
+            sender_nickname = (*iter).nickname_;
         }
 
       // Broadcast the message to all registered clients
       ACE_CString broadcast_string ("[" + sender_nickname + "] " + text);
 
-      this->broadcast (broadcast_string.fast_rep (),
-                       ACE_TRY_ENV);
+      this->broadcast (broadcast_string.fast_rep ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -165,8 +165,8 @@ Broadcaster_i::say (Receiver_ptr receiver,
 }
 
 void
-Broadcaster_i::broadcast (const char *text,
-                          CORBA::Environment &ACE_TRY_ENV)
+Broadcaster_i::broadcast (const char *text
+                          TAO_ENV_ARG_DECL)
 {
   // Broadcast the message to all registered clients.
 
@@ -176,9 +176,9 @@ Broadcaster_i::broadcast (const char *text,
     {
       ACE_TRY
         {
-          (*iter).receiver_->message (text,
-                                      ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
+          (*iter).receiver_->message (text
+                                      TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index 822a93a4e10..9ff5d1debb7 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -45,16 +45,16 @@ public:
   // Destructor.
 
   virtual void add (Receiver_ptr receiver,
-                    const char *nickname,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const char *nickname
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
     ));
   // Saves receiver references in a list.
 
-  virtual void remove (Receiver_ptr receiver,
-                       CORBA::Environment &ACE_TRY_ENV)
+  virtual void remove (Receiver_ptr receiver
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -62,8 +62,8 @@ public:
   // Removes receiver references from the list.
 
   virtual void say (Receiver_ptr receiver,
-                    const char *text,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const char *text
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -73,8 +73,8 @@ public:
   TAO_ORB_Manager orb_manager_;
   // The ORB manager.
 
-  void broadcast (const char* text,
-                  CORBA::Environment &ACE_TRY_ENV);
+  void broadcast (const char* text
+                  TAO_ENV_ARG_DECL);
   // Broadcasts the text to all registered clients.
 
   class Receiver_Data
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index 36544540a0d..d5acaa2513e 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -36,8 +36,8 @@ Client_i::~Client_i (void)
       (TAO_ORB_Core_instance ()->reactor (),
        TAO_ORB_Core_instance ()->thr_mgr ()) == -1)
     ACE_ERROR ((LM_ERROR,
-		       "%p\n",
-		       "remove_stdin_handler"));
+                       "%p\n",
+                       "remove_stdin_handler"));
 }
 
 int
@@ -50,22 +50,22 @@ Client_i::parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'n':  // get the users nickname
-	this->nickname_ = get_opts.optarg;
-	break;
+        this->nickname_ = get_opts.optarg;
+        break;
 
       case 'f':  // get the file name to write to
         this->ior_file_name_ = get_opts.optarg;
-	break;
+        break;
 
       default: // display help for use of the serve
       case '?':  // display help for use of the server.
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-n <your_nick_name>]"
-			   " [-f <ior_input_file>]"
-			   "\n",
-			   argv [0]),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-n <your_nick_name>]"
+                           " [-f <ior_input_file>]"
+                           "\n",
+                           argv [0]),
+                          -1);
       }
 
   ACE_DEBUG ((LM_DEBUG,
@@ -87,8 +87,8 @@ Client_i::init (int argc, char *argv[])
       // Retrieve the ORB.
       this->orb_manager_.init (argc,
                                argv,
-                               0,
-                               ACE_TRY_ENV);
+                               0
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -98,24 +98,24 @@ Client_i::init (int argc, char *argv[])
 
       // read the ior from file
       if (this->read_ior (this->ior_file_name_) != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "could not read the ior from the file: <%s>\n",
-			   this->ior_file_name_),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "could not read the ior from the file: <%s>\n",
+                           this->ior_file_name_),
+                          -1);
 
       CORBA::Object_var server_object =
-	orb->string_to_object (this->ior_,
-                               ACE_TRY_ENV);
+        orb->string_to_object (this->ior_
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_object.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "invalid ior <%s>\n",
-			   this->ior_),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid ior <%s>\n",
+                           this->ior_),
+                          -1);
 
-      this->server_ = Broadcaster::_narrow (server_object.in (),
-					    ACE_TRY_ENV);
+      this->server_ = Broadcaster::_narrow (server_object.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -134,9 +134,9 @@ Client_i::init (int argc, char *argv[])
        TAO_ORB_Core_instance ()->reactor (),
        TAO_ORB_Core_instance ()->thr_mgr ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "register_stdin_handler"),
-		      -1);
+                       "%p\n",
+                       "register_stdin_handler"),
+                      -1);
   return 0;
 }
 
@@ -144,28 +144,28 @@ int
 Client_i::run (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "\n============= Simple Chat =================\n"
-	      "========== type 'quit' to exit  ===========\n"));
+              "\n============= Simple Chat =================\n"
+              "========== type 'quit' to exit  ===========\n"));
 
   ACE_TRY_NEW_ENV
     {
       PortableServer::POAManager_var poa_manager =
         this->orb_manager_.poa_manager ();
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->receiver_var_ =
-	this->receiver_i_._this (ACE_TRY_ENV);
+        this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register ourselves with the server.
       server_->add (this->receiver_var_.in (),
-		    this->nickname_,
-		    ACE_TRY_ENV);
+                    this->nickname_
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      this->orb_manager_.run (ACE_TRY_ENV);
+      this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -191,22 +191,22 @@ Client_i::handle_input (ACE_HANDLE)
     {
       // Check if the user wants to quit.
       if (ACE_OS::strncmp (buf,
-			   QUIT_STRING,
-			   ACE_OS::strlen (QUIT_STRING)) == 0)
-	{
-	  // Remove ourselves from the server.
-	  this->server_->remove (this->receiver_var_.in ());
-	  this->receiver_i_.shutdown (ACE_TRY_ENV);
+                           QUIT_STRING,
+                           ACE_OS::strlen (QUIT_STRING)) == 0)
+        {
+          // Remove ourselves from the server.
+          this->server_->remove (this->receiver_var_.in ());
+          this->receiver_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 
-	  ACE_TRY_CHECK;
-	  return 0;
-	}
+          ACE_TRY_CHECK;
+          return 0;
+        }
 
       // Call the server function <say> to pass the string typed by
       // the server.
       this->server_->say (this->receiver_var_.in (),
-			  buf,
-			  ACE_TRY_ENV);
+                          buf
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -228,18 +228,18 @@ Client_i::read_ior (const char *filename)
 
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Unable to open %s for writing: %p\n",
-		       filename,
-		       "invalid handle"),
-		      -1);
+                       "Unable to open %s for writing: %p\n",
+                       filename,
+                       "invalid handle"),
+                      -1);
 
   ACE_Read_Buffer ior_buffer (f_handle);
   char *data = ior_buffer.read ();
 
   if (data == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Unable to read ior: %p\n"),
-		      -1);
+                       "Unable to read ior: %p\n"),
+                      -1);
 
   this->ior_ = ACE_OS::strdup (data);
   ior_buffer.alloc ()->free (data);
@@ -248,8 +248,8 @@ Client_i::read_ior (const char *filename)
 
   if (this->ior_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "failed to read ior from file\n",
-		       ""),
-		      -1);
+                       "failed to read ior from file\n",
+                       ""),
+                      -1);
   return 0;
 }
diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp
index 4ceb9e79018..dbf9e772cb1 100644
--- a/TAO/examples/Simple/chat/Receiver_i.cpp
+++ b/TAO/examples/Simple/chat/Receiver_i.cpp
@@ -28,19 +28,19 @@ Receiver_i::~Receiver_i (void)
 }
 
 void
-Receiver_i::message (const char *msg,
-                     CORBA::Environment &)
+Receiver_i::message (const char *msg
+                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   ACE_DEBUG ((LM_DEBUG,
-	      ": %s\n",
-	      msg));
+              ": %s\n",
+              msg));
 }
 
 void
-Receiver_i::shutdown (CORBA::Environment &)
+Receiver_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
  ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index 20498d907a3..d7cb7648bda 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -37,14 +37,14 @@ public:
   ~Receiver_i (void);
   // Destructor.
 
-  virtual void message (const char *msg,
-                        CORBA::Environment &ACE_TRY_ENV)
+  virtual void message (const char *msg
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
   // Receives a message string.
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index 4b263b9257d..856d2d22a06 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -46,12 +46,12 @@ Server_i::parse_args (int argc, char *argv[])
 
       case '?':  // display help for use of the server.
       default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-o] <ior_output_file>"
-			   "\n",
-			   argv [0]),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-o] <ior_output_file>"
+                           "\n",
+                           argv [0]),
+                          -1);
       }
 
   return 0;
@@ -59,28 +59,28 @@ Server_i::parse_args (int argc, char *argv[])
 
 int
 Server_i::init (int argc,
-		char *argv[],
-		CORBA::Environment &ACE_TRY_ENV)
+                char *argv[]
+                TAO_ENV_ARG_DECL)
 {
   // Parse the command line options.
   if (this-> parse_args(argc, argv) == -1)
     return -1;
 
   if (this->orb_manager_.init (argc,
-			       argv,
-			       ACE_TRY_ENV) == -1)
+                               argv
+                               TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "%p\n",
-		       "orb manager init failed\n"),
-		      -1);
+                       "%p\n",
+                       "orb manager init failed\n"),
+                      -1);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   // Activate the servant.
   CORBA::String_var str =
-    this->orb_manager_.activate (&this->broadcaster_i_,
-				 ACE_TRY_ENV);
+    this->orb_manager_.activate (&this->broadcaster_i_
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Write the IOR to a file.
@@ -89,18 +89,18 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (CORBA::Environment &ACE_TRY_ENV)
+Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "Running chat server...\n"));
+              "Running chat server...\n"));
 
   // Run the main event loop for the ORB.
-  int ret = this->orb_manager_.run (ACE_TRY_ENV);
+  int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Server_i::run"),
-		      -1);
+                       "Server_i::run"),
+                      -1);
   return 0;
 }
 
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 788f6f93d80..48d2155adee 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -39,11 +39,11 @@ public:
  // Destructor.
 
  int init (int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
  // Initialize the server.
 
- int run (CORBA::Environment &env);
+ int run (TAO_ENV_SINGLE_ARG_DECL);
  // Run the ORB.
 
 private:
diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp
index cf35016424c..09120b3fef0 100644
--- a/TAO/examples/Simple/chat/server.cpp
+++ b/TAO/examples/Simple/chat/server.cpp
@@ -27,18 +27,18 @@ main (int argc, char *argv[])
     {
       Server_i server_i;
 
-      int ret = server_i.init (argc, argv, ACE_TRY_ENV);
+      int ret = server_i.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "\n error in init.\n"),
-			  1);
-      ret = server_i.run (ACE_TRY_ENV);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "\n error in init.\n"),
+                          1);
+      ret = server_i.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "\n error in run.\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "\n error in run.\n"),
+                          1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp
index 53bbad62394..303b36b08cd 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp
@@ -27,23 +27,23 @@ Echo_Client_i::run (const char *name,
   if (client.init (name,argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       while (1)
         {
-          char buf[BUFSIZ];    
-          
+          char buf[BUFSIZ];
+
           // Get the input message which has to be displayed.
           ACE_DEBUG ((LM_DEBUG,
                       "ECHO? "));
-          
+
           if (ACE_OS::fgets (buf,sizeof buf, stdin) == 0)
             break;
-          
-          CORBA::String_var s = client->echo_string (buf,
-                                                     ACE_TRY_ENV);
+
+          CORBA::String_var s = client->echo_string (buf
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -52,12 +52,12 @@ Echo_Client_i::run (const char *name,
         }
 
       if (client.shutdown () == 1)
-        client->shutdown (ACE_TRY_ENV);
-      
+        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+
       ACE_TRY_CHECK;
-       
+
     }
-  ACE_CATCHANY 
+  ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
       return -1;
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index 9f9a5c3fc92..dc65c299d82 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -33,8 +33,8 @@ Echo_i::orb (CORBA::ORB_ptr o)
 // Return a list of object references.
 
 Echo::List *
-Echo_i::echo_list (const char *,
-                   CORBA::Environment &ACE_TRY_ENV)
+Echo_i::echo_list (const char *
+                   TAO_ENV_ARG_DECL)
  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Echo::List_var list;
@@ -53,18 +53,18 @@ Echo_i::echo_list (const char *,
 
   // Just do something to get a list of object references.
   list[CORBA::ULong(0)] =
-    orb_->resolve_initial_references ("NameService",
-                                      ACE_TRY_ENV);
+    orb_->resolve_initial_references ("NameService"
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   list[CORBA::ULong(1)] =
-    orb_->resolve_initial_references ("NameService",
-                                      ACE_TRY_ENV);;
+    orb_->resolve_initial_references ("NameService"
+                                      TAO_ENV_ARG_PARAMETER);;
   ACE_CHECK_RETURN (0);
 
   list[CORBA::ULong(2)] =
-    orb_->resolve_initial_references ("NameService",
-                                      ACE_TRY_ENV);
+    orb_->resolve_initial_references ("NameService"
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return list._retn ();
@@ -73,8 +73,8 @@ Echo_i::echo_list (const char *,
 // Return the mesg string from the server
 
 char *
-Echo_i::echo_string (const char *mesg,
-                     CORBA::Environment &ACE_TRY_ENV)
+Echo_i::echo_string (const char *mesg
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The pointer mesg was NULL, return.
@@ -100,7 +100,7 @@ Echo_i::echo_string (const char *mesg,
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (CORBA::Environment &)
+Echo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index 6777f1112f2..a57fc92d49d 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -43,17 +43,17 @@ public:
   ~Echo_i (void);
   // Destructor.
 
-  virtual Echo::List *echo_list (const char *mesg,
-                                 CORBA::Environment &env)
+  virtual Echo::List *echo_list (const char *mesg
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the mesg string back from the server.
 
-  virtual char *echo_string (const char *mesg,
-                             CORBA::Environment &env)
+  virtual char *echo_string (const char *mesg
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the mesg string back from the server.
 
- virtual void shutdown (CORBA::Environment &env)
+ virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index e6a4b082018..da5802ac71f 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tEcho server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       if (server.init ("Echo",
                        argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index a49bde05e8c..56269b68c41 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -75,15 +75,15 @@ Grid_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Make the Grid.
 
       Grid_ptr grid = client->make_grid (width_,
-                                         height_,
-                                         ACE_TRY_ENV);
+                                         height_
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -92,23 +92,23 @@ Grid_Client_i::run (const char *name,
       // Set a value on the grid
       grid->set (setx_,
                  sety_,
-                 value_,
-                 ACE_TRY_ENV);
+                 value_
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Setting a value for the grid\n"));
 
       CORBA::Long ret_val = grid->get (setx_,
-                                       sety_,
-                                       ACE_TRY_ENV);
+                                       sety_
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (ret_val == value_);
 
       if (client.shutdown () == 1) {
-        client->shutdown (ACE_TRY_ENV);
-	ACE_TRY_CHECK;
+        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ACE_TRY_CHECK;
       }
       ACE_UNUSED_ARG (ret_val);
     }
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 26c346bd2e3..56dc3177fe7 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -16,8 +16,8 @@ Grid_i::Grid_i (void)
 //  Constructor.
 
 Grid_i::Grid_i (CORBA::Short x,
-                CORBA::Short y,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Short y
+                TAO_ENV_ARG_DECL)
   : width_ (x),
     height_ (y)
 {
@@ -49,9 +49,9 @@ Grid_i::~Grid_i (void)
 
 void
 Grid_i::set (CORBA::Short x,
-	     CORBA::Short y,
-	     CORBA::Long value,
-	     CORBA::Environment &ACE_TRY_ENV)
+             CORBA::Short y,
+             CORBA::Long value
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -68,8 +68,8 @@ Grid_i::set (CORBA::Short x,
 
 CORBA::Long
 Grid_i::get (CORBA::Short x,
-             CORBA::Short y,
-             CORBA::Environment &ACE_TRY_ENV)
+             CORBA::Short y
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -85,30 +85,30 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (CORBA::Environment &)
+Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (CORBA::Environment &)
+Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
 }
 
 void
-Grid_i::width (CORBA::Short x,
-	       CORBA::Environment &)
+Grid_i::width (CORBA::Short x
+               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
 }
 
 void
-Grid_i::height (CORBA::Short y,
-		CORBA::Environment &)
+Grid_i::height (CORBA::Short y
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
@@ -117,7 +117,7 @@ Grid_i::height (CORBA::Short y,
 // Destroy the grid
 
 void
-Grid_i::destroy (CORBA::Environment &)
+Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
@@ -143,7 +143,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 // Shutdown.
 
 void
-Grid_Factory_i::shutdown (CORBA::Environment &)
+Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -180,8 +180,8 @@ Grid_Factory_i::~Grid_Factory_i (void)
 
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
-                           CORBA::Short height,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Short height
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Grid_i *grid_ptr = 0;
@@ -199,14 +199,13 @@ Grid_Factory_i::make_grid (CORBA::Short width,
 
   // This attempts to create a new Grid_i and throws an exception and
   // returns a null value if it fails
-  CORBA::Environment &env =  ACE_TRY_ENV;
   ACE_NEW_THROW_EX (grid_ptr,
-                    Grid_i (width, height, env),
+                    Grid_i (width, height TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (Grid::_nil ());
 
   // Register the Grid pointer.
-  Grid_ptr gptr = grid_ptr->_this (ACE_TRY_ENV);
+  Grid_ptr gptr = grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return gptr;
 }
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index b0a187d4c7e..6b307072ec3 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -35,47 +35,47 @@ public:
   // Constructor
 
   Grid_i (CORBA::Short,
-          CORBA::Short,
-          CORBA_Environment &);
+          CORBA::Short
+          TAO_ENV_ARG_DECL_NOT_USED);
   // Constructor.
 
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (CORBA_Environment &)
+  virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (CORBA_Environment &)
+  virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
-  virtual void width (CORBA::Short,
-                      CORBA_Environment &)
+  virtual void width (CORBA::Short
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the width of the grid.
 
-  virtual void height (CORBA::Short,
-                       CORBA_Environment &)
+  virtual void height (CORBA::Short
+                       TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
-                    CORBA::Long,
-                    CORBA::Environment &)
+                    CORBA::Long
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
-                           CORBA::Short,
-                           CORBA::Environment &)
+                           CORBA::Short
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (CORBA::Environment &)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Destroy the grid.
@@ -107,12 +107,12 @@ public:
   // Destructor.
 
   virtual Grid_ptr make_grid (CORBA::Short,
-                              CORBA::Short,
-                              CORBA::Environment &_env)
+                              CORBA::Short
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index e721da11e9f..77592bc8f36 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tGrid server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       if (server.init ("Grid",
                        argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index c1eb9e501c7..d7b92d3f695 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -32,7 +32,7 @@ DLL_ORB::svc (void)
   ACE_TRY_NEW_ENV
     {
       // Run the ORB event loop in its own thread.
-      this->orb_manager_.run (ACE_TRY_ENV);
+      this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -69,8 +69,8 @@ DLL_ORB::init (int argc, char *argv[])
 
       // Initialize the ORB.
       this->orb_manager_.init (argc,
-                               argv,
-                               ACE_TRY_ENV);
+                               argv
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if defined (ACE_HAS_THREADS)
@@ -154,8 +154,8 @@ Time_Date_Servant::init (int argc, char *argv[])
                            this->orb_),
                           -1);
 
-      CORBA::String_var str = orb->orb_manager_.activate (&servant_,
-                                                          ACE_TRY_ENV);
+      CORBA::String_var str = orb->orb_manager_.activate (&servant_
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->ior_output_file_)
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
index d99e82b091f..aed8f602682 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
@@ -37,15 +37,15 @@ Time_Date_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Long l;
 
       // Get the time & date in binary format.
-      client_->bin_date (l,
-                         ACE_TRY_ENV);
+      client_->bin_date (l
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -54,14 +54,14 @@ Time_Date_Client_i::run (const char *name,
 
       // Get the time & date in string format.
       CORBA::String_var str_var;
-      client_->str_date (str_var.out(),
-                         ACE_TRY_ENV);
+      client_->str_date (str_var.out()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) String time_date = %s\n",
                   str_var.in()));
-  
+
       client_.shutdown ();
     }
   ACE_CATCH (CORBA::UserException, range_ex)
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index b65fcbf3705..cd46a87417e 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -21,8 +21,8 @@ Time_Date_i::~Time_Date_i (void)
 // Obtain the time and date in binary format.
 
 void
-Time_Date_i::bin_date (CORBA::Long_out time_date,
-                       CORBA::Environment &)
+Time_Date_i::bin_date (CORBA::Long_out time_date
+                       TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_date = ACE_OS::time (0);
@@ -30,9 +30,9 @@ Time_Date_i::bin_date (CORBA::Long_out time_date,
 
 // Obtain the time and date in string format.
 
-void 
-Time_Date_i::str_date (CORBA::String_out time_date,
-                       CORBA::Environment &)
+void
+Time_Date_i::str_date (CORBA::String_out time_date
+                       TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const time_t time = ACE_OS::time (0);
@@ -40,7 +40,7 @@ Time_Date_i::str_date (CORBA::String_out time_date,
   time_date = CORBA::string_dup (ACE_OS::ctime (&time));
 }
 
-void 
+void
 Time_Date_i::orb (CORBA::ORB_ptr orb_ptr)
 {
    orb_var_ = CORBA::ORB::_duplicate (orb_ptr);
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h
index 6c4f1028f9d..30475dd5968 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_i.h
@@ -38,14 +38,14 @@ public:
   ~Time_Date_i (void);
   // Destructor
 
-  virtual void bin_date (CORBA::Long_out time_date,
-                         CORBA::Environment &)
+  virtual void bin_date (CORBA::Long_out time_date
+                         TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Obtain the time and date in binary format.
 
-  virtual void str_date (CORBA::String_out time_date,
-                         CORBA::Environment &)
+  virtual void str_date (CORBA::String_out time_date
+                         TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Obtain the time and date in string format.
 
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index d30839e572b..d0a1720923f 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -11,19 +11,19 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tTime and Date server\n\n"));
-  
-  ACE_DECLARE_NEW_CORBA_ENV;
- 
+
+  TAO_ENV_DECLARE_NEW_ENV;
+
   ACE_TRY
     {
       if (server.init ("Time",
                        argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index afdcab88add..1d687e512e9 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -71,8 +71,8 @@ DOVE_Supplier::init (void)
   {
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
-      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA",
-                                                                 ACE_TRY_ENV);
+      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA"
+                                                                 TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (poaObject_var.in ()))
@@ -81,18 +81,18 @@ DOVE_Supplier::init (void)
                         -1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in (), ACE_TRY_ENV);
+      PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (ACE_TRY_ENV);
+       root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
       TAO_ORB_Core_instance()->orb()->resolve_initial_references (
-          "NameService",
-          ACE_TRY_ENV);
+          "NameService"
+          TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (namingObj_var.in ()))
@@ -101,8 +101,8 @@ DOVE_Supplier::init (void)
                         -1);
 
     this->namingContext_var_ =
-      CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                         ACE_TRY_ENV);
+      CosNaming::NamingContext::_narrow (namingObj_var.in ()
+                                         TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
@@ -272,8 +272,8 @@ DOVE_Supplier::notify (CORBA::Any &message)
     events[0] = event;
 
     // Now we invoke a RPC
-    this->current_connection_params_->proxyPushConsumer_var_->push (events,
-                                                                    ACE_TRY_ENV);
+    this->current_connection_params_->proxyPushConsumer_var_->push (events
+                                                                    TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
@@ -342,13 +342,13 @@ DOVE_Supplier::get_Scheduler ()
         CORBA::string_dup (this->current_connection_params_->ss_name_);
 
       CORBA::Object_var objref =
-          namingContext_var_->resolve (schedule_name,
-                                       ACE_TRY_ENV);
+          namingContext_var_->resolve (schedule_name
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->current_connection_params_->scheduler_var_ =
-        RtecScheduler::Scheduler::_narrow(objref.in (),
-                                          ACE_TRY_ENV);
+        RtecScheduler::Scheduler::_narrow(objref.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -378,12 +378,12 @@ DOVE_Supplier::get_EventChannel ()
       CORBA::string_dup (this->current_connection_params_->es_name_);
 
     CORBA::Object_var eventServiceObj_var =
-      this->namingContext_var_->resolve (channel_name, ACE_TRY_ENV);
+      this->namingContext_var_->resolve (channel_name TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->current_connection_params_->eventChannel_var_ =
-       RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in(),
-                                                   ACE_TRY_ENV);
+       RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in()
+                                                   TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in()))
@@ -412,8 +412,8 @@ DOVE_Supplier::connect_Supplier ()
     this->current_connection_params_->rt_info_ =
       this->current_connection_params_->
         scheduler_var_->
-          create (this->current_connection_params_->pod_rt_info_.entry_point,
-                  ACE_TRY_ENV);
+          create (this->current_connection_params_->pod_rt_info_.entry_point
+                  TAO_ENV_ARG_PARAMETER);
 
     ACE_TRY_CHECK;
 
@@ -430,8 +430,8 @@ DOVE_Supplier::connect_Supplier ()
            this->current_connection_params_->pod_rt_info_.quantum,
            this->current_connection_params_->pod_rt_info_.threads,
            ACE_static_cast (RtecScheduler::Info_Type_t,
-                            this->current_connection_params_->pod_rt_info_.info_type),
-           ACE_TRY_ENV);
+                            this->current_connection_params_->pod_rt_info_.info_type)
+           TAO_ENV_ARG_PARAMETER);
 
     ACE_TRY_CHECK;
 
@@ -455,25 +455,25 @@ DOVE_Supplier::connect_Supplier ()
 
     // = Connect as a supplier.
     this->current_connection_params_->supplierAdmin_var_ =
-      this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_TRY_ENV);
+      this->current_connection_params_->eventChannel_var_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->current_connection_params_->proxyPushConsumer_var_ =
-      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_TRY_ENV);
+      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // In calling _this we get back an object reference and register
     // the servant with the POA.
     RtecEventComm::PushSupplier_var pushSupplier_var =
-      this->internal_DOVE_Supplier_ptr_->_this (ACE_TRY_ENV);
+      this->internal_DOVE_Supplier_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Connect the supplier to the proxy consumer.
     ACE_SupplierQOS_Factory::debug (qos);
     this->current_connection_params_->
       proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (),
-                                                     qos,
-                                                     ACE_TRY_ENV);
+                                                     qos
+                                                     TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index 39a215e7104..4d783849751 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -99,7 +99,7 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
       this->channel_lo_name_[0].id = CORBA::string_dup ("DUAL_EC_LO");
       ACE_TRY_CHECK;
 
-      this->terminator_ = terminator_impl_._this (ACE_TRY_ENV);
+      this->terminator_ = terminator_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -151,15 +151,15 @@ DualEC_Supplier::~DualEC_Supplier ()
       this->weapons_Supplier_.disconnect ();
 
       // Unbind the schedulers from the NS.
-      this->naming_context_->unbind (this->sched_hi_name_, ACE_TRY_ENV);
+      this->naming_context_->unbind (this->sched_hi_name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->sched_lo_name_, ACE_TRY_ENV);
+      this->naming_context_->unbind (this->sched_lo_name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Unbind the ECs from the NS.
-      this->naming_context_->unbind (this->channel_hi_name_, ACE_TRY_ENV);
+      this->naming_context_->unbind (this->channel_hi_name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->channel_lo_name_, ACE_TRY_ENV);
+      this->naming_context_->unbind (this->channel_lo_name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -182,7 +182,7 @@ DualEC_Supplier::init ()
   {
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
-      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (poaObject_var.in ()))
@@ -191,21 +191,21 @@ DualEC_Supplier::init ()
                         1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in (), ACE_TRY_ENV);
+      PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (ACE_TRY_ENV);
+       root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    poa_manager_->activate (ACE_TRY_ENV);
+    poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
       TAO_ORB_Core_instance()->orb()->resolve_initial_references (
-          "NameService",
-          ACE_TRY_ENV);
+          "NameService"
+          TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (namingObj_var.in ()))
@@ -214,8 +214,8 @@ DualEC_Supplier::init ()
                         -1);
 
     this->naming_context_ =
-      CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                       ACE_TRY_ENV);
+      CosNaming::NamingContext::_narrow (namingObj_var.in ()
+                                       TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
   }
@@ -299,7 +299,7 @@ DualEC_Supplier::init ()
 // Private class that implements a termination servant.
 
 void
-DualEC_Supplier::Terminator::shutdown (CORBA::Environment &)
+DualEC_Supplier::Terminator::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
@@ -497,24 +497,24 @@ DualEC_Supplier::create_schedulers (void)
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_hi_ = sched_hi_impl_->_this (ACE_TRY_ENV);
+          this->sched_hi_ = sched_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_NEW_RETURN (this->sched_lo_impl_,
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_lo_ = sched_lo_impl_->_this (ACE_TRY_ENV);
+          this->sched_lo_ = sched_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Register Scheduling Service Implementations with Naming Service
 
           this->naming_context_->bind (this ->sched_hi_name_,
-                                       this->sched_hi_.in (), ACE_TRY_ENV);
+                                       this->sched_hi_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           naming_context_->bind (this->sched_lo_name_,
-                                 this->sched_lo_.in (), ACE_TRY_ENV);
+                                 this->sched_lo_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Register high and low priority rt_infos with the
@@ -522,8 +522,8 @@ DualEC_Supplier::create_schedulers (void)
 
           this->sched_hi_rt_info_hi_ =
             this->sched_hi_->
-              create (this->rt_info_dummy_hi_.entry_point,
-                      ACE_TRY_ENV);
+              create (this->rt_info_dummy_hi_.entry_point
+                      TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -540,15 +540,15 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_hi_.quantum,
                  this->rt_info_dummy_hi_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_hi_.info_type),
-                 ACE_TRY_ENV);
+                                  this->rt_info_dummy_hi_.info_type)
+                 TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_lo_ =
             this->sched_hi_->
-              create (this->rt_info_dummy_lo_.entry_point,
-                      ACE_TRY_ENV);
+              create (this->rt_info_dummy_lo_.entry_point
+                      TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -565,15 +565,15 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_lo_.quantum,
                  this->rt_info_dummy_lo_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_lo_.info_type),
-                 ACE_TRY_ENV);
+                                  this->rt_info_dummy_lo_.info_type)
+                 TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_hi_ =
             this->sched_lo_->
-              create (this->rt_info_dummy_hi_.entry_point,
-                      ACE_TRY_ENV);
+              create (this->rt_info_dummy_hi_.entry_point
+                      TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -590,15 +590,15 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_hi_.quantum,
                  this->rt_info_dummy_hi_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_hi_.info_type),
-                 ACE_TRY_ENV);
+                                  this->rt_info_dummy_hi_.info_type)
+                 TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_lo_ =
             this->sched_lo_->
-              create (this->rt_info_dummy_lo_.entry_point,
-                      ACE_TRY_ENV);
+              create (this->rt_info_dummy_lo_.entry_point
+                      TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -615,8 +615,8 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_lo_.quantum,
                  this->rt_info_dummy_lo_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  this->rt_info_dummy_lo_.info_type),
-                 ACE_TRY_ENV);
+                                  this->rt_info_dummy_lo_.info_type)
+                 TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -651,7 +651,7 @@ DualEC_Supplier::create_event_channels (void)
                                         &default_module_factory_),
                       -1);
 
-      this->ec_hi_ = ec_hi_impl_->_this (ACE_TRY_ENV);
+      this->ec_hi_ = ec_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (this->ec_lo_impl_,
@@ -661,17 +661,17 @@ DualEC_Supplier::create_event_channels (void)
                                         &default_module_factory_),
                       -1);
 
-      this->ec_lo_ = ec_lo_impl_->_this (ACE_TRY_ENV);
+      this->ec_lo_ = ec_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register Event Service Implementations with Naming Service
 
       naming_context_->bind (this->channel_hi_name_,
-                             this->ec_hi_.in (), ACE_TRY_ENV);
+                             this->ec_hi_.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       naming_context_->bind (this->channel_lo_name_,
-                                     this->ec_lo_.in (), ACE_TRY_ENV);
+                                     this->ec_lo_.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
   }
@@ -711,7 +711,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_hi, configs_out_hi, anomalies_out_hi, ACE_TRY_ENV);
+             infos_out_hi, configs_out_hi, anomalies_out_hi TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecScheduler::RT_Info_Set_out infos_out_lo (this->infos_lo_);
@@ -722,7 +722,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_lo, configs_out_lo, anomalies_out_lo, ACE_TRY_ENV);
+             infos_out_lo, configs_out_lo, anomalies_out_lo TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 #else  /* ! __SUNPRO_CC */
@@ -733,7 +733,7 @@ DualEC_Supplier::compute_schedules (void)
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              this->infos_hi_.out (), this->configs_hi_.out (),
-             this->anomalies_hi_.out (), ACE_TRY_ENV);
+             this->anomalies_hi_.out () TAO_ENV_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
           sched_lo_->compute_scheduling
@@ -742,7 +742,7 @@ DualEC_Supplier::compute_schedules (void)
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              this->infos_lo_.out (), this->configs_lo_.out (),
-             this->anomalies_lo_.out (), ACE_TRY_ENV);
+             this->anomalies_lo_.out () TAO_ENV_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
 #endif /* ! __SUNPRO_CC */
@@ -1152,8 +1152,8 @@ main (int argc, char *argv [])
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
-                        argv,
-                        ACE_TRY_ENV);
+                        argv
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index b3de9ace56b..d30a3259891 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -59,7 +59,7 @@ int
 Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                               const char *my_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Get a Scheduler.
@@ -68,7 +68,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
         ACE_Scheduler_Factory::server ();
 
       // Define Real-time information.
-      rt_info_ = server->create (my_name, ACE_TRY_ENV);
+      rt_info_ = server->create (my_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server->set (rt_info_,
@@ -80,8 +80,8 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                    RtecScheduler::VERY_LOW_IMPORTANCE,
                    ORBSVCS_Time::zero (),
                    1,
-                   RtecScheduler::OPERATION,
-                   ACE_TRY_ENV);
+                   RtecScheduler::OPERATION
+                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -100,14 +100,14 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
       // = Connect as a consumer.
 
       this->consumer_admin_ =
-        channel_admin_->for_consumers (ACE_TRY_ENV);
+        channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain a pointer to a push supplier.  "suppliers" is
       // inherited from a base class.
 
       this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The _this function returns an object pointer. This is needed
@@ -115,12 +115,12 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
       // CORBA::Object.
 
       RtecEventComm::PushConsumer_var objref =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS (),
-                                               ACE_TRY_ENV);
+                                               dependencies.get_ConsumerQOS ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
@@ -141,7 +141,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 void
-Demo_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -149,8 +149,8 @@ Demo_Consumer::disconnect_push_consumer (CORBA::Environment &)
 }
 
 void
-Demo_Consumer::push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &ACE_TRY_ENV)
+Demo_Consumer::push (const RtecEventComm::EventSet &events
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -177,39 +177,39 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events,
             {
               // Use a temporary int to avoid overload ambiguities with
               // the enum.
-              int kind = events[i].data.any_value.type()->kind (ACE_TRY_ENV);
+              int kind = events[i].data.any_value.type()->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              cout << "ID: " << events[i].data.any_value.type()->id(ACE_TRY_ENV) << endl;
+              cout << "ID: " << events[i].data.any_value.type()->id(TAO_ENV_SINGLE_ARG_PARAMETER) << endl;
               ACE_TRY_CHECK;
-              cout << "Name: " << events[i].data.any_value.type()->name(ACE_TRY_ENV) << endl;
+              cout << "Name: " << events[i].data.any_value.type()->name(TAO_ENV_SINGLE_ARG_PARAMETER) << endl;
               ACE_TRY_CHECK;
-              cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_TRY_ENV) << endl;
+              cout << "member_count: " << events[i].data.any_value.type()->member_count(TAO_ENV_SINGLE_ARG_PARAMETER) << endl;
               ACE_TRY_CHECK;
               cout << "TCKind: " << kind << endl;
 
-              int ret = _tc_Navigation->equal (events[i].data.any_value.type(), ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
-	      if (ret)
+              int ret = _tc_Navigation->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+              if (ret)
                 {
                   Navigation *navigation_ = (Navigation*) events[i].data.any_value.value ();
                   cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl;
                 }
-	      else {
-		ret = (_tc_Weapons->equal (events[i].data.any_value.type(), ACE_TRY_ENV));
-		ACE_TRY_CHECK;
-		if (ret) {
-		  Weapons *weapons_ = (Weapons*) events[i].data.any_value.value ();
-		  cout << "Found a Navigation struct in the any: pos_lat = " << weapons_->number_of_weapons << endl;
+              else {
+                ret = (_tc_Weapons->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER));
+                ACE_TRY_CHECK;
+                if (ret) {
+                  Weapons *weapons_ = (Weapons*) events[i].data.any_value.value ();
+                  cout << "Found a Navigation struct in the any: pos_lat = " << weapons_->number_of_weapons << endl;
                 }
-	      }
-	    }
+              }
+            }
           ACE_CATCHANY
             {
               ACE_ERROR ((LM_ERROR, "(%t)Error in extracting the Navigation and Weapons data.\n"));
             }
           ACE_ENDTRY;
-	  ACE_CHECK;
+          ACE_CHECK;
         }
     }
 }
@@ -221,7 +221,7 @@ Demo_Consumer::shutdown (void)
     {
       // Disconnect from the push supplier.
 
-      this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
+      this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
@@ -286,12 +286,12 @@ main (int argc, char *argv [])
       // Initialize ORB.
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA",
-                                        ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA"
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -300,16 +300,16 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -318,8 +318,8 @@ main (int argc, char *argv [])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
@@ -334,12 +334,12 @@ main (int argc, char *argv [])
       channel_name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name,
-                                 ACE_TRY_ENV);
+        naming_context->resolve (channel_name
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in(), ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ec.ptr() == 0)
@@ -360,19 +360,19 @@ main (int argc, char *argv [])
                            "Someone was feeling introverted.\n"),
                           -1);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       delete demo_consumer;
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
index 056fa15c4b3..bf2ace6ab79 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
@@ -46,13 +46,13 @@ public:
   // supplier.  Stores <my_name> for printing out messages.  Returns 0
   // on success, -1 on failure.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The channel is disconnecting.
 
   // = (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &)
+  virtual void push (const RtecEventComm::EventSet &events
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index bdb7a13bef2..06b2e4922b8 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -446,8 +446,8 @@ main (int argc, char *argv [])
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
-                        argv,
-                        ACE_TRY_ENV);
+                        argv
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 797b1397530..6362c09a17c 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -492,8 +492,8 @@ main (int argc, char *argv [])
       TAO_ORB_Manager orb_Manager;
 
       orb_Manager.init (argc,
-                        argv,
-                        ACE_TRY_ENV);
+                        argv
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index 52112b176e0..e8dbba5999a 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -10,16 +10,16 @@ int main(int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                            argv, 
-                                            "", 
-                                            ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TypeCode_var iface_tc = 
+      CORBA::TypeCode_var iface_tc =
         orb->create_interface_tc (CORBA::string_dup ("IDL:iface:1.0"),
-                                  CORBA::string_dup ("iface"),
-                                  ACE_TRY_ENV);
+                                  CORBA::string_dup ("iface")
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length = 5;
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
       // The type member of the UnionMember takes ownership.
       foo_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
 
-      // Not needed for ORB-created typecodes 
+      // Not needed for ORB-created typecodes
       // (see CORBA 2.4.2 section 10.7.3).
       foo_members[0].type_def = CORBA::IDLType::_nil ();
       CORBA::Short label_value = -3;
@@ -72,8 +72,8 @@ int main(int argc, char *argv[])
       CORBA::TypeCode_ptr foo_tc = orb->create_union_tc ("IDL:foo:1.0",
                                                           "foo",
                                                           CORBA::_tc_short,
-                                                          foo_members,
-                                                          ACE_TRY_ENV);
+                                                          foo_members
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       length = 2;
@@ -94,13 +94,13 @@ int main(int argc, char *argv[])
 
       CORBA::TypeCode_var bar_tc = orb->create_struct_tc ("IDL:bar:1.0",
                                                           "bar",
-                                                          bar_members,
-                                                          ACE_TRY_ENV);
+                                                          bar_members
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for equality with the typecode created by the IDL compiler.
-      CORBA::Boolean eq = bar_tc->equal (_tc_bar,
-                                         ACE_TRY_ENV);
+      CORBA::Boolean eq = bar_tc->equal (_tc_bar
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!eq)
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
           ACE_ERROR_RETURN ((LM_ERROR,
                              "ORB-created typecode not correct!\n"),
                              -1);
-                      
+
         }
     }
   ACE_CATCHANY
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index a0bb4dd105f..20e1d865e99 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -14,20 +14,20 @@ main (int argc, char *argv[])
       cout << "Initializing the ORB!" << endl;
       CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
                                                 argv,
-                                                orb_name,
-                                                ACE_TRY_ENV);
+                                                orb_name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (ACE_TRY_ENV);
+        the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Retrieving the servants IOR from a file
@@ -37,13 +37,13 @@ main (int argc, char *argv[])
         "file://ior.txt";
 
       orb_obj =
-        the_orb->string_to_object (filename, ACE_TRY_ENV);
+        the_orb->string_to_object (filename TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       cout << "Narrowing the IOR!" << endl;
 
       W32_Test_Interface_var mycall =
-        W32_Test_Interface::_narrow (orb_obj.in (), ACE_TRY_ENV);
+        W32_Test_Interface::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       cout << "Sending the Request!" << endl;
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 0b5e4803b11..961d501be4d 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -24,16 +24,16 @@ static char THIS_FILE[] = __FILE__;
 // CServerApp
 
 BEGIN_MESSAGE_MAP(CServerApp, CWinApp)
-	//{{AFX_MSG_MAP(CServerApp)
-	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
-		// NOTE - the ClassWizard will add and remove mapping macros here.
-		//    DO NOT EDIT what you see in these blocks of generated code!
-	//}}AFX_MSG_MAP
-	// Standard file based document commands
-	ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew)
-	ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen)
-	// Standard print setup command
-	ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup)
+        //{{AFX_MSG_MAP(CServerApp)
+        ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
+                // NOTE - the ClassWizard will add and remove mapping macros here.
+                //    DO NOT EDIT what you see in these blocks of generated code!
+        //}}AFX_MSG_MAP
+        // Standard file based document commands
+        ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew)
+        ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen)
+        // Standard print setup command
+        ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup)
 END_MESSAGE_MAP()
 
 
@@ -49,23 +49,23 @@ spawn_my_orb_thread (void *)
       CORBA::ORB_var the_orb =
         CORBA::ORB_init (__argc,
                          __argv,
-                         orb_name,
-                         ACE_TRY_ENV);
+                         orb_name
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-	    
+
       CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (ACE_TRY_ENV);
+        the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      the_poa_manager->activate (ACE_TRY_ENV);
+      the_poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initializing the NamingService
@@ -75,7 +75,7 @@ spawn_my_orb_thread (void *)
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        the_orb->object_to_string (orb_servant.in (), ACE_TRY_ENV);
+        the_orb->object_to_string (orb_servant.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *output_file = ACE_OS::fopen ("ior.txt",
@@ -85,13 +85,13 @@ spawn_my_orb_thread (void *)
                        ior.in ());
       ACE_OS::fclose (output_file);
 
-      the_orb->run (ACE_TRY_ENV);
+      the_orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 0;
     }
   ACE_ENDTRY;
@@ -124,20 +124,20 @@ CServerApp::~CServerApp()
       the_shutdown_orb =
         CORBA::ORB_init (argc,
                          argv,
-                         orb_name,
-                         ACE_TRY_ENV);	
+                         orb_name
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       the_shutdown_orb->shutdown (0, // wait_for_completion
-                                  ACE_TRY_ENV);
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-	    
+
       ACE_Thread_Manager::instance ()->wait ();
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -157,7 +157,7 @@ CServerApp theApp;
 BOOL CServerApp::InitInstance()
 {
   ACE::init();
-	
+
   AfxEnableControlContainer();
 
   // Standard initialization
@@ -166,9 +166,9 @@ BOOL CServerApp::InitInstance()
   //  the specific initialization routines you do not need.
 
 #ifdef _AFXDLL
-  Enable3dControls();			// Call this when using MFC in a shared DLL
+  Enable3dControls();                   // Call this when using MFC in a shared DLL
 #else
-  Enable3dControlsStatic();	// Call this when linking to MFC statically
+  Enable3dControlsStatic();     // Call this when linking to MFC statically
 #endif
 
   // Change the registry key under which our settings are stored.
@@ -213,51 +213,51 @@ BOOL CServerApp::InitInstance()
 class CAboutDlg : public CDialog
 {
 public:
-	CAboutDlg();
+        CAboutDlg();
 
 // Dialog Data
-	//{{AFX_DATA(CAboutDlg)
-	enum { IDD = IDD_ABOUTBOX };
-	//}}AFX_DATA
+        //{{AFX_DATA(CAboutDlg)
+        enum { IDD = IDD_ABOUTBOX };
+        //}}AFX_DATA
 
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAboutDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
+        // ClassWizard generated virtual function overrides
+        //{{AFX_VIRTUAL(CAboutDlg)
+        protected:
+        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+        //}}AFX_VIRTUAL
 
 // Implementation
 protected:
-	//{{AFX_MSG(CAboutDlg)
-		// No message handlers
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
+        //{{AFX_MSG(CAboutDlg)
+                // No message handlers
+        //}}AFX_MSG
+        DECLARE_MESSAGE_MAP()
 };
 
 CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
 {
-	//{{AFX_DATA_INIT(CAboutDlg)
-	//}}AFX_DATA_INIT
+        //{{AFX_DATA_INIT(CAboutDlg)
+        //}}AFX_DATA_INIT
 }
 
 void CAboutDlg::DoDataExchange(CDataExchange* pDX)
 {
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDlg)
-	//}}AFX_DATA_MAP
+        CDialog::DoDataExchange(pDX);
+        //{{AFX_DATA_MAP(CAboutDlg)
+        //}}AFX_DATA_MAP
 }
 
 BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-	//{{AFX_MSG_MAP(CAboutDlg)
-		// No message handlers
-	//}}AFX_MSG_MAP
+        //{{AFX_MSG_MAP(CAboutDlg)
+                // No message handlers
+        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 // App command to run the dialog
 void CServerApp::OnAppAbout()
 {
-	CAboutDlg aboutDlg;
-	aboutDlg.DoModal();
+        CAboutDlg aboutDlg;
+        aboutDlg.DoModal();
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index 93114b7f64f..736b88156d0 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -35,12 +35,12 @@ Concurrency_Service::Concurrency_Service (void)
 // Constructor taking command-line arguments.
 
 Concurrency_Service::Concurrency_Service (int argc,
-                                          char** argv,
-                                          CORBA::Environment& ACE_TRY_ENV)
+                                          char** argv
+                                          TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::Concurrency_Service (...)\n"));
-  this->init (argc, argv, ACE_TRY_ENV);
+  this->init (argc, argv TAO_ENV_ARG_PARAMETER);
 }
 
 int
@@ -85,15 +85,15 @@ Concurrency_Service::parse_args (void)
 
 int
 Concurrency_Service::init (int argc,
-                           char **argv,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           char **argv
+                           TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::init\n"));
   if (this->orb_manager_.init_child_poa (argc,
                                         argv,
-                                        "child_poa",
-                                        ACE_TRY_ENV) == -1)
+                                        "child_poa"
+                                        TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -108,8 +108,8 @@ Concurrency_Service::init (int argc,
                       "Could not parse command line\n"),
                      -1);
   CORBA::String_var str =
-    this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory (),
-                                ACE_TRY_ENV);
+    this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -121,13 +121,13 @@ Concurrency_Service::init (int argc,
     }
 
   if (this->use_naming_service_)
-    return this->init_naming_service (ACE_TRY_ENV);
+    return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   return 0;
 }
 
 int
-Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n"));
   CORBA::ORB_var orb;
@@ -141,7 +141,7 @@ Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
   if (result == -1)
     return result;
   lockset_factory_ =
-    this->my_concurrency_server_.GetLockSetFactory ()->_this (ACE_TRY_ENV);
+    this->my_concurrency_server_.GetLockSetFactory ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNaming::Name concurrency_context_name (1);
@@ -149,16 +149,16 @@ Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
   concurrency_context_name[0].id = CORBA::string_dup ("CosConcurrency");
 
   this->concurrency_context_ =
-    this->my_name_server_->bind_new_context (concurrency_context_name,
-                                             ACE_TRY_ENV);
+    this->my_name_server_->bind_new_context (concurrency_context_name
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNaming::Name lockset_name (1);
   lockset_name.length (1);
   lockset_name[0].id = CORBA::string_dup ("LockSetFactory");
   this->concurrency_context_->bind (lockset_name,
-                                   lockset_factory_.in (),
-                                   ACE_TRY_ENV);
+                                   lockset_factory_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
@@ -166,12 +166,12 @@ Concurrency_Service::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 // Run the ORB event loop.
 
 int
-Concurrency_Service::run (CORBA_Environment& ACE_TRY_ENV)
+Concurrency_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::run (...)\n"));
 
-  int retval = this->orb_manager_.run (ACE_TRY_ENV);
+  int retval = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -196,16 +196,16 @@ main (int argc, char ** argv)
   ACE_DEBUG ((LM_DEBUG,
               "\n \t Concurrency Service:SERVER \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int r = concurrency_service.init (argc, argv, ACE_TRY_ENV);
+      int r = concurrency_service.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return 1;
 
-      concurrency_service.run (ACE_TRY_ENV);
+      concurrency_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index e028ea603cb..2868e7fa379 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -46,26 +46,26 @@ public:
   // Default Constructor.
 
   Concurrency_Service (int argc,
-                       char **argv,
-                       CORBA::Environment &env);
+                       char **argv
+                       TAO_ENV_ARG_DECL);
   // Constructor taking the command-line arguments.
 
   ~Concurrency_Service (void);
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the Concurrency Service with the arguments.
 
-  int run (CORBA_Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the Concurrency_Service.
 
 private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (CORBA::Environment &env);
+  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize the name server and register the concurency server
   // factory with it. Maybe later it will be convinient to register
   // the individual lock sets with the naming service. At present the
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 62cef5a4223..8c91a5c6e69 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -13,12 +13,12 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Intialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Call TAO_CEC_Event_Loader::init (argc, argv) from here.
@@ -41,11 +41,11 @@ main (int argc, char* argv[])
       //    to 1 by default or something like that...
       //    Don't worry about this change yet... Let's get all the changes
       //    in and then we can fix the EC shutdown problem...
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the ORB
-      orb->destroy(ACE_TRY_ENV);
+      orb->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index d74dd187a32..90f3d797b03 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -18,11 +18,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(naming_obj.in ()))
@@ -31,7 +31,7 @@ main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *name = 0;
@@ -64,14 +64,16 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out, ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+         infos_out, configs_out, anomalies_out
+         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+         infos.out (), configs.out (), anomalies.out ()
+         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 9a212f726b4..c1cc83f3424 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -55,15 +55,15 @@ Event_Service::run (int argc, char* argv[])
     {
       // Initialize ORB.
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
+        this->orb_->resolve_initial_references("RootPOA"
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,18 +71,18 @@ Event_Service::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -90,7 +90,7 @@ Event_Service::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::Scheduler_var scheduler;
@@ -112,22 +112,22 @@ Event_Service::run (int argc, char* argv[])
                               ACE_Config_Scheduler,
                               1);
 
-              scheduler = this->sched_impl_->_this (ACE_TRY_ENV);
+              scheduler = this->sched_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Register the servant with the Naming Context....
-              naming_context->rebind (schedule_name, scheduler.in (),
-                                      ACE_TRY_ENV);
+              naming_context->rebind (schedule_name, scheduler.in ()
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               CORBA::Object_var tmp =
-                naming_context->resolve (schedule_name, ACE_TRY_ENV);
+                naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              scheduler = RtecScheduler::Scheduler::_narrow (tmp.in (),
-                                                             ACE_TRY_ENV);
+              scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -143,7 +143,7 @@ Event_Service::run (int argc, char* argv[])
                             TAO_EC_Event_Channel (attr),
                             1);
             this->ec_impl_ = ec;
-            ec->activate (ACE_TRY_ENV);
+            ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
           break;
@@ -182,23 +182,23 @@ Event_Service::run (int argc, char* argv[])
       // forward all the requests to the underlying EC
       // implementation.
       RtecEventChannelAdmin::EventChannel_var ec =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in (), ACE_TRY_ENV);
+        this->orb_->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->ior_file_name_ != 0)
         {
-	  FILE *output_file= ACE_OS::fopen (this->ior_file_name_, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       this->ior_file_name_),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", str.in ());
-	  ACE_OS::fclose (output_file);
+          FILE *output_file= ACE_OS::fopen (this->ior_file_name_, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               this->ior_file_name_),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", str.in ());
+          ACE_OS::fclose (output_file);
         }
 
       if (this->pid_file_name_ != 0)
@@ -219,19 +219,19 @@ Event_Service::run (int argc, char* argv[])
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (this->service_name_);
-      naming_context->rebind (channel_name, ec.in (), ACE_TRY_ENV);
+      naming_context->rebind (channel_name, ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__));
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      naming_context->unbind (channel_name, ACE_TRY_ENV);
+      naming_context->unbind (channel_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (scheduler.in ()))
         {
-          naming_context->unbind (schedule_name, ACE_TRY_ENV);
+          naming_context->unbind (schedule_name TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -337,48 +337,48 @@ Event_Service::parse_args (int argc, char *argv [])
 
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-Event_Service::for_consumers (CORBA::Environment &ACE_TRY_ENV)
+Event_Service::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ec_impl_->for_consumers (ACE_TRY_ENV);
+  return this->ec_impl_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-Event_Service::for_suppliers (CORBA::Environment &ACE_TRY_ENV)
+Event_Service::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ec_impl_->for_suppliers (ACE_TRY_ENV);
+  return this->ec_impl_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV)
+Event_Service::destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->ec_impl_->destroy (ACE_TRY_ENV);
+  this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->orb_->shutdown ();
 }
 
 RtecEventChannelAdmin::Observer_Handle
-Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                                CORBA::Environment &ACE_TRY_ENV)
+Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer
+                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->ec_impl_->append_observer (observer, ACE_TRY_ENV);
+  return this->ec_impl_->append_observer (observer TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle,
-                                CORBA::Environment &ACE_TRY_ENV)
+Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
+                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->ec_impl_->remove_observer (handle, ACE_TRY_ENV);
+  this->ec_impl_->remove_observer (handle TAO_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index 89de50f53be..dd32fc469b1 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -42,22 +42,22 @@ public:
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (CORBA::Environment &)
+    for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (CORBA::Environment &)
+    for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void destroy (CORBA::Environment &)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                     CORBA::Environment &env)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                                CORBA::Environment &env)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
+                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
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/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/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/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/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/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/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/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/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/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/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/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;
                 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index a213a3c0336..d09725910c3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -13,7 +13,7 @@
 
 ImR_Adapter_Activator::ImR_Adapter_Activator (
   PortableServer::ServantLocator_ptr servant
-)  
+)
   : servant_locator_ (servant)
 {
   // Nothing
@@ -22,9 +22,9 @@ ImR_Adapter_Activator::ImR_Adapter_Activator (
 CORBA::Boolean
 ImR_Adapter_Activator::unknown_adapter (
   PortableServer::POA_ptr parent,
-  const char *name,
-  CORBA_Environment &ACE_TRY_ENV
-) 
+  const char *name
+  TAO_ENV_ARG_DECL
+)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::PolicyList policies (2);
@@ -37,46 +37,48 @@ ImR_Adapter_Activator::unknown_adapter (
       // Servant Retention Policy
       exception_message = "While PortableServer::POA::create_servant_retention_policy";
       policies[0] =
-        parent->create_servant_retention_policy (PortableServer::NON_RETAIN, ACE_TRY_ENV);
+        parent->create_servant_retention_policy
+                  (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       exception_message = "While PortableServer::POA::create_request_processing_policy";
       policies[1] =
-        parent->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, ACE_TRY_ENV);
+        parent->create_request_processing_policy
+                  (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        parent->the_POAManager (ACE_TRY_ENV);
+        parent->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While create_POA";
       PortableServer::POA_var child = parent->create_POA (name,
                                                           poa_manager.in (),
-                                                          policies,
-                                                          ACE_TRY_ENV);
+                                                          policies
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While unknown_adapter::policy->destroy";
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       exception_message = "While child->the_activator";
-      child->the_activator (this, ACE_TRY_ENV);
+      child->the_activator (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While unknown_adapter, set_servant_manager";
-      child->set_servant_manager(this->servant_locator_, ACE_TRY_ENV);
+      child->set_servant_manager(this->servant_locator_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR, 
-                  "IMR_Adapter_Activator::unknown_adapter - %s\n", 
+      ACE_ERROR ((LM_ERROR,
+                  "IMR_Adapter_Activator::unknown_adapter - %s\n",
                   exception_message));
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "System Exception");
       return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
index 7a9ac6cf996..5d04049f033 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
@@ -35,8 +35,8 @@ public:
   /// Called when a POA needs to be created.
   virtual CORBA::Boolean unknown_adapter (
     PortableServer::POA_ptr parent,
-    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));
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 4e68872836d..58513682945 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -17,7 +17,7 @@
 #include "tao/PortableServer/Object_Adapter.h"
 
 /**
- * This constructor takes in orb and ImplRepo_i pointers to store for later 
+ * This constructor takes in orb and ImplRepo_i pointers to store for later
  * use.  It also grabs a reference to the POACurrent object for use in
  * preinvoke.
  */
@@ -31,11 +31,11 @@ ImR_Forwarder::ImR_Forwarder (ImplRepo_i *imr_impl)
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var tmp =
-        orb->resolve_initial_references ("POACurrent", ACE_TRY_ENV);
+        orb->resolve_initial_references ("POACurrent" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->poa_current_var_ =
-        PortableServer::Current::_narrow (tmp.in (), ACE_TRY_ENV);
+        PortableServer::Current::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -60,7 +60,7 @@ ImR_Forwarder::ImR_Forwarder (ImplRepo_i *imr_impl)
  * @todo Should we base the name on the entire POA hierarchy?
  * @todo Use ACE_TString for the IOR?  Can it always be a char?
  */
-PortableServer::Servant 
+PortableServer::Servant
 ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           PortableServer::POA_ptr poa,
                           const char *,
@@ -68,8 +68,6 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   ACE_TString ior;
@@ -78,10 +76,10 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
   ACE_TRY
     {
       // Activate.
-  
+
       ior = this->imr_impl_->activate_server_i (poa->the_name (),
-                                                1,
-                                                ACE_TRY_ENV);
+                                                1
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Add the key
@@ -89,7 +87,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
       char *key_str = 0;
 
       // Unlike POA Current, this implementation cannot be cached.
-      TAO_POA_Current *tao_current = 
+      TAO_POA_Current *tao_current =
         ACE_dynamic_cast(TAO_POA_Current*, this->poa_current_var_.in ());
       TAO_POA_Current_Impl *impl = tao_current->implementation ();
       TAO_ObjectKey::encode_sequence_to_string (key_str,
@@ -101,7 +99,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
       if (OPTIONS::instance()->debug () >= 2)
         ACE_DEBUG ((LM_DEBUG, "Forwarding to %s\n", ior.c_str ()));
 
-      forward_obj = orb->string_to_object (ior.c_str (), ACE_TRY_ENV);
+      forward_obj = orb->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -132,7 +130,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
 /**
  * The postinvoke method just deletes the passed in servant.
  */
-void 
+void
 ImR_Forwarder::postinvoke (const PortableServer::ObjectId &,
                            PortableServer::POA_ptr ,
                            const char * ,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index 39345734e09..a95348523b6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -23,8 +23,8 @@ class ImplRepo_i;
  *
  * @brief Implementation Repository Forwarder
  *
- * This class is provides a ServantLocator implementation that 
- * is used to handle arbitrary calls and forward them to the 
+ * This class is provides a ServantLocator implementation that
+ * is used to handle arbitrary calls and forward them to the
  * correct place.
  */
 class ImR_Forwarder: public PortableServer::ServantLocator
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 953eaef95ee..aa1f028eb1a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -45,8 +45,8 @@ ImplRepo_i::ImplRepo_i (void)
 }
 
 char *
-ImplRepo_i::find_ior (const ACE_CString &object_name,
-                      CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::find_ior (const ACE_CString &object_name
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_TString endpoint;
@@ -67,8 +67,8 @@ ImplRepo_i::find_ior (const ACE_CString &object_name,
 
   ACE_TRY
     {
-      endpoint = this->activate_server_i (poa_name.c_str (), 1,
-                                          ACE_TRY_ENV);
+      endpoint = this->activate_server_i (poa_name.c_str (), 1
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -96,22 +96,22 @@ ImplRepo_i::find_ior (const ACE_CString &object_name,
 // not already started and if it can be started.
 
 void
-ImplRepo_i::activate_server (const char *server,
-                             CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::activate_server (const char *server
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
 {
   // Since this is called through the Admin interface, we should ignore some
   // of the activation modes.  Also ignore the return value.
-  this->activate_server_i (server, 0, ACE_TRY_ENV);
+  this->activate_server_i (server, 0 TAO_ENV_ARG_PARAMETER);
 }
 
 
 ACE_TString
 ImplRepo_i::activate_server_i (const char *server,
-                               const int check_startup,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const int check_startup
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
@@ -158,11 +158,11 @@ ImplRepo_i::activate_server_i (const char *server,
       ACE_TRY
         {
           CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str (), ACE_TRY_ENV);
+            orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in (), ACE_TRY_ENV);
+            ImplementationRepository::ServerObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -174,7 +174,7 @@ ImplRepo_i::activate_server_i (const char *server,
             }
 
           // Check to see if we can ping it
-          server_object->ping (ACE_TRY_ENV);
+          server_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -228,8 +228,8 @@ ImplRepo_i::activate_server_i (const char *server,
 // Starts the server process
 
 void
-ImplRepo_i::start_server_i (const char *server,
-                            CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::start_server_i (const char *server
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
@@ -399,7 +399,7 @@ ImplRepo_i::ready_check (const char *server)
   ACE_TString ping_object_ior, location;
   ImplementationRepository::ServerObject_var ping_object;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // <end> is the end of the window where we can get a response before
   // timing out
@@ -428,12 +428,12 @@ ImplRepo_i::ready_check (const char *server)
   ACE_TRY_EX (ping1)
     {
       CORBA::Object_var object =
-        orb->string_to_object (ping_object_ior.c_str (), ACE_TRY_ENV);
+        orb->string_to_object (ping_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (ping1);
 
       ping_object =
-        ImplementationRepository::ServerObject::_narrow (object.in (),
-                                                         ACE_TRY_ENV);
+        ImplementationRepository::ServerObject::_narrow (object.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (ping1);
 
       if (CORBA::is_nil (ping_object.in ()))
@@ -471,7 +471,7 @@ ImplRepo_i::ready_check (const char *server)
           if (OPTIONS::instance()->debug () >= 2)
             ACE_DEBUG ((LM_DEBUG, "Pinging Server...\n"));
 
-          ping_object->ping (ACE_TRY_ENV);
+          ping_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (ping2);
 
           if (OPTIONS::instance()->debug () >= 2)
@@ -503,8 +503,8 @@ ImplRepo_i::ready_check (const char *server)
 
 void
 ImplRepo_i::register_server (const char *server,
-                             const ImplementationRepository::StartupOptions &options,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             const ImplementationRepository::StartupOptions &options
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::AlreadyRegistered))
 {
@@ -575,8 +575,8 @@ ImplRepo_i::register_server (const char *server,
 
 void
 ImplRepo_i::reregister_server (const char *server,
-                               const ImplementationRepository::StartupOptions &options,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const ImplementationRepository::StartupOptions &options
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (OPTIONS::instance ()->readonly ())
@@ -627,8 +627,8 @@ ImplRepo_i::reregister_server (const char *server,
 // Remove the server entry from the Repository
 
 void
-ImplRepo_i::remove_server (const char *server,
-                           CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::remove_server (const char *server
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -657,8 +657,8 @@ ImplRepo_i::remove_server (const char *server,
 char *
 ImplRepo_i::server_is_running (const char *server,
                                const char *location,
-                               ImplementationRepository::ServerObject_ptr server_object,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               ImplementationRepository::ServerObject_ptr server_object
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -672,8 +672,8 @@ ImplRepo_i::server_is_running (const char *server,
     ACE_DEBUG ((LM_DEBUG, " at %s\n", location));
 
   // Get the stringified server_object_ior
-  ACE_TCHAR *server_object_ior = orb->object_to_string (server_object,
-                                                        ACE_TRY_ENV);
+  ACE_TCHAR *server_object_ior = orb->object_to_string (server_object
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (this->repository_.update (server, location, server_object_ior) == 0)
@@ -720,7 +720,7 @@ ImplRepo_i::server_is_running (const char *server,
 
   if (profile)
     {
-      new_location = profile->to_string (ACE_TRY_ENV);
+      new_location = profile->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
@@ -750,8 +750,8 @@ ImplRepo_i::server_is_running (const char *server,
 // Remove the state information for the current server
 
 void
-ImplRepo_i::server_is_shutting_down (const char *server,
-                                     CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::server_is_shutting_down (const char *server
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -774,18 +774,18 @@ ImplRepo_i::server_is_shutting_down (const char *server,
 
 
 int
-ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable", ACE_TRY_ENV);
+        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -793,12 +793,12 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
         }
       else
         {
-          adapter->set_locator (this->locator_.in (), ACE_TRY_ENV);
+          adapter->set_locator (this->locator_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       CORBA::Object_var root_poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa_object.in ()))
@@ -807,12 +807,12 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
                           -1);
 
       // Get the POA object.
-      this->root_poa_ = PortableServer::POA::_narrow (root_poa_object.in (),
-                                                      ACE_TRY_ENV);
+      this->root_poa_ = PortableServer::POA::_narrow (root_poa_object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (2);
@@ -820,21 +820,21 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
 
       // Id Assignment policy
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                      ACE_TRY_ENV);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                 ACE_TRY_ENV);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->imr_poa_ =
         this->root_poa_->create_POA ("ImplRepoService",
                                      poa_manager.in (),
-                                     policies,
-                                     ACE_TRY_ENV);
+                                     policies
+                                     TAO_ENV_ARG_PARAMETER);
 
       // Warning!  If create_POA fails, then the policies won't be
       // destroyed and there will be hell to pay in memory leaks!
@@ -844,7 +844,7 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -856,24 +856,24 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
         PortableServer::string_to_ObjectId ("ImplRepoService");
 
       this->imr_poa_->activate_object_with_id (imr_id.in (),
-                                               this,
-                                               ACE_TRY_ENV);
+                                               this
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IMR object
       CORBA::Object_var imr_obj =
-        this->imr_poa_->id_to_reference (imr_id.in (), ACE_TRY_ENV);
+        this->imr_poa_->id_to_reference (imr_id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // And its string
 
       this->imr_ior_ =
-        orb->object_to_string (imr_obj.in (), ACE_TRY_ENV);
+        orb->object_to_string (imr_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register with INS.
-      adapter->bind ("ImplRepoService", this->imr_ior_.in (),
-                     ACE_TRY_ENV);
+      adapter->bind ("ImplRepoService", this->imr_ior_.in ()
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (OPTIONS::instance ()->debug () >= 2)
@@ -896,7 +896,7 @@ ImplRepo_i::init (CORBA::Environment &ACE_TRY_ENV)
       // Register the Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
 
-      this->root_poa_->the_activator (this->activator_, ACE_TRY_ENV);
+      this->root_poa_->the_activator (this->activator_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get reactor instance from TAO.
@@ -1025,18 +1025,18 @@ ImplRepo_i::setup_multicast (ACE_Reactor *reactor)
 
 
 int
-ImplRepo_i::fini (CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable", ACE_TRY_ENV);
+        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -1044,15 +1044,15 @@ ImplRepo_i::fini (CORBA::Environment &ACE_TRY_ENV)
         }
       else
         {
-          adapter->set_locator (IORTable::Locator::_nil (),
-                                ACE_TRY_ENV);
+          adapter->set_locator (IORTable::Locator::_nil ()
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      this->imr_poa_->destroy (1, 1, ACE_TRY_ENV);
+      this->imr_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->root_poa_->destroy (1, 1, ACE_TRY_ENV);
+      this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1066,13 +1066,13 @@ ImplRepo_i::fini (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   PortableServer::POAManager_var poa_manager =
-    this->imr_poa_->the_POAManager (ACE_TRY_ENV);
-  poa_manager->activate (ACE_TRY_ENV);
+    this->imr_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get a new iterator
@@ -1107,8 +1107,8 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
       ACE_TRY
         {
           if (activation == ImplementationRepository::AUTO_START)
-            this->activate_server (server_entry->ext_id_.c_str (),
-                                   ACE_TRY_ENV);
+            this->activate_server (server_entry->ext_id_.c_str ()
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1126,7 +1126,7 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
     }
 
 
-  orb->run (0, ACE_TRY_ENV);
+  orb->run (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -1157,8 +1157,8 @@ ImplRepo_i::~ImplRepo_i (void)
 
 void
 ImplRepo_i::find (const char *server,
-                  ImplementationRepository::ServerInformation_out info,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  ImplementationRepository::ServerInformation_out info
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ImplementationRepository::Administration::NotFound))
 {
@@ -1201,8 +1201,8 @@ ImplRepo_i::find (const char *server,
 void
 ImplRepo_i::list (CORBA::ULong how_many,
                   ImplementationRepository::ServerInformationList_out server_list,
-                  ImplementationRepository::ServerInformationIterator_out server_iterator,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  ImplementationRepository::ServerInformationIterator_out server_iterator
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize the out variables, so if we return early, they will
@@ -1285,9 +1285,9 @@ ImplRepo_i::list (CORBA::ULong how_many,
       ACE_TRY
         {
           PortableServer::ObjectId_var id =
-            this->root_poa_->activate_object (imr_iter, ACE_TRY_ENV);
+            this->root_poa_->activate_object (imr_iter TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          server_iterator = imr_iter->_this (ACE_TRY_ENV);
+          server_iterator = imr_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1305,8 +1305,8 @@ ImplRepo_i::list (CORBA::ULong how_many,
  * to do it ungracefully.
  */
 void
-ImplRepo_i::shutdown_server (const char *server,
-                             CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::shutdown_server (const char *server
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ImplementationRepository::Administration::NotFound))
 {
@@ -1332,12 +1332,12 @@ ImplRepo_i::shutdown_server (const char *server,
       ACE_TRY
         {
           CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str (), ACE_TRY_ENV);
+            orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in (),
-                                                             ACE_TRY_ENV);
+            ImplementationRepository::ServerObject::_narrow (object.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -1349,7 +1349,7 @@ ImplRepo_i::shutdown_server (const char *server,
             }
 
           // Call shutdown
-          server_object->shutdown (ACE_TRY_ENV);
+          server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Remove running info from repository
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index fbab774fe28..bbc674f5454 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -39,16 +39,16 @@ public:
   ~ImplRepo_i (void);
 
   /// IOR_LookupTable_Callback method.  Will return an IOR
-  char *find_ior (const ACE_CString &object_name,
-                  CORBA::Environment &ACE_TRY_ENV)
+  char *find_ior (const ACE_CString &object_name
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
 
   // = Interface methods
 
   /// Starts up the server <server> if not already running.
   virtual void activate_server (
-      const char *server,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const char *server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::NotFound,
@@ -59,8 +59,8 @@ public:
   /// about the server <server>.
   virtual void register_server (
       const char *server,
-      const ImplementationRepository::StartupOptions &options,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const ImplementationRepository::StartupOptions &options
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::AlreadyRegistered
@@ -69,21 +69,21 @@ public:
   /// Updates the startup information about the server <server>.
   virtual void reregister_server (
       const char *server,
-      const ImplementationRepository::StartupOptions &options,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const ImplementationRepository::StartupOptions &options
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Removes the server <server> from the repository.
   virtual void remove_server (
-      const char *server,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const char *server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
-  /// Attempts to gracefully shut down the server, 
+  /// Attempts to gracefully shut down the server,
   virtual void shutdown_server (
-      const char *server, 
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const char *server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
@@ -92,23 +92,23 @@ public:
   virtual char *server_is_running (
       const char *server,
       const char *location,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ImplementationRepository::ServerObject_ptr server_object
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
   /// What the server should call before it shuts down.
   virtual void server_is_shutting_down (
-      const char *server,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const char *server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
   /// Returns the startup information for a server
   virtual void find (
       const char *server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ImplementationRepository::ServerInformation_out info
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
@@ -117,26 +117,26 @@ public:
   virtual void list (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+      ImplementationRepository::ServerInformationIterator_out server_iterator
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Initialize the Server state - parsing arguments and waiting.
-  int init (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int init (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Cleans up any state created by init ().
-  int fini (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int fini (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Runs the orb.
-  int run (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 private:
   /// Implementation of activate_server.  <check_startup> is a flag to check
   /// the activation mode before attempting to start it.
   ACE_TString activate_server_i (
       const char *server,
-      const int check_startup,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const int check_startup
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::NotFound,
@@ -145,8 +145,8 @@ private:
 
   /// This method starts the server process.
   void start_server_i (
-      const char *server,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+      const char *server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::NotFound,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index d3ed4f9e6a8..3792e57cdca 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -36,8 +36,8 @@ ImR_Iterator::~ImR_Iterator ()
 
 CORBA::Boolean
 ImR_Iterator::next_n (CORBA::ULong how_many,
-                      ImplementationRepository::ServerInformationList_out server_list,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      ImplementationRepository::ServerInformationList_out server_list
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (server_list,
@@ -62,7 +62,7 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
 
       ACE_TString logical, server, command_line, working_directory, location, server_ior;
       ImplementationRepository::EnvironmentList environment_vars;
-      ImplementationRepository::ActivationMode activation = 
+      ImplementationRepository::ActivationMode activation =
         ImplementationRepository::NORMAL;
 
       server_entry->int_id_->get_running_info (location, server_ior);
@@ -94,8 +94,8 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
 
 // Destroys the iterator.
 
-void 
-ImR_Iterator::destroy (CORBA::Environment &)
+void
+ImR_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index 1ae730b73fc..bd71a088a57 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -24,7 +24,7 @@
  * @brief The Iterator for servers in the ImR.
  *
  */
-class ImR_Iterator 
+class ImR_Iterator
   : public POA_ImplementationRepository::ServerInformationIterator
 {
 public:
@@ -40,15 +40,13 @@ public:
   /// false.
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV 
-        = CORBA::Environment::default_environment ()
+      ImplementationRepository::ServerInformationList_out server_list
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroys the iterator.
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV 
-                          = CORBA::Environment::default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp
index 799114730b6..dc20a2d05a5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp
@@ -19,12 +19,12 @@ ImR_Locator::ImR_Locator (ImplRepo_i *repo)
 }
 
 char *
-ImR_Locator::locate (const char *object_key,
-                     CORBA::Environment &ACE_TRY_ENV)
+ImR_Locator::locate (const char *object_key
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_CString key (object_key);
-  return this->repo_->find_ior (key, ACE_TRY_ENV);
+  return this->repo_->find_ior (key TAO_ENV_ARG_PARAMETER);
 }
 
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.h b/TAO/orbsvcs/ImplRepo_Service/Locator.h
index b46af1cad54..3e022341c1e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator.h
@@ -42,8 +42,8 @@ public:
   ImR_Locator (ImplRepo_i *repo);
 
   /// Locate the appropriate IOR.
-  char * locate (const char *object_key,
-                 CORBA::Environment &ACE_TRY_ENV)
+  char * locate (const char *object_key
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
index 3554299ae63..3e4b9bfbf9d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
@@ -16,7 +16,7 @@
 
 #if defined (ACE_WIN32)
 const HKEY SERVICE_REG_ROOT = HKEY_LOCAL_MACHINE;
-const ACE_TCHAR *SERVICE_REG_PATH = 
+const ACE_TCHAR *SERVICE_REG_PATH =
   ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\TAOImplRepo\\Parameters");
 const ACE_TCHAR *SERVICE_REG_VALUE_NAME = ACE_TEXT ("ORBOptions");
 #endif /* ACE_WIN32 */
@@ -60,9 +60,9 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
 {
   ACE_Arg_Shifter shifter (argc, argv);
 
-  while (shifter.is_anything_left ()) 
+  while (shifter.is_anything_left ())
     {
-      if (ACE_OS::strcasecmp (shifter.get_current (), 
+      if (ACE_OS::strcasecmp (shifter.get_current (),
                               ACE_TEXT ("-c")) == 0)
         {
           // Run the service command
@@ -80,7 +80,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
           // Since we just ran a command, we will exit right away.
           return 1;
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-d")) == 0)
         {
           // Set the debug level
@@ -94,13 +94,13 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
 
           this->debug_ = ACE_OS::atoi (shifter.get_current ());
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-l")) == 0)
         {
           // Lock the database
           this->readonly_ = 1;
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-m")) == 0)
         {
           // multicast?
@@ -114,7 +114,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
 
           this->multicast_ = ACE_OS::atoi (shifter.get_current ());
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-o")) == 0)
         {
           // Output the IOR to a file.
@@ -132,7 +132,7 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
                                "Error: Unable to open %s for writing: %p\n",
                                shifter.get_current ()), -1);
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-p")) == 0)
         {
           // Initialize file persistence
@@ -147,20 +147,20 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
           if (this->initialize_file_persistence (shifter.get_current ()) != 0)
             return -1;
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-r")) == 0)
         {
           // win32 registry implementation
           if (this->initialize_registry_persistence () != 0)
             return -1;
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-s")) == 0)
         {
           // Run as a service
           this->service_ = 1;
         }
-      else if (ACE_OS::strcasecmp (shifter.get_current (), 
+      else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-t")) == 0)
         {
           // Set timeout value
@@ -172,18 +172,18 @@ Options::parse_args (int &argc, ACE_TCHAR *argv[])
               return -1;
             }
 
-          this->startup_timeout_ = 
+          this->startup_timeout_ =
             ACE_Time_Value (ACE_OS::atoi (shifter.get_current ()));
         }
-      else if ((ACE_OS::strcasecmp (shifter.get_current (), 
+      else if ((ACE_OS::strcasecmp (shifter.get_current (),
                                     ACE_TEXT ("-?")) == 0)
-               || (ACE_OS::strcasecmp (shifter.get_current (), 
+               || (ACE_OS::strcasecmp (shifter.get_current (),
                                        ACE_TEXT ("-h")) == 0))
         {
           this->print_usage ();
           return 1;
         }
-      else 
+      else
         {
           shifter.ignore_arg ();
           continue;
@@ -244,13 +244,13 @@ Options::init (int argc, ACE_TCHAR *argv[])
 
   // Now initialize the orb and pass it the leftover arguments
 
-  ACE_TRY_NEW_ENV 
+  ACE_TRY_NEW_ENV
     {
-      
-      this->orb_ = CORBA::ORB_init (orb_argc, 
-                                    orb_args.argv (), 
-                                    0, 
-                                    ACE_TRY_ENV);
+
+      this->orb_ = CORBA::ORB_init (orb_argc,
+                                    orb_args.argv (),
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -261,14 +261,14 @@ Options::init (int argc, ACE_TCHAR *argv[])
   ACE_ENDTRY;
 
   // If there are any arguments left (besides the executable filename)
-  // then they were not picked up by us or the orb and must be 
+  // then they were not picked up by us or the orb and must be
   // unrecognized.
 
-  if (orb_argc > 1) 
+  if (orb_argc > 1)
     {
       // Just print out the first option as an error
-      ACE_ERROR ((LM_ERROR, 
-                  "Unrecognized option: %s\n", 
+      ACE_ERROR ((LM_ERROR,
+                  "Unrecognized option: %s\n",
                   orb_args.argv ()[1]));
       return -1;
     }
@@ -286,10 +286,10 @@ Options::init (int argc, ACE_TCHAR *argv[])
 /**
  * Just print out the usage message to STDERR
  */
-void 
+void
 Options::print_usage (void) const
 {
-  ACE_ERROR ((LM_ERROR, 
+  ACE_ERROR ((LM_ERROR,
               "Usage:\n"
               "\n"
               "ImplRepo_Service [-c cmd] [-d lvl] [-l] [-m 0/1] [-o file]"
@@ -316,12 +316,12 @@ Options::print_usage (void) const
  * @retval  0 Success
  * @retval -1 Failure
  */
-int 
+int
 Options::initialize_file_persistence (const ACE_TCHAR *filename)
 {
   if (this->config_ != 0)
   {
-    ACE_ERROR ((LM_ERROR, 
+    ACE_ERROR ((LM_ERROR,
                 "Error: initialize_file_persistence (): "
                 "Configuration already defined. \n"
                 "Did you pass multiple persistence options?\n"));
@@ -330,7 +330,7 @@ Options::initialize_file_persistence (const ACE_TCHAR *filename)
 
   ACE_Configuration_Heap *heap = 0;
   ACE_NEW_RETURN (heap, ACE_Configuration_Heap, -1);
-  
+
   if (heap->open (filename) == 0)
     {
       this->config_ = heap;
@@ -350,31 +350,31 @@ Options::initialize_file_persistence (const ACE_TCHAR *filename)
 
 /**
  * On Windows, we have the option of using the Registry to store the
- * server data.  Assigns a ACE_Configuration_Win32Registry to 
+ * server data.  Assigns a ACE_Configuration_Win32Registry to
  * this->config_.  On non-Win32 systems, just returns an error.
  *
- * @todo Where in the registry should this be stored?  
- * 
+ * @todo Where in the registry should this be stored?
+ *
  * @retval  0 Success
  * @retval -1 Failure
  */
-int 
+int
 Options::initialize_registry_persistence (void)
 {
 #if defined (ACE_WIN32)
   if (this->config_ != 0)
   {
-    ACE_ERROR ((LM_ERROR, 
+    ACE_ERROR ((LM_ERROR,
                 "Error: initialize_registry_persistence (): "
                 "Configuration already defined. \n"
                 "Did you pass multiple persistence options?\n"));
     return -1;
   }
 
-  HKEY root = 
-    ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE, 
+  HKEY root =
+    ACE_Configuration_Win32Registry::resolve_key(HKEY_LOCAL_MACHINE,
                                                  "Software\\TAO\\IR");
-  ACE_NEW_RETURN (this->config_, 
+  ACE_NEW_RETURN (this->config_,
                   ACE_Configuration_Win32Registry(root),
                   -1);
   return 0;
@@ -385,14 +385,14 @@ Options::initialize_registry_persistence (void)
 
 
 /**
- * In cases where persistence isn't needed, create an object of 
+ * In cases where persistence isn't needed, create an object of
  * the ACE_Configuration_Heap class to be used.  Initializes
  * this->config_ to an opened ACE_Configuration_Heap.
  *
  * @retval 0  Success
  * @retval -1 Failure
  */
-int 
+int
 Options::initialize_non_persistence (void)
 {
   ACE_Configuration_Heap *heap = 0;
@@ -407,7 +407,7 @@ Options::initialize_non_persistence (void)
   delete heap;
   heap = 0;
 
-  ACE_ERROR ((LM_ERROR, 
+  ACE_ERROR ((LM_ERROR,
              ACE_TEXT ("Error: Opening ACE_Configuration heap\n")));
 
   return -1;
@@ -423,13 +423,13 @@ Options::initialize_non_persistence (void)
  * @todo Finish implementing Options::run_service_command
  * @todo Update to unicode
  */
-int 
+int
 Options::run_service_command (const ACE_TCHAR *command)
 {
 #if defined (ACE_WIN32)
   SERVICE::instance ()->name (IMR_SERVICE_NAME, IMR_DISPLAY_NAME);
 
-  if (ACE_OS::strcmp (command, ACE_TEXT ("install")) == 0) 
+  if (ACE_OS::strcmp (command, ACE_TEXT ("install")) == 0)
     {
       ACE_TCHAR pathname[_MAX_PATH * 2 + 3];  // +3 for the ' -s' at the end
 
@@ -439,14 +439,14 @@ Options::run_service_command (const ACE_TCHAR *command)
           return -1;
         }
 
-      // Append the command used for running the implrepo as 
+      // Append the command used for running the implrepo as
       ACE_OS::strcat (pathname, ACE_TEXT (" -s"));
 
       return SERVICE::instance ()->insert (SERVICE_AUTO_START,
                                            SERVICE_ERROR_IGNORE,
                                            pathname);
     }
-  else if (ACE_OS::strcmp (command, ACE_TEXT ("remove")) == 0) 
+  else if (ACE_OS::strcmp (command, ACE_TEXT ("remove")) == 0)
     {
       return SERVICE::instance ()->remove ();
     }
@@ -457,13 +457,13 @@ Options::run_service_command (const ACE_TCHAR *command)
 #else /* ACE_WIN32 */
   ACE_UNUSED_ARG (command);
   ACE_ERROR ((LM_ERROR, "Service not supported on this platform"));
-  
+
   return -1;
 #endif /* ACE_WIN32 */
 }
 
 /**
- *  We will only load from the registry if we are a service.  
+ *  We will only load from the registry if we are a service.
  *  The location we store options in is HKEY_LOCAL_MACHINE:
  *  SYSTEM\CurrentControlSet\Services\TAOImplRepo\Parameters
  *
@@ -471,7 +471,7 @@ Options::run_service_command (const ACE_TCHAR *command)
  *
  *  @todo Is there a better way to handle the hKey? (as in a auto_ptr)
  */
-int 
+int
 Options::load_registry_options (ACE_ARGV &orb_options)
 {
 #if defined (ACE_WIN32)
@@ -479,7 +479,7 @@ Options::load_registry_options (ACE_ARGV &orb_options)
   if (!this->service ())
   {
     if (this->debug () > 1)
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Not running as a service, will not load data from "
                   "registry\n"));
     return 0;
@@ -494,7 +494,7 @@ Options::load_registry_options (ACE_ARGV &orb_options)
                              KEY_READ,
                              &hKey) != ERROR_SUCCESS)
     {
-      if (this->debug () > 1) 
+      if (this->debug () > 1)
         {
           ACE_DEBUG ((LM_DEBUG, "Could not open Registry Key, skipping\n"));
         }
@@ -512,7 +512,7 @@ Options::load_registry_options (ACE_ARGV &orb_options)
                                 buffer,
                                 &dwSize) != ERROR_SUCCESS)
     {
-      if (this->debug () > 1) 
+      if (this->debug () > 1)
         {
           ACE_DEBUG ((LM_DEBUG, "Could not read Registry Key, skipping\n"));
           ::RegCloseKey (hKey);
@@ -520,7 +520,7 @@ Options::load_registry_options (ACE_ARGV &orb_options)
         }
     }
 
-  if (dwType != REG_MULTI_SZ) 
+  if (dwType != REG_MULTI_SZ)
     {
       ACE_ERROR ((LM_ERROR, "Error: ORB Options registry key not MULTI_SZ\n"));
      ::RegCloseKey (hKey);
@@ -528,7 +528,7 @@ Options::load_registry_options (ACE_ARGV &orb_options)
     }
 
   // Skip the case where there are no arguments
-  if (dwSize > 1) 
+  if (dwSize > 1)
     {
       // Create an argv array
       ACE_TCHAR **orb_argv = 0;
@@ -538,8 +538,8 @@ Options::load_registry_options (ACE_ARGV &orb_options)
       ACE_TCHAR *tchar_buffer = ACE_reinterpret_cast (ACE_TCHAR *, buffer);
       orb_argv[0] = tchar_buffer;
 
-      if (this->debug () > 1) 
-        ACE_DEBUG ((LM_DEBUG, 
+      if (this->debug () > 1)
+        ACE_DEBUG ((LM_DEBUG,
                     "Registry Argument Added: %s\n",
                     orb_argv[0]));
 
@@ -551,8 +551,8 @@ Options::load_registry_options (ACE_ARGV &orb_options)
         {
           if (tchar_buffer[buffer_pos] == 0)
             {
-              if (this->debug () > 1) 
-                ACE_DEBUG ((LM_DEBUG, 
+              if (this->debug () > 1)
+                ACE_DEBUG ((LM_DEBUG,
                             "Registry Argument Added: %s\n",
                             &tchar_buffer[buffer_pos] + 1));
 
@@ -577,7 +577,7 @@ Options::load_registry_options (ACE_ARGV &orb_options)
 #else /* ACE_WIN32 */
   ACE_UNUSED_ARG (orb_options);
   ACE_ERROR ((LM_ERROR, "Service not supported on this platform"));
-  
+
   return -1;
 #endif /* ACE_WIN32 */
 }
@@ -596,7 +596,7 @@ Options::service (void) const
 
 
 /**
- * Debug level for the IR.  
+ * Debug level for the IR.
  *
  * @retval 0 Quiet
  * @retval 1 Trace messages
@@ -662,7 +662,7 @@ Options::orb (void) const
  * @retval 0 Do not listen for multicast location requests.
  * @retval 1 Do Listen.
  */
-int 
+int
 Options::multicast (void) const
 {
   return this->multicast_;
@@ -672,7 +672,7 @@ Options::multicast (void) const
  * @retval 0 Normal operation.
  * @retval 1 Do not let server info be modified.
  */
-int 
+int
 Options::readonly (void) const
 {
   return this->readonly_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index f0da66257b5..1f5fc75cbf6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -55,14 +55,14 @@ TAO_IMR_i::init (int argc, char **argv)
 
   const char *exception_message = "Null Message";
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -72,7 +72,7 @@ TAO_IMR_i::init (int argc, char **argv)
       // Get the ImplRepo object
 
       CORBA::Object_var implrepo_object =
-        orb_->resolve_initial_references ("ImplRepoService", ACE_TRY_ENV);
+        orb_->resolve_initial_references ("ImplRepoService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (implrepo_object.in ()))
@@ -84,7 +84,8 @@ TAO_IMR_i::init (int argc, char **argv)
 
       exception_message = "While narrowing ImplRepo";
       this->implrepo_ =
-        ImplementationRepository::Administration::_narrow (implrepo_object.in(), ACE_TRY_ENV);
+        ImplementationRepository::Administration::_narrow
+                               (implrepo_object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->op_->set_imr (this->implrepo_.in ());
@@ -614,10 +615,11 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv)
 int
 TAO_IMR_Op_Activate::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->implrepo_->activate_server (this->server_name_.c_str (), ACE_TRY_ENV);
+      this->implrepo_->activate_server
+                        (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully Activated server <%s>\n", this->server_name_.c_str ()));
@@ -655,10 +657,11 @@ TAO_IMR_Op_Add::run (void)
   startup_options.working_directory = CORBA::string_dup (this->working_dir_.c_str ());
   startup_options.activation = this->activation_;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->implrepo_->register_server (this->server_name_.c_str (), startup_options, ACE_TRY_ENV);
+      this->implrepo_->register_server
+          (this->server_name_.c_str (), startup_options TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully registered server <%s>\n", this->server_name_.c_str ()));
@@ -668,7 +671,7 @@ TAO_IMR_Op_Add::run (void)
       ACE_ERROR ((LM_ERROR, "Server <%s> already registered!\n", this->server_name_.c_str ()));
       return ALREADY_REGISTERED;
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex) 
+  ACE_CATCH (CORBA::NO_PERMISSION, ex)
     {
       ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
       return NO_PERMISSION;
@@ -690,10 +693,10 @@ TAO_IMR_Op_Autostart::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->implrepo_->list (0, server_list, server_iter, ACE_TRY_ENV);
+      this->implrepo_->list (0, server_list, server_iter TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for more to be displayed
@@ -704,16 +707,16 @@ TAO_IMR_Op_Autostart::run (void)
           while (flag)
             {
               flag = server_iter->next_n (IR_LIST_CHUNK,
-                                          server_list,
-                                          ACE_TRY_ENV);
+                                          server_list
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < server_list->length (); i++)
                 {
                   ACE_TRY_EX (inside)
                     {
-                      this->implrepo_->activate_server (server_list[i].server.in (),
-                                                        ACE_TRY_ENV);
+                      this->implrepo_->activate_server (server_list[i].server.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (inside);
                     }
                   ACE_CATCHANY
@@ -758,7 +761,7 @@ TAO_IMR_Op_IOR::run (void)
         }
 
       CORBA::String_var imr_str =
-        this->implrepo_->_stubobj ()->profile_in_use ()->to_string (ACE_TRY_ENV);
+        this->implrepo_->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Search for "corbaloc:" alone, without the protocol.  This code
@@ -827,14 +830,15 @@ TAO_IMR_Op_List::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // If there is a server name, list only that server.  Otherwise, look
       // at all of them.
       if (this->server_name_.length () == 0)
         {
-          this->implrepo_->list (IR_LIST_CHUNK, server_list, server_iter, ACE_TRY_ENV);
+          this->implrepo_->list
+               (IR_LIST_CHUNK, server_list, server_iter TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (size_t i = 0; i < server_list->length (); i++)
@@ -847,7 +851,8 @@ TAO_IMR_Op_List::run (void)
 
               while (flag)
                 {
-                  flag = server_iter->next_n (IR_LIST_CHUNK, server_list, ACE_TRY_ENV);
+                  flag = server_iter->next_n
+                           (IR_LIST_CHUNK, server_list TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   for (size_t i = 0; i < server_list->length (); i++)
@@ -862,7 +867,8 @@ TAO_IMR_Op_List::run (void)
         {
           ImplementationRepository::ServerInformation_var server_information;
 
-          this->implrepo_->find (this->server_name_.c_str (), server_information, ACE_TRY_ENV);
+          this->implrepo_->find
+             (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Display verbosely
@@ -889,10 +895,11 @@ TAO_IMR_Op_List::run (void)
 int
 TAO_IMR_Op_Remove::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->implrepo_->remove_server (this->server_name_.c_str (), ACE_TRY_ENV);
+      this->implrepo_->remove_server
+                         (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n", this->server_name_.c_str ()));
@@ -902,7 +909,7 @@ TAO_IMR_Op_Remove::run (void)
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>!\n", this->server_name_.c_str ()));
       return NOT_FOUND;
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex) 
+  ACE_CATCH (CORBA::NO_PERMISSION, ex)
     {
       ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
       return NO_PERMISSION;
@@ -921,10 +928,11 @@ TAO_IMR_Op_Remove::run (void)
 int
 TAO_IMR_Op_Shutdown::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->implrepo_->shutdown_server (this->server_name_.c_str (), ACE_TRY_ENV);
+      this->implrepo_->shutdown_server
+                         (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n", this->server_name_.c_str ()));
@@ -950,10 +958,11 @@ TAO_IMR_Op_Update::run (void)
 {
   ImplementationRepository::ServerInformation_var server_information;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->implrepo_->find (this->server_name_.c_str (), server_information, ACE_TRY_ENV);
+      this->implrepo_->find
+        (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Conditionally update the startup options
@@ -971,8 +980,8 @@ TAO_IMR_Op_Update::run (void)
       // @@ Add logical server support here also
 
       this->implrepo_->reregister_server (this->server_name_.c_str (),
-                                          server_information->startup,
-                                          ACE_TRY_ENV);
+                                          server_information->startup
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->display_server_information (server_information.in ());
@@ -982,7 +991,7 @@ TAO_IMR_Op_Update::run (void)
       ACE_ERROR ((LM_ERROR, "Could not find server <%s>\n", this->server_name_.c_str ()));
       return NOT_FOUND;
     }
-  ACE_CATCH (CORBA::NO_PERMISSION, ex) 
+  ACE_CATCH (CORBA::NO_PERMISSION, ex)
     {
       ACE_ERROR ((LM_ERROR, "No Permission: ImplRepo is in Locked mode\n"));
       return NO_PERMISSION;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index 295c3df2f2c..c7aaac86248 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -46,7 +46,8 @@ Factory_Trader::Factory_Trader (int debug_level)
       // this pointer is deleted when the trader_ptr is deleted
 
       // Set the service type repository
-      support_Attributes_ptr_->type_repos (this->repository_._this (ACE_TRY_ENV));
+      support_Attributes_ptr_->type_repos
+                     (this->repository_._this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       // Add the "Factory" type to the repository
@@ -100,8 +101,8 @@ Factory_Trader::add_type ()
       this->repository_.add_type (CORBA::string_dup("GenericFactory"),
                                   GENERIC_FACTORY_INTERFACE_REPOSITORY_ID,
                                   propStructSeq,
-                                  superTypeSeq,
-                                  ACE_TRY_ENV);
+                                  superTypeSeq
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -145,8 +146,8 @@ Factory_Trader::_cxx_export (const char * name,
       // invoke the export method on the Register interface of the Trading Service
       register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr),
                                  CORBA::string_dup("GenericFactory"),
-                                 propertySeq,
-                                 ACE_TRY_ENV);
+                                 propertySeq
+                                 TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -190,8 +191,8 @@ Factory_Trader::query (const char* constraint)
                          1,                 // Number of wanted results
                          CosTrading::OfferSeq_out(offerSeq_ptr),               // results
                          CosTrading::OfferIterator_out(offerIterator_ptr),     // more results
-                         CosTrading::PolicyNameSeq_out(policyNameSeq_ptr),     // Policies
-                         ACE_TRY_ENV);
+                         CosTrading::PolicyNameSeq_out(policyNameSeq_ptr)      // Policies
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 53baeb6f90b..4f0827e58c7 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -31,7 +31,7 @@ Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
       CosNaming::Name generic_Factory_Name (2);
       generic_Factory_Name.length (2);
       generic_Factory_Name[0].id = CORBA::string_dup ("LifeCycle_Service");
-      this->namingContext_var_->unbind (generic_Factory_Name, ACE_TRY_ENV);
+      this->namingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -43,14 +43,14 @@ Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
 
 int
 Life_Cycle_Service_Server::init (int argc,
-                                     char *argv[],
-                                     CORBA::Environment& ACE_TRY_ENV)
+                                     char *argv[]
+                                     TAO_ENV_ARG_DECL)
 {
   int retval = 0;
-  
+
   retval = this->orb_manager_.init (argc,
-                                    argv,
-                                    ACE_TRY_ENV);
+                                    argv
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (retval == -1)
@@ -61,7 +61,7 @@ Life_Cycle_Service_Server::init (int argc,
 
 
   // Activate the POA manager
-  retval = this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+  retval = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (retval == -1)
@@ -81,8 +81,8 @@ Life_Cycle_Service_Server::init (int argc,
 
   // Activate the object.
   CORBA::String_var str  =
-    this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_,
-                                 ACE_TRY_ENV);
+    this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->debug_level_ >= 2)
@@ -97,7 +97,7 @@ Life_Cycle_Service_Server::init (int argc,
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -105,8 +105,8 @@ Life_Cycle_Service_Server::init (int argc,
                    " LifeCycle_Service: Unable get the Naming Service.\n"));
 
       // Narrow the object reference to a Naming Context.
-      namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in (),
-							      ACE_TRY_ENV);
+      namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in ()
+                                                              TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -122,12 +122,12 @@ Life_Cycle_Service_Server::init (int argc,
       life_Cycle_Service_Name.length (1);
       life_Cycle_Service_Name[0].id = CORBA::string_dup ("Life_Cycle_Service");
 
-      CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(ACE_TRY_ENV);
+      CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       namingContext_var_->bind (life_Cycle_Service_Name,
-                                tmp,
-                                ACE_TRY_ENV);
+                                tmp
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -145,13 +145,13 @@ Life_Cycle_Service_Server::init (int argc,
 
 
 int
-Life_Cycle_Service_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Life_Cycle_Service_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nLifeCycle Service: Life_Cycle_Service_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_TRY_ENV);
+  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -201,15 +201,15 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       int check = life_Cycle_Service_Server.init (argc,
-                                                  argv,
-                                                  ACE_TRY_ENV);
+                                                  argv
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (check)
         return 1;
       else
         {
-          life_Cycle_Service_Server.run (ACE_TRY_ENV);
+          life_Cycle_Service_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK
         }
     }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 3554cbf8411..371e2a98c26 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -38,11 +38,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment& ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   u_int parse_args (void);
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 4c8cbf69e89..854b21687a2 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -34,8 +34,8 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
 
 
 CORBA::Boolean
-Life_Cycle_Service_i::supports (const CosLifeCycle::Key &,
-                                CORBA::Environment &)
+Life_Cycle_Service_i::supports (const CosLifeCycle::Key &
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -43,8 +43,8 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &,
 
 CORBA::Object_ptr
 Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
-                                     const CosLifeCycle::Criteria &the_criteria,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     const CosLifeCycle::Criteria &the_criteria
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLifeCycle::NoFactory,
                    CosLifeCycle::InvalidCriteria,
@@ -64,7 +64,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n"));
 
-      char* filter = criteria_Evaluator.getFilter (ACE_TRY_ENV);
+      char* filter = criteria_Evaluator.getFilter (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (this->debug_level_ >= 2)
@@ -96,8 +96,8 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
           ACE_TRY
             {
               genericFactory_var =
-                CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr,
-                                                       ACE_TRY_ENV);
+                CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr
+                                                       TAO_ENV_ARG_PARAMETER);
               // ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -119,8 +119,8 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
 
           // Now retrieve the Object obj ref corresponding to the key.
           CORBA::Object_var object_var = genericFactory_var->create_object (factory_key,
-                                                                            the_criteria,
-                                                                            ACE_TRY_ENV);
+                                                                            the_criteria
+                                                                            TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (this->debug_level_ >= 2)
@@ -149,8 +149,8 @@ void
 Life_Cycle_Service_i::register_factory (const char * name,
                                         const char * location,
                                         const char * description,
-                                        CORBA::Object_ptr object,
-                                        CORBA::Environment &)
+                                        CORBA::Object_ptr object
+                                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException))
 {
   if (factory_trader_ptr_ == 0)
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index 734ce9cbce4..dc0cbb4c0f6 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -29,15 +29,15 @@ public:
   Life_Cycle_Service_i (int debug_level = 1);
   ~Life_Cycle_Service_i (void);
 
-  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key,
-                           CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Boolean supports (const CosLifeCycle::Key &factory_key
+                           TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
-                                   const CosLifeCycle::Criteria &the_criteria,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const CosLifeCycle::Criteria &the_criteria
+                                   TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -49,8 +49,8 @@ public:
   void register_factory (const char * name,
                          const char * location,
                          const char * description,
-                         CORBA::Object_ptr object,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Object_ptr object
+                         TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
   // Registers a factory with specified properties
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
index b37a5b97f82..ba9776ace2e 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
@@ -23,8 +23,8 @@ TAO_LoadBalancer::~TAO_LoadBalancer (void)
 
 void
 TAO_LoadBalancer::parse_args (int argc,
-                              char *argv[],
-                              CORBA::Environment &ACE_TRY_ENV)
+                              char *argv[]
+                              TAO_ENV_ARG_DECL)
 {
   ACE_Get_Opt get_opts (argc, argv, "i:o:s:h");
 
@@ -64,32 +64,32 @@ TAO_LoadBalancer::parse_args (int argc,
 
 void
 TAO_LoadBalancer::init (int argc,
-                        char *argv[],
-                        CORBA::Environment &ACE_TRY_ENV)
+                        char *argv[]
+                        TAO_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA from the ORB.
   CORBA::Object_var poa =
-    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA object.
-  this->root_poa_ = PortableServer::POA::_narrow (poa.in (),
-                                                  ACE_TRY_ENV);
+  this->root_poa_ = PortableServer::POA::_narrow (poa.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA_Manager.
   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;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Check the non-ORB arguments.
-  this->parse_args (argc, argv, ACE_TRY_ENV);
+  this->parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Initialize the LoadBalancer servant.
@@ -104,11 +104,11 @@ TAO_LoadBalancer::init (int argc,
                                 this->root_poa_.in ()));
 
   CORBA::Object_var obj =
-    this->balancer_->_this (ACE_TRY_ENV);
+    this->balancer_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   FILE *lb_ior = ACE_OS::fopen (this->load_balancer_file_, "w");
@@ -129,7 +129,7 @@ TAO_LoadBalancer::usage (const char *cmd) const
 }
 
 void
-TAO_LoadBalancer::run (CORBA::Environment &ACE_TRY_ENV)
+TAO_LoadBalancer::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run (ACE_TRY_ENV);
+  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
index 4e8d2f32a1d..4c0b97a425c 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
@@ -38,16 +38,16 @@ public:
   ~TAO_LoadBalancer (void);
   // Destructor.
 
-  void init (int argc, char *argv[],
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv[]
+             TAO_ENV_ARG_DECL);
   // Initialize the service
 
-  void run (CORBA_Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the TAO_Loadbalancer.
 
 protected:
-  void parse_args (int argc, char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV);
+  void parse_args (int argc, char *argv[]
+                   TAO_ENV_ARG_DECL);
   // parses the arguments.
 
   void usage (const char *msg) const;
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp
index d71019e12c9..bc77f0cb4e0 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp
@@ -10,15 +10,15 @@ int
 main (int argc, char *argv[])
 {
   // @@ Ossama: i'm not sure what the LoadBalancer class buys you.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_LoadBalancer balancer;
 
-      balancer.init (argc, argv, ACE_TRY_ENV);
+      balancer.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      balancer.run (ACE_TRY_ENV);
+      balancer.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
index 7ba031e827d..576e9eaef6f 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
@@ -16,59 +16,59 @@ Logging_Service::~Logging_Service (void)
 }
 
 void
-Logging_Service::init_ORB  (int& argc, char *argv [],
-                             CORBA::Environment &ACE_TRY_ENV)
+Logging_Service::init_ORB  (int& argc, char *argv []
+                             TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in (),
-                                  ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_TRY_ENV);
+    this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Logging_Service::startup (int argc, char *argv[],
-                          CORBA::Environment &ACE_TRY_ENV)
+Logging_Service::startup (int argc, char *argv[]
+                          TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nStarting up the Telecom Log Service...\n"));
 
   // initalize the ORB.
-  this->init_ORB (argc, argv,
-                  ACE_TRY_ENV);
+  this->init_ORB (argc, argv
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resolve the naming service.
-  this->resolve_naming_service (ACE_TRY_ENV);
+  this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate the basic log factory
   // CORBA::Object_var obj =
   DsLogAdmin::BasicLogFactory_var obj =
-    this->basic_log_factory_.activate (this->poa_.in (),
-                                       ACE_TRY_ENV);
+    this->basic_log_factory_.activate (this->poa_.in ()
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (obj.in ()));
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -82,8 +82,8 @@ Logging_Service::startup (int argc, char *argv[],
   name[0].id = CORBA::string_dup (this->basic_log_factory_name_);
 
   this->naming_->rebind (name,
-                         obj.in (),
-                         ACE_TRY_ENV);
+                         obj.in ()
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -92,11 +92,11 @@ Logging_Service::startup (int argc, char *argv[],
 }
 
 void
-Logging_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Logging_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("NameService"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -104,8 +104,8 @@ Logging_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                       ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -114,10 +114,10 @@ Logging_Service::run (void)
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the Telecom Log Service\n", __FILE__));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -130,17 +130,17 @@ Logging_Service::run (void)
 }
 
 void
-Logging_Service::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Logging_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (&this->basic_log_factory_,
-                               ACE_TRY_ENV);
+    this->poa_->servant_to_id (&this->basic_log_factory_
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in (),
-                                 ACE_TRY_ENV);
+  this->poa_->deactivate_object (oid.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Unbind from the naming service.
@@ -148,8 +148,8 @@ Logging_Service::shutdown (CORBA::Environment &ACE_TRY_ENV)
   name.length (1);
   name[0].id = CORBA::string_dup (this->basic_log_factory_name_);
 
-  this->naming_->unbind (name,
-                         ACE_TRY_ENV);
+  this->naming_->unbind (name
+                         TAO_ENV_ARG_PARAMETER);
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -164,8 +164,8 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       service.startup (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (service.run () == -1)
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.h b/TAO/orbsvcs/Logging_Service/Logging_Service.h
index af4a9675f23..d81f88a429b 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service.h
@@ -39,8 +39,8 @@ class Logging_Service
   int parse_args (int argc, char *argv []);
   // Parses the command line arguments.
 
-  void startup (int argc, char *argv[],
-               CORBA::Environment &ACE_TRY_ENV);
+  void startup (int argc, char *argv[]
+               TAO_ENV_ARG_DECL);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -48,17 +48,16 @@ class Logging_Service
   // run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv [],
-                 CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int& argc, char *argv []
+                 TAO_ENV_ARG_DECL);
   // initialize the ORB.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
   // = Data members
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index ac41626cf14..1fa6fb2ab3e 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -28,7 +28,7 @@ TAO_Naming_Service::init (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->argc_ = argc;
@@ -36,7 +36,7 @@ TAO_Naming_Service::init (int argc,
 
       // Initialize the ORB
       this->orb_ =
-        CORBA::ORB_init (this->argc_, this->argv_, 0, ACE_TRY_ENV);
+        CORBA::ORB_init (this->argc_, this->argv_, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the args for '-t' option. If '-t' option is passed, do
@@ -109,17 +109,17 @@ TAO_Naming_Service::parse_args (int argc,
 
 // Run the ORB event loop.
 int
-TAO_Naming_Service::run (CORBA_Environment& ACE_TRY_ENV)
+TAO_Naming_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (time_ == 0)
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   else
     {
       ACE_Time_Value tv (time_);
-      this->orb_->run (tv, ACE_TRY_ENV);
+      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index b6d7d999dd6..4719d901afc 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -30,18 +30,18 @@ Notify_Service::~Notify_Service (void)
 }
 
 int
-Notify_Service::init_ORB  (int& argc, char *argv [],
-                             CORBA::Environment &ACE_TRY_ENV)
+Notify_Service::init_ORB  (int& argc, char *argv []
+                             TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var poa_obj  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (poa_obj.in ()))
@@ -50,27 +50,27 @@ Notify_Service::init_ORB  (int& argc, char *argv [],
                       -1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_obj.in (),
-                                  ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_TRY_ENV);
+    this->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);
 
   return 0;
 }
 
 int
-Notify_Service::init (int argc, char *argv[],
-                      CORBA::Environment &ACE_TRY_ENV)
+Notify_Service::init (int argc, char *argv[]
+                      TAO_ENV_ARG_DECL)
 {
   // initalize the ORB.
-  if (this->init_ORB (argc, argv,
-                      ACE_TRY_ENV) != 0)
+  if (this->init_ORB (argc, argv
+                      TAO_ENV_ARG_PARAMETER) != 0)
   return -1;
 
   ACE_CHECK_RETURN (-1);
@@ -92,7 +92,7 @@ Notify_Service::init (int argc, char *argv[],
   if (this->use_name_svc_)
     {
       // Resolve the naming service.
-      int ns_ret = this->resolve_naming_service (ACE_TRY_ENV);
+      int ns_ret = this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (ns_ret != 0)
@@ -104,15 +104,15 @@ Notify_Service::init (int argc, char *argv[],
 
   // Activate the factory
   this->notify_factory_ =
-    TAO_Notify_EventChannelFactory_i::create (this->poa_.in (),
-                                              ACE_TRY_ENV);
+    TAO_Notify_EventChannelFactory_i::create (this->poa_.in ()
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
 
   // Write IOR to a file, if asked.
   CORBA::String_var str =
-    this->orb_->object_to_string (this->notify_factory_.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (this->notify_factory_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->ior_output_file_)
@@ -132,12 +132,12 @@ Notify_Service::init (int argc, char *argv[],
   if (this->bootstrap_)
     {
       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 ()))
         {
@@ -146,11 +146,11 @@ Notify_Service::init (int argc, char *argv[],
       else
         {
           CORBA::String_var ior =
-            this->orb_->object_to_string (this->notify_factory_.in (),
-                                          ACE_TRY_ENV);
+            this->orb_->object_to_string (this->notify_factory_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
-          adapter->bind (this->notify_factory_name_.c_str (), ior.in (),
-                         ACE_TRY_ENV);
+          adapter->bind (this->notify_factory_name_.c_str (), ior.in ()
+                         TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
     }
@@ -162,14 +162,14 @@ Notify_Service::init (int argc, char *argv[],
     ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
 
     CosNaming::Name_var name =
-      this->naming_->to_name (this->notify_factory_name_.c_str (),
-                              ACE_TRY_ENV);
+      this->naming_->to_name (this->notify_factory_name_.c_str ()
+                              TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
 
 
     this->naming_->rebind (name.in (),
-                           this->notify_factory_.in (),
-                           ACE_TRY_ENV);
+                           this->notify_factory_.in ()
+                           TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
 
     ACE_DEBUG ((LM_DEBUG,
@@ -187,17 +187,17 @@ Notify_Service::init (int argc, char *argv[],
         CosNotifyChannelAdmin::EventChannel_var ec =
           this->notify_factory_->create_channel (initial_qos,
                                                  initial_admin,
-                                                 id,
-                                                 ACE_TRY_ENV);
+                                                 id
+                                                 TAO_ENV_ARG_PARAMETER);
         name = this->naming_->to_name (
-          this->notify_channel_name_.c_str (),
-          ACE_TRY_ENV);
+          this->notify_channel_name_.c_str ()
+          TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (-1);
 
 
         this->naming_->rebind (name.in (),
-                               ec.in (),
-                               ACE_TRY_ENV);
+                               ec.in ()
+                               TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (-1);
 
         ACE_DEBUG ((LM_DEBUG,
@@ -211,11 +211,11 @@ Notify_Service::init (int argc, char *argv[],
 }
 
 int
-Notify_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Notify_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("NameService"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Need to check return value for errors.
@@ -225,8 +225,8 @@ Notify_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
                       -1);
 
   this->naming_ =
-    CosNaming::NamingContextExt::_narrow (naming_obj.in (),
-                                          ACE_TRY_ENV);
+    CosNaming::NamingContextExt::_narrow (naming_obj.in ()
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -245,10 +245,10 @@ Notify_Service::run (void)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -261,29 +261,29 @@ Notify_Service::run (void)
 }
 
 void
-Notify_Service::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Notify_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
   PortableServer::ObjectId_var oid =
-    this->poa_->reference_to_id (this->notify_factory_.in (),
-                                 ACE_TRY_ENV);
+    this->poa_->reference_to_id (this->notify_factory_.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in (),
-                                 ACE_TRY_ENV);
+  this->poa_->deactivate_object (oid.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->use_name_svc_)
   {
     // Unbind from the naming service.
     CosNaming::Name_var name =
-      this->naming_->to_name (this->notify_factory_name_.c_str (),
-                              ACE_TRY_ENV);
+      this->naming_->to_name (this->notify_factory_name_.c_str ()
+                              TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    this->naming_->unbind (name.in (),
-                           ACE_TRY_ENV);
+    this->naming_->unbind (name.in ()
+                           TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -393,10 +393,10 @@ Worker::orb (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -422,8 +422,8 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       if (service.init (argc,
-                        argv,
-                        ACE_TRY_ENV) == -1)
+                        argv
+                        TAO_ENV_ARG_PARAMETER) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to start the Notification Service.\n"),
                           1);
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 12704f33a0a..c166dc29e60 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -64,8 +64,8 @@ class Notify_Service
   virtual ~Notify_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[],
-            CORBA::Environment &ACE_TRY_ENV);
+  int init (int argc, char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initializes the Service.
   // Returns 0 on success, -1 on error.
 
@@ -73,19 +73,18 @@ class Notify_Service
   // run the Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Shutdown the Service.
   // Returns 0 on success, -1 on error.
 
   // CosNotifyChannelAdmin::EventChannelFactory_var obj;
   //
 protected:
-  int init_ORB (int& argc, char *argv [],
-                CORBA::Environment &ACE_TRY_ENV);
+  int init_ORB (int& argc, char *argv []
+                TAO_ENV_ARG_DECL);
   // initialize the ORB.
 
-  int resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  int resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
   int parse_args (int argc, char *argv []);
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index dd8f62242ff..bacf9897fba 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -51,7 +51,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB manager.
-      this->orb_manager_.init (argc, argv, ACE_TRY_ENV);
+      this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb = this->orb_manager_.orb ();
@@ -60,7 +60,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
       poa_manager = this->orb_manager_.poa_manager ();
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check the non-ORB arguments.  this needs to come before we
@@ -104,7 +104,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
 
       // Locate the naming service.
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -112,15 +112,15 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
                            " (%P|%t) Unable to locate the Naming Service.\n"),
                           -1);
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::Scheduler_var scheduler =
-        this->scheduler_impl_->_this (ACE_TRY_ENV);
+        this->scheduler_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var scheduler_ior_string =
-        orb->object_to_string (scheduler.in (), ACE_TRY_ENV);
+        orb->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "The scheduler IOR is <%s>\n",
@@ -130,7 +130,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (this->service_name_);
-      naming_context->rebind (schedule_name, scheduler.in (), ACE_TRY_ENV);
+      naming_context->rebind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->ior_file_name_ != 0)
@@ -171,10 +171,10 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
 // Runs the TAO_Scheduling_Service.
 
 int
-TAO_Scheduling_Service::run (CORBA_Environment& ACE_TRY_ENV)
+TAO_Scheduling_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Run the ORB manager.
-  return this->orb_manager_.run (ACE_TRY_ENV);
+  return this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
@@ -284,7 +284,7 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "%s; running scheduling service\n", __FILE__));
 
-      scheduling_service.run (ACE_TRY_ENV);
+      scheduling_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
index 59a274cf1de..fab82fed608 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -32,12 +32,12 @@ extern "C" void handler (int)
 int
 main (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
@@ -46,7 +46,7 @@ main (int argc, ACE_TCHAR *argv[])
         {
           ACE_Time_Value tv (5, 0);
 
-          orb->perform_work (tv, ACE_TRY_ENV);
+          orb->perform_work (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 34dece01cc1..7e2936e8f0d 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -53,7 +53,7 @@ Clerk_i::read_ior (const char *filename)
 
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       for (char *str = ACE_OS::strtok (data, "\n");
@@ -65,8 +65,8 @@ Clerk_i::read_ior (const char *filename)
                       str));
 
           CORBA::Object_var objref =
-            this->orb_->string_to_object (str,
-                                          ACE_TRY_ENV);
+            this->orb_->string_to_object (str
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Return if the server reference is nil.
@@ -79,8 +79,8 @@ Clerk_i::read_ior (const char *filename)
             }
 
           CosTime::TimeService_ptr server =
-            CosTime::TimeService::_narrow (objref.in (),
-                                           ACE_TRY_ENV);
+            CosTime::TimeService::_narrow (objref.in ()
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->insert_server (server);
@@ -170,7 +170,7 @@ Clerk_i::parse_args (void)
 int
 Clerk_i::get_first_IOR (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       char host_name[MAXHOSTNAMELEN];
@@ -187,14 +187,14 @@ Clerk_i::get_first_IOR (void)
 
       // Resolve name.
       CORBA::Object_var temp_object =
-        this->my_name_server_->resolve (server_context_name,
-                                        ACE_TRY_ENV);
+        this->my_name_server_->resolve (server_context_name
+                                        TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var server_context =
-        CosNaming::NamingContext::_narrow (temp_object.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (temp_object.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_context.in ()))
@@ -212,13 +212,13 @@ Clerk_i::get_first_IOR (void)
       server_name[0].id = bindings_list[0u].binding_name[0].id;
 
       temp_object =
-        server_context->resolve (server_name,
-                                 ACE_TRY_ENV);
+        server_context->resolve (server_name
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosTime::TimeService_var obj =
-        CosTime::TimeService::_narrow (temp_object.in (),
-                                       ACE_TRY_ENV);
+        CosTime::TimeService::_narrow (temp_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -257,15 +257,15 @@ int
 Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
                       CosNaming::NamingContext_var server_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosNaming::Binding_var binding;
 
       if (!CORBA::is_nil (iter.in ()))
         {
-          while (iter->next_one (binding.out (),
-                                 ACE_TRY_ENV))
+          while (iter->next_one (binding.out ()
+                                 TAO_ENV_ARG_PARAMETER))
             {
               ACE_TRY_CHECK;
 
@@ -278,13 +278,13 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
               server_name[0].id = binding->binding_name[0].id;
 
               CORBA::Object_var temp_object =
-                server_context->resolve (server_name,
-                                         ACE_TRY_ENV);
+                server_context->resolve (server_name
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CosTime::TimeService_ptr server =
-                CosTime::TimeService::_narrow (temp_object.in (),
-                                               ACE_TRY_ENV);
+                CosTime::TimeService::_narrow (temp_object.in ()
+                                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->insert_server (server);
@@ -311,15 +311,15 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
 int
 Clerk_i::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the POA.
       this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
-                                         "my_child_poa",
-                                         ACE_TRY_ENV);
+                                         "my_child_poa"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_ptr child_poa
@@ -350,7 +350,7 @@ Clerk_i::init_naming_service (void)
 int
 Clerk_i::create_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -368,8 +368,8 @@ Clerk_i::create_clerk (void)
 
       // Convert the clerk reference to a string.
       CORBA::String_var objref_clerk =
-        this->orb_->object_to_string (this->time_service_clerk_.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->object_to_string (this->time_service_clerk_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the clerk IOR on the console.
@@ -405,11 +405,11 @@ Clerk_i::create_clerk (void)
 int
 Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->my_name_server_->resolve
-        (clerk_context_name, ACE_TRY_ENV);
+        (clerk_context_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, userex)
@@ -427,7 +427,7 @@ Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name)
 int
 Clerk_i::register_clerk (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Bind the Clerk in its appropriate Context.
@@ -440,12 +440,12 @@ Clerk_i::register_clerk (void)
 
       if (if_first_clerk (clerk_context_name))
         {
-          clerk_context = this->my_name_server_->new_context (ACE_TRY_ENV);
+          clerk_context = this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->my_name_server_->rebind_context (clerk_context_name,
-                                                 clerk_context.in (),
-                                                 ACE_TRY_ENV);
+                                                 clerk_context.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -466,8 +466,8 @@ Clerk_i::register_clerk (void)
       clerk_name[1].id = CORBA::string_dup (clerk_mc_name);
 
       this->my_name_server_->rebind (clerk_name,
-                                     this->time_service_clerk_.in (),
-                                     ACE_TRY_ENV);
+                                     this->time_service_clerk_.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -485,8 +485,8 @@ Clerk_i::register_clerk (void)
 
 int
 Clerk_i::init (int argc,
-               char *argv[],
-               CORBA::Environment &ACE_TRY_ENV)
+               char *argv[]
+               TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -502,15 +502,15 @@ Clerk_i::init (int argc,
 
 
       this->orb_manager_.init (argc,
-                               argv,
-                               ACE_TRY_ENV);
+                               argv
+                               TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (this->orb_manager_.init_child_poa (argc,
                                              argv,
-                                             "child_poa",
-                                             ACE_TRY_ENV) == -1)
+                                             "child_poa"
+                                             TAO_ENV_ARG_PARAMETER) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "init_child_poa"),
@@ -570,12 +570,12 @@ Clerk_i::init (int argc,
 }
 
 int
-Clerk_i::run (CORBA::Environment &ACE_TRY_ENV)
+Clerk_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Run the main event loop for the ORB.
-      int r = this->orb_manager_.run (ACE_TRY_ENV);
+      int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 03451f8de23..d8ca7098d1a 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -51,11 +51,11 @@ public:
   // Set of available Time servers.
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Clerk state - parsing arguments and waiting.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
 private:
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 5716e4c51fb..b236ddced1a 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -63,15 +63,15 @@ Server_i::parse_args (void)
 // with it.
 
 int
-Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Initialize the POA.
       this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
-                                         "child_poa",
-                                         ACE_TRY_ENV);
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_ptr child_poa
@@ -105,7 +105,7 @@ Server_i::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 int
 Server_i::create_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -117,19 +117,19 @@ Server_i::create_server (void)
       // Register a servant with the child poa.
       CORBA::String_var server_str =
         this->orb_manager_.activate_under_child_poa ("server",
-                                                     this->time_service_server_impl_,
-                                                     ACE_TRY_ENV);
+                                                     this->time_service_server_impl_
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("server");
 
       CORBA::Object_var server_ref =
-        this->orb_manager_.child_poa ()->id_to_reference (id.in (),
-                                                          ACE_TRY_ENV);
+        this->orb_manager_.child_poa ()->id_to_reference (id.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
 
-      this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in (),
-                                                                  ACE_TRY_ENV);
+      this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in ()
+                                                                  TAO_ENV_ARG_PARAMETER);
 
 
       ACE_TRY_CHECK;
@@ -140,8 +140,8 @@ Server_i::create_server (void)
       //Convert the server reference to a string.
 
       CORBA::String_var objref_server =
-        this->orb_->object_to_string (server_ref.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->object_to_string (server_ref.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 
       // Print the server IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -178,11 +178,11 @@ Server_i::create_server (void)
 int
 Server_i::if_first_server (CosNaming::Name &server_context_name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->my_name_server_->resolve
-        (server_context_name, ACE_TRY_ENV);
+        (server_context_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, userex)
@@ -200,7 +200,7 @@ Server_i::if_first_server (CosNaming::Name &server_context_name)
 int
 Server_i::register_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosNaming::Name server_context_name;
@@ -216,13 +216,13 @@ Server_i::register_server (void)
         {
           // Get context.
           server_context =
-            this->my_name_server_->new_context (ACE_TRY_ENV);
+            this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Bind.
           this->my_name_server_->rebind_context (server_context_name,
-                                                 server_context.in (),
-                                                 ACE_TRY_ENV);
+                                                 server_context.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -241,8 +241,8 @@ Server_i::register_server (void)
       // to the Naming Server.
 
       this->my_name_server_->rebind (server_name,
-                                     this->time_service_server_.in (),
-                                     ACE_TRY_ENV);
+                                     this->time_service_server_.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -266,8 +266,8 @@ Server_i::register_server (void)
 
 int
 Server_i::init (int argc,
-                char *argv[],
-                CORBA::Environment &ACE_TRY_ENV)
+                char *argv[]
+                TAO_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -280,8 +280,8 @@ Server_i::init (int argc,
 
       if (this->orb_manager_.init_child_poa (argc,
                                              argv,
-                                             "time_server",
-                                             ACE_TRY_ENV) == -1)
+                                             "time_server"
+                                             TAO_ENV_ARG_PARAMETER) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                                  "%p\n",
                                  "init_child_poa"),
@@ -289,7 +289,7 @@ Server_i::init (int argc,
       ACE_TRY_CHECK;
 
       // Activate the POA Manager.
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = this->parse_args ();
@@ -301,7 +301,7 @@ Server_i::init (int argc,
       this->orb_ = this->orb_manager_.orb ();
 
       // Use the Naming Service Register the above implementation with the Naming Service.
-      this->init_naming_service (ACE_TRY_ENV);
+      this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -326,9 +326,9 @@ Server_i::init (int argc,
 // Run the event loop for ORB.
 
 int
-Server_i::run (CORBA::Environment &ACE_TRY_ENV)
+Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  int retval = this->orb_manager_.run (ACE_TRY_ENV);
+  int retval = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (retval == -1)
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 601719fde7e..34c2655d5e8 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -41,14 +41,14 @@ public:
   // Destructor.
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Server state.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
-  int init_naming_service (CORBA::Environment &env);
+  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Initialises the name server.
 
   int create_server (void);
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 2981d3cf77f..4e85190ecb0 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -14,16 +14,16 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service clerk\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int r = clerk.init (argc, argv, ACE_TRY_ENV);
+      int r = clerk.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return 1;
       else
         {
-          clerk.run (ACE_TRY_ENV);
+          clerk.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index aa52590160f..852dead7510 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -14,17 +14,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service server\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int r = server.init (argc, argv, ACE_TRY_ENV);
+      int r = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index 0e128784ca2..309df532cb9 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -12,12 +12,12 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       int check =
-        trader.init (argc, argv, ACE_TRY_ENV);
+        trader.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (check != -1)
         {
-          trader.run (ACE_TRY_ENV);
+          trader.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 423fad6ec41..00edb488e47 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -47,8 +47,8 @@ Trading_Service::~Trading_Service (void)
 
 int
 Trading_Service::init (int argc,
-                       char *argv[],
-                       CORBA::Environment &)
+                       char *argv[]
+                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   int result_trader =
     this->trading_loader_.init (argc, argv);
@@ -60,12 +60,12 @@ Trading_Service::init (int argc,
 }
 
 int
-Trading_Service::run (CORBA::Environment &ACE_TRY_ENV)
+Trading_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   Trading_Shutdown trading_shutdown (*this);
 
   int return_value =
-    this->trading_loader_.run (ACE_TRY_ENV);
+    this->trading_loader_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return return_value;
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 2bb42f91947..09cacc2af44 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -61,11 +61,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Trading Service with arguments.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the Trading Service.
 
   int shutdown (void);
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 5399f5e0ca0..4a51dcb8c13 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -24,8 +24,8 @@ TAO_CosEventChannelFactory_i::~TAO_CosEventChannelFactory_i (void)
 int
 TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
                                     const char* child_poa_name,
-                                    CosNaming::NamingContext_ptr naming,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CosNaming::NamingContext_ptr naming
+                                    TAO_ENV_ARG_DECL)
 {
   // Check if we have a parent poa.
   if (CORBA::is_nil (poa))
@@ -37,13 +37,13 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   // Create a UNIQUE_ID and USER_ID policy because we want the POA
   // to detect duplicates for us.
   PortableServer::IdUniquenessPolicy_var idpolicy =
-    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID,
-                                      ACE_TRY_ENV);
+    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::IdAssignmentPolicy_var assignpolicy =
-    poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                      ACE_TRY_ENV);
+    poa->create_id_assignment_policy (PortableServer::USER_ID
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create a PolicyList
@@ -55,22 +55,22 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
     PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ());
 
   PortableServer::POAManager_ptr manager =
-    poa->the_POAManager (ACE_TRY_ENV);
+    poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   // @@ Pradeep : TODO - find a way to destroy the policy_list if we return here.
 
   // Create the child POA.
   this->poa_ = poa->create_POA (child_poa_name,
                                 manager,
-                                policy_list,
-                                ACE_TRY_ENV);
+                                policy_list
+                                TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
-  idpolicy->destroy (ACE_TRY_ENV);
+  idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  assignpolicy->destroy (ACE_TRY_ENV);
+  assignpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //this->poa_ =  PortableServer::POA::_duplicate (poa);
@@ -80,8 +80,8 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
 
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::create (const char * channel_id,
-                                      CORBA::Boolean store_in_naming_service,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Boolean store_in_naming_service
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventChannelFactory::DuplicateChannel,
@@ -99,7 +99,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
       // let all those contained in FactoryEC use the default POA.
       // We only need the FactoryEC's to be unique!
-      PortableServer::POA_ptr defPOA = this->_default_POA (ACE_TRY_ENV);
+      PortableServer::POA_ptr defPOA = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_CEC_EventChannel_Attributes attr (defPOA, defPOA);
@@ -112,18 +112,18 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
       auto_ptr <TAO_CEC_EventChannel> ec (impl);
 
-      impl->activate (ACE_TRY_ENV);
+      impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->poa_->activate_object_with_id (oid.in (),
-                                           ec.get (),
-                                           ACE_TRY_ENV);
+                                           ec.get ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ec.release ();
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in (), ACE_TRY_ENV);
+        this->poa_->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (store_in_naming_service &&
@@ -134,8 +134,8 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
           name[0].id = CORBA::string_dup (channel_id);
 
           this->naming_->rebind (name,
-                                 obj.in (),
-                                 ACE_TRY_ENV);
+                                 obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -191,8 +191,8 @@ void
 TAO_CosEventChannelFactory_i::destroy
 (
  const char * channel_id,
- CORBA::Boolean unbind_from_naming_service,
- CORBA::Environment &ACE_TRY_ENV
+ CORBA::Boolean unbind_from_naming_service
+ TAO_ENV_ARG_DECL
  )
  ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -208,16 +208,16 @@ TAO_CosEventChannelFactory_i::destroy
         PortableServer::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in (),
-                                     ACE_TRY_ENV);
+        this->poa_->id_to_reference (oid.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var fact_ec =
-        CosEventChannelAdmin::EventChannel::_narrow (obj.in (),
-                                                     ACE_TRY_ENV);
+        CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      fact_ec->destroy (ACE_TRY_ENV);
+      fact_ec->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Remove from the naming service.
@@ -228,8 +228,8 @@ TAO_CosEventChannelFactory_i::destroy
           name.length (1);
           name[0].id = CORBA::string_dup (channel_id);
 
-          this->naming_->unbind (name,
-                                 ACE_TRY_ENV);
+          this->naming_->unbind (name
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -256,8 +256,8 @@ TAO_CosEventChannelFactory_i::destroy
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::find
 (
- const char * channel_id,
- CORBA::Environment &ACE_TRY_ENV
+ const char * channel_id
+ TAO_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -274,8 +274,8 @@ TAO_CosEventChannelFactory_i::find
         PortableServer::string_to_ObjectId (channel_id);
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in (),
-                                     ACE_TRY_ENV);
+        this->poa_->id_to_reference (oid.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -294,8 +294,8 @@ TAO_CosEventChannelFactory_i::find
 char*
 TAO_CosEventChannelFactory_i::find_channel_id
 (
- CosEventChannelAdmin::EventChannel_ptr channel,
- CORBA::Environment &ACE_TRY_ENV
+ CosEventChannelAdmin::EventChannel_ptr channel
+ TAO_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -308,8 +308,8 @@ TAO_CosEventChannelFactory_i::find_channel_id
   ACE_TRY
     {
       PortableServer::ObjectId_var oid =
-        this->poa_->reference_to_id (channel,
-                                     ACE_TRY_ENV);
+        this->poa_->reference_to_id (channel
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       str_return = PortableServer::ObjectId_to_string (oid.in ());
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index ade9cd1cc75..c15937667e5 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -50,8 +50,8 @@ class TAO_CosEventChannelFactory_i :
 
   int init (PortableServer::POA_ptr poa,
             const char* child_poa_name,
-            CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil (),
-            CORBA::Environment &ACE_TRY_ENV =  CORBA::Environment::default_environment ());
+            CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ()
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // This method creates a child poa with <poa> as the
   // parent. It also accepts a Naming_Context which is used to register
   // the event channels if specified.
@@ -66,7 +66,7 @@ class TAO_CosEventChannelFactory_i :
   //    doesn't have to be exposed through the IDL interface. Anyway,
   //    there must be a way to cleanup any resources created by the
   //    factory, and you must avoid CORBA calls in the destructor,
-  //    first because you won't have an ACE_TRY_ENV and second because
+  //    first because you won't have an TAO_ENV_SINGLE_ARG_PARAMETER and second because
   //    exceptions in destructors are evil.
   // @@ Pradeep: anyway you can just use exceptions and not return -1?
 
@@ -74,8 +74,8 @@ class TAO_CosEventChannelFactory_i :
   virtual CosEventChannelAdmin::EventChannel_ptr create
     (
      const char * channel_id,
-     CORBA::Boolean store_in_naming_service,
-     CORBA::Environment &ACE_TRY_ENV
+     CORBA::Boolean store_in_naming_service
+     TAO_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -86,8 +86,8 @@ class TAO_CosEventChannelFactory_i :
   virtual void destroy
     (
      const char * channel_id,
-     CORBA::Boolean unbind_from_naming_service,
-     CORBA::Environment &ACE_TRY_ENV
+     CORBA::Boolean unbind_from_naming_service
+     TAO_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -96,8 +96,8 @@ class TAO_CosEventChannelFactory_i :
 
   virtual CosEventChannelAdmin::EventChannel_ptr find
     (
-     const char * channel_id,
-     CORBA::Environment &ACE_TRY_ENV
+     const char * channel_id
+     TAO_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -106,8 +106,8 @@ class TAO_CosEventChannelFactory_i :
 
   virtual char * find_channel_id
     (
-     CosEventChannelAdmin::EventChannel_ptr channel,
-     CORBA::Environment &ACE_TRY_ENV
+     CosEventChannelAdmin::EventChannel_ptr channel
+     TAO_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index f281e089dbf..78916b722b6 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -20,39 +20,39 @@ public:
   virtual ~FactoryClient (void);
   // destructor.
 
-  void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_factory (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_factory (TAO_ENV_SINGLE_ARG_DECL);
   // Try to resolve the factory from the Naming service.
 
   CosEventChannelFactory::ChannelFactory_ptr
-  create_factory (CORBA::Environment &ACE_TRY_ENV);
+  create_factory (TAO_ENV_SINGLE_ARG_DECL);
   // Create a local Factory and also set the <factory_>.
 
-  virtual void run_test (CORBA::Environment &ACE_TRY_ENV);
+  virtual void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // Runs a couple of tests to check if the factory behaves correctly.
 
 protected:
   CosEventChannelAdmin::EventChannel_ptr
       create_channel (const char *channel_id,
-                     CosEventChannelFactory::ChannelFactory_ptr factory,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CosEventChannelFactory::ChannelFactory_ptr factory
+                     TAO_ENV_ARG_DECL);
   // Create a channel.
 
-  void destroy_channel (const char *channel_id,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void destroy_channel (const char *channel_id
+                       TAO_ENV_ARG_DECL);
   // Destroy the channel.
 
-  void find_channel (const char* channel_id,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void find_channel (const char* channel_id
+                    TAO_ENV_ARG_DECL);
   // Find a channel.
 
-  void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
+                       TAO_ENV_ARG_DECL);
   // Find a channel.
 
   // = Protected Data members.
@@ -86,22 +86,22 @@ FactoryClient::~FactoryClient (void)
 
 void
 FactoryClient::init_ORB (int argc,
-                       char *argv [],
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char *argv []
+                       TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FactoryClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+FactoryClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("NameService"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -109,14 +109,14 @@ FactoryClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->use_naming_service = 1;
 }
 
 void
-FactoryClient::resolve_factory (CORBA::Environment &ACE_TRY_ENV)
+FactoryClient::resolve_factory (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (this->use_naming_service == 1);
 
@@ -125,18 +125,18 @@ FactoryClient::resolve_factory (CORBA::Environment &ACE_TRY_ENV)
   name[0].id = CORBA::string_dup (this->factory_name_);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_context_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->factory_ =
-    CosEventChannelFactory::ChannelFactory::_narrow (obj.in (),
-                                                     ACE_TRY_ENV);
+    CosEventChannelFactory::ChannelFactory::_narrow (obj.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelFactory::ChannelFactory_ptr
-FactoryClient::create_factory (CORBA::Environment &ACE_TRY_ENV)
+FactoryClient::create_factory (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::UNKNOWN (),
                     CosEventChannelFactory::ChannelFactory::_nil ());
@@ -144,8 +144,8 @@ FactoryClient::create_factory (CORBA::Environment &ACE_TRY_ENV)
 
 CosEventChannelAdmin::EventChannel_ptr
 FactoryClient::create_channel (const char *channel_id,
-                            CosEventChannelFactory::ChannelFactory_ptr factory,
-                              CORBA::Environment &ACE_TRY_ENV)
+                            CosEventChannelFactory::ChannelFactory_ptr factory
+                              TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Trying to create channel %s\n", channel_id));
@@ -156,8 +156,8 @@ FactoryClient::create_channel (const char *channel_id,
   ACE_TRY
     {
       ec = factory->create (channel_id,
-                            this->use_naming_service,
-                            ACE_TRY_ENV);
+                            this->use_naming_service
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (!CORBA::is_nil (ec.in ()));
@@ -184,22 +184,22 @@ FactoryClient::create_channel (const char *channel_id,
 }
 
 void
-FactoryClient::destroy_channel (const char *channel_id,
-                               CORBA::Environment &ACE_TRY_ENV)
+FactoryClient::destroy_channel (const char *channel_id
+                               TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Destroying Cos Event Channel \"%s \"\n",
               channel_id));
 
   this->factory_->destroy (channel_id,
-                           use_naming_service,
-                           ACE_TRY_ENV);
+                           use_naming_service
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FactoryClient::find_channel (const char* channel_id,
-                            CORBA::Environment &ACE_TRY_ENV)
+FactoryClient::find_channel (const char* channel_id
+                            TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -208,22 +208,22 @@ FactoryClient::find_channel (const char* channel_id,
                   channel_id));
 
       CosEventChannelAdmin::EventChannel_var channel =
-        this->factory_->find (channel_id,
-                              ACE_TRY_ENV);
+        this->factory_->find (channel_id
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       CORBA::String_var str =
-        orb_->object_to_string (channel.in (),
-                                ACE_TRY_ENV);
+        orb_->object_to_string (channel.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
               "Find returned - %s \n",
                   str.in ()));
 
-      this->find_channel_id (channel.in (),
-                             ACE_TRY_ENV);
+      this->find_channel_id (channel.in ()
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
@@ -240,12 +240,12 @@ FactoryClient::find_channel (const char* channel_id,
 }
 
 void
-FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel,
-                                CORBA::Environment &ACE_TRY_ENV)
+FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
+                                TAO_ENV_ARG_DECL)
 {
   CORBA::String_var str =
-    orb_->object_to_string (channel,
-                            ACE_TRY_ENV);
+    orb_->object_to_string (channel
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -253,8 +253,8 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel,
               str.in ()));
 
   char *channel_id =
-    this->factory_->find_channel_id (channel,
-                                     ACE_TRY_ENV);
+    this->factory_->find_channel_id (channel
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -266,7 +266,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel,
  */
 
 void
-FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV)
+FactoryClient::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->factory_.in ()));
 
@@ -275,86 +275,86 @@ FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV)
 
   // create the first cosec
   cosec[0] = this->create_channel (channel_id[0],
-                                   this->factory_.in (),
-                                   ACE_TRY_ENV);
+                                   this->factory_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
  // create the second cosec
   cosec[1] = this->create_channel (channel_id[1],
-                                   this->factory_.in (),
-                                   ACE_TRY_ENV);
+                                   this->factory_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // create the third cosec
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in (),
-                                   ACE_TRY_ENV);
+                                   this->factory_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see it we can destroy this one..
-  this->destroy_channel (channel_id[2],
-                         ACE_TRY_ENV);
+  this->destroy_channel (channel_id[2]
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if we can find it?
-  this->find_channel_id (cosec[2].in (),
-                         ACE_TRY_ENV);
+  this->find_channel_id (cosec[2].in ()
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if we can create it again?
   cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_.in (),
-                                   ACE_TRY_ENV);
+                                   this->factory_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // try and find a channel that does not exist.
-  this->find_channel ("areyouthere?",
-                      ACE_TRY_ENV);
+  this->find_channel ("areyouthere?"
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if it can detect duplicates.
   this->create_channel (channel_id[2],
-                        this->factory_.in (),
-                        ACE_TRY_ENV);
+                        this->factory_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if it can give us the id?
-  this->find_channel_id (cosec[0].in (),
-                         ACE_TRY_ENV);
+  this->find_channel_id (cosec[0].in ()
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->find_channel_id (cosec[1].in (),
-                         ACE_TRY_ENV);
+  this->find_channel_id (cosec[1].in ()
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->find_channel_id (cosec[2].in (),
-                         ACE_TRY_ENV);
+  this->find_channel_id (cosec[2].in ()
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // check if we can get the channels from the id.
-  this->find_channel (channel_id[0],
-                      ACE_TRY_ENV);
+  this->find_channel (channel_id[0]
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->find_channel (channel_id[1],
-                      ACE_TRY_ENV);
+  this->find_channel (channel_id[1]
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->find_channel (channel_id[2],
-                      ACE_TRY_ENV);
+  this->find_channel (channel_id[2]
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //destroy them all.
-  this->destroy_channel (channel_id[0],
-                         ACE_TRY_ENV);
+  this->destroy_channel (channel_id[0]
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->destroy_channel (channel_id[1],
-                         ACE_TRY_ENV);
+  this->destroy_channel (channel_id[1]
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->destroy_channel (channel_id[2],
-                         ACE_TRY_ENV);
+  this->destroy_channel (channel_id[2]
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // end of testing.
@@ -372,16 +372,16 @@ main (int argc, char *argv [])
       FactoryClient ft;
 
       ft.init_ORB (argc,
-                   argv,
-                   ACE_TRY_ENV);
+                   argv
+                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_TRY_EX (naming)
         {
-          ft.resolve_naming_service (ACE_TRY_ENV);
+          ft.resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (naming);
 
-          ft.resolve_factory (ACE_TRY_ENV);
+          ft.resolve_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (naming);
         }
       ACE_CATCHANY
@@ -391,12 +391,12 @@ main (int argc, char *argv [])
           ACE_DEBUG ((LM_DEBUG,
                       "Creating a local Factory\n"));
           // TBD:
-          ft.create_factory (ACE_TRY_ENV);
+          ft.create_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_ENDTRY;
 
-      ft.run_test (ACE_TRY_ENV);
+      ft.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index d42c978af56..f769ac17c68 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -52,13 +52,13 @@ FactoryDriver::parse_args (int argc, char *argv [])
 int
 FactoryDriver::start (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       orb_ = CORBA::ORB_init (argc,
                               argv,
-                              "",
-                              ACE_TRY_ENV);
+                              ""
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv) == -1)
@@ -70,8 +70,8 @@ FactoryDriver::start (int argc, char *argv [])
                       -1);
 
       CORBA::Object_var poa_object  =
-        orb_->resolve_initial_references("RootPOA",
-                                         ACE_TRY_ENV);
+        orb_->resolve_initial_references("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -80,16 +80,16 @@ FactoryDriver::start (int argc, char *argv [])
                           -1);
 
       root_poa_ =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa_->the_POAManager (ACE_TRY_ENV);
+        root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -105,24 +105,24 @@ FactoryDriver::start (int argc, char *argv [])
 
       if (factory_servant_->init (root_poa_.in (),
                                   child_poa_name_,
-                                  context.in (),
-                                 ACE_TRY_ENV) != 0)
+                                  context.in ()
+                                 TAO_ENV_ARG_PARAMETER) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Unable to initialize "
                            "the factory. \n"),
                           1);
 
       // activate the factory in the root poa.
-      factory_ = factory_servant_->_this (ACE_TRY_ENV);
+      factory_ = factory_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give the ownership to the POA.
-      factory_servant_->_remove_ref (ACE_TRY_ENV);
+      factory_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       CORBA::String_var
-        str = orb_->object_to_string (factory_.in (),
-                                      ACE_TRY_ENV);
+        str = orb_->object_to_string (factory_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -133,8 +133,8 @@ FactoryDriver::start (int argc, char *argv [])
       name.length (1);
       name[0].id = CORBA::string_dup (factoryName_);
       naming_client_->rebind (name,
-                              factory_.in (),
-                              ACE_TRY_ENV);
+                              factory_.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index bbab4d8b2a4..65d41b4784b 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -18,30 +18,30 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
 }
 
 void
-RtEC_Based_CosEC::init_ORB  (int& argc, char *argv [],
-                             CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::init_ORB  (int& argc, char *argv []
+                             TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in (),
-                                  ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_TRY_ENV);
+    this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -99,44 +99,44 @@ RtEC_Based_CosEC::parse_args (int argc, char *argv [])
 }
 
 void
-RtEC_Based_CosEC::startup (int argc, char *argv[],
-                           CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::startup (int argc, char *argv[]
+                           TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Starting up the CosEvent Service...\n"));
 
   // initalize the ORB.
-  this->init_ORB (argc, argv,
-                  ACE_TRY_ENV);
+  this->init_ORB (argc, argv
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->parse_args (argc, argv) == -1)
     ACE_THROW (CORBA::BAD_PARAM ());
 
-  this->resolve_naming_service (ACE_TRY_ENV);
+  this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->init (this->poa_.in (),
               this->poa_.in (),
               this->eventTypeIds_,
               this->eventSourceIds_,
-              this->source_type_pairs_,
-              ACE_TRY_ENV);
+              this->source_type_pairs_
+              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->activate (ACE_TRY_ENV);
+  this->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Register ourselves with the naming service.
   ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
 
   CORBA::Object_var obj =
-    this->poa_->servant_to_reference (this,
-                                      ACE_TRY_ENV);
+    this->poa_->servant_to_reference (this
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -147,8 +147,8 @@ RtEC_Based_CosEC::startup (int argc, char *argv[],
   name[0].id = CORBA::string_dup (this->service_name);
 
   this->naming_->rebind (name,
-                         obj.in (),
-                         ACE_TRY_ENV);
+                         obj.in ()
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -157,28 +157,28 @@ RtEC_Based_CosEC::startup (int argc, char *argv[],
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-RtEC_Based_CosEC::create_rtec (CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::create_rtec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // see if the user wants a local RtEC..
   if (this->remote_rtec_ == 0)
-    return CosEC_ServantBase::create_rtec (ACE_TRY_ENV);
+    return CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
   else
     return 0;
 }
 
 void
-RtEC_Based_CosEC::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::activate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // see if the user wants to use a local RtEC..
   if (this->remote_rtec_ == 0)
     {
-      CosEC_ServantBase::activate_rtec (ACE_TRY_ENV);
+      CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       // Try to locate a remote rtec.
-      this->locate_rtec (ACE_TRY_ENV);
+      this->locate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Use the return value to check success.
@@ -189,18 +189,18 @@ RtEC_Based_CosEC::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-RtEC_Based_CosEC::deactivate_rtec (CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Check if the local rtec is to be deactivated.
   if (this->remote_rtec_ == 0)
     {
-      CosEC_ServantBase::deactivate_rtec (ACE_TRY_ENV);
+      CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-RtEC_Based_CosEC::locate_rtec (CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::locate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name ref_name (1);
   ref_name.length (1);
@@ -208,22 +208,22 @@ RtEC_Based_CosEC::locate_rtec (CORBA::Environment &ACE_TRY_ENV)
     CORBA::string_dup (this->rt_service_name);
 
   CORBA::Object_var obj =
-    this->naming_->resolve (ref_name,
-                            ACE_TRY_ENV);
+    this->naming_->resolve (ref_name
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rtec_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (obj.in (),
-                                                  ACE_TRY_ENV);
+    RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RtEC_Based_CosEC::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("NameService"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -231,8 +231,8 @@ RtEC_Based_CosEC::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                       ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -243,7 +243,7 @@ RtEC_Based_CosEC::run (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -256,10 +256,10 @@ RtEC_Based_CosEC::run (void)
 }
 
 void
-RtEC_Based_CosEC::shutdown (CORBA::Environment &ACE_TRY_ENV)
+RtEC_Based_CosEC::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Unbind from the naming service.
@@ -267,8 +267,8 @@ RtEC_Based_CosEC::shutdown (CORBA::Environment &ACE_TRY_ENV)
   name.length (1);
   name[0].id = CORBA::string_dup (this->service_name);
 
-  this->naming_->unbind (name,
-                         ACE_TRY_ENV);
+  this->naming_->unbind (name
+                         TAO_ENV_ARG_PARAMETER);
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -285,8 +285,8 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       service.startup (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (service.run () == -1)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index f3dfb3921c7..e11b80438af 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -43,8 +43,8 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   int parse_args (int argc, char *argv []);
   // Parses the command line arguments.
 
-  void startup (int argc, char *argv[],
-               CORBA::Environment &ACE_TRY_ENV);
+  void startup (int argc, char *argv[]
+               TAO_ENV_ARG_DECL);
   // Initializes the COS Event Service.
   // Returns 0 on success, -1 on error.
 
@@ -52,31 +52,30 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   // run the COS Event Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Shutdown the COS Event Service.
   // Returns 0 on success, -1 on error.
 
 protected:
   // = Methods from CosEC_ServantBase
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (CORBA::Environment &ACE_TRY_ENV);
+  create_rtec (TAO_ENV_SINGLE_ARG_DECL);
   // Create a local rtec.
 
-  virtual void activate_rtec (CORBA::Environment &ACE_TRY_ENV);
+  virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL);
   // Activates the rtec.
 
-  virtual void deactivate_rtec (CORBA::Environment &ACE_TRY_ENV);
+  virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivates the rtec.
 
-  void init_ORB (int& argc, char *argv [],
-                 CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int& argc, char *argv []
+                 TAO_ENV_ARG_DECL);
   // initialize the ORB.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
-  void locate_rtec (CORBA::Environment &ACE_TRY_ENV);
+  void locate_rtec (TAO_ENV_SINGLE_ARG_DECL);
   // Locate a rtec.
 
   // = Data members
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index e8663c996d8..5f9be775b2d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -33,8 +33,8 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
                          PortableServer::POA_ptr poa,
                          char *,
                          char *,
-                         char *,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         char *
+                         TAO_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (thispoa));
   ACE_ASSERT (!CORBA::is_nil (poa));
@@ -44,11 +44,11 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
   this->poa_ = PortableServer::POA::_duplicate (poa);
 
   auto_ptr<POA_RtecEventChannelAdmin::EventChannel>
-    auto_rtec_servant_ (this->create_rtec (ACE_TRY_ENV));
+    auto_rtec_servant_ (this->create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
 
   auto_ptr<TAO_CosEC_EventChannel_i>
-    auto_cosec_servant_ (this->create_cosec (ACE_TRY_ENV));
+    auto_cosec_servant_ (this->create_cosec (TAO_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
 
   // if all the servants were allocated then set the class pointers.
@@ -57,17 +57,17 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
 }
 
 int
-CosEC_ServantBase::activate (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
 
   // Activate the Rtec
-  this->activate_rtec (ACE_TRY_ENV);
+  this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Activate the CosEC
-  int retval = this->activate_cosec (ACE_TRY_ENV);
+  int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (retval != 0)
     return -1;
@@ -76,34 +76,34 @@ CosEC_ServantBase::activate (CORBA::Environment &ACE_TRY_ENV)
    // Note that the POA is <thispoa_>
 
    PortableServer::ObjectId_var oid =
-     this->thispoa_->activate_object (this,
-                                      ACE_TRY_ENV);
+     this->thispoa_->activate_object (this
+                                      TAO_ENV_ARG_PARAMETER);
    ACE_CHECK_RETURN (-1);
 
-   this->_remove_ref (ACE_TRY_ENV);
+   this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
    ACE_CHECK_RETURN (-1);
 
    CORBA::Object_var obj =
-     this->thispoa_->id_to_reference (oid.in (),
-                                      ACE_TRY_ENV);
+     this->thispoa_->id_to_reference (oid.in ()
+                                      TAO_ENV_ARG_PARAMETER);
    ACE_CHECK_RETURN (-1);
 
    return 0; // success.
 }
 
 int
-CosEC_ServantBase::activate (const char* servant_id,
-                             CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::activate (const char* servant_id
+                             TAO_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
 
   // Activate the Rtec
-  this->activate_rtec (ACE_TRY_ENV);
+  this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Activate the CosEC
-  int retval = this->activate_cosec (ACE_TRY_ENV);
+  int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (retval != 0)
     return -1;
@@ -114,36 +114,36 @@ CosEC_ServantBase::activate (const char* servant_id,
   // Activate ourselves.
   // Note that the POA is <thispoa_>
   this->thispoa_->activate_object_with_id (oid.in (),
-                                           this,
-                                           ACE_TRY_ENV);
+                                           this
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->_remove_ref (ACE_TRY_ENV);
+  this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var obj =
-    this->thispoa_->id_to_reference (oid.in (),
-                                     ACE_TRY_ENV);
+    this->thispoa_->id_to_reference (oid.in ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0; // success.
 }
 
 void
-CosEC_ServantBase::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Activate the Rtec
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->rtec_servant_,
-                                 ACE_TRY_ENV);
+    this->poa_->activate_object (this->rtec_servant_
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->rtec_servant_->_remove_ref (ACE_TRY_ENV);
+  this->rtec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in (),
-                                 ACE_TRY_ENV);
+    this->poa_->id_to_reference (oid.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rtec_ =
@@ -151,7 +151,7 @@ CosEC_ServantBase::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-CosEC_ServantBase::activate_cosec (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL)
 {
  // Initialize the CosEC servant.
   RtecBase::handle_t supp_handle = 0;
@@ -175,23 +175,23 @@ CosEC_ServantBase::activate_cosec (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->cosec_servant_->init (consumerqos,
                                   supplierqos,
-                                  this->rtec_.in (),
-                                  ACE_TRY_ENV) != 0)
+                                  this->rtec_.in ()
+                                  TAO_ENV_ARG_PARAMETER) != 0)
     return -1;
   ACE_CHECK_RETURN (-1);
 
   // Activate the CosEC
   PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->cosec_servant_,
-                                 ACE_TRY_ENV);
+    this->poa_->activate_object (this->cosec_servant_
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->cosec_servant_->_remove_ref (ACE_TRY_ENV);
+  this->cosec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid.in (),
-                                 ACE_TRY_ENV);
+    this->poa_->id_to_reference (oid.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->cosec_ =
@@ -200,84 +200,84 @@ CosEC_ServantBase::activate_cosec (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CosEC_ServantBase::deactivate (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate all those we control...
-  this->deactivate_rtec (ACE_TRY_ENV);
+  this->deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->deactivate_cosec (ACE_TRY_ENV);
+  this->deactivate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Finally we go away..
   PortableServer::ObjectId_var oid =
-    this->thispoa_->servant_to_id (this,
-                                   ACE_TRY_ENV);
+    this->thispoa_->servant_to_id (this
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
-  this->thispoa_->deactivate_object (oid.in (),
-                                     ACE_TRY_ENV);
+  this->thispoa_->deactivate_object (oid.in ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CosEC_ServantBase::deactivate_rtec (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate the rtec.
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->rtec_servant_,
-                               ACE_TRY_ENV);
+    this->poa_->servant_to_id (this->rtec_servant_
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in (),
-                                 ACE_TRY_ENV);
+  this->poa_->deactivate_object (oid.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CosEC_ServantBase::deactivate_cosec (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate the cosec.
   PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->cosec_servant_,
-                               ACE_TRY_ENV);
+    this->poa_->servant_to_id (this->cosec_servant_
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
-  this->poa_->deactivate_object (oid.in (),
-                                 ACE_TRY_ENV);
+  this->poa_->deactivate_object (oid.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-CosEC_ServantBase::for_consumers (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->cosec_->for_consumers (ACE_TRY_ENV);
+  return this->cosec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-CosEC_ServantBase::for_suppliers (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->cosec_->for_suppliers (ACE_TRY_ENV);
+  return this->cosec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-CosEC_ServantBase::destroy (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate all the contained servants and ourselves.
   // The poa will "destroy" the ref counted servants.
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEC_ServantBase::create_rtec (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Create the RtEC servant.
   TAO_EC_Event_Channel_Attributes attr (this->poa_.in (),
@@ -292,7 +292,7 @@ CosEC_ServantBase::create_rtec (CORBA::Environment &ACE_TRY_ENV)
 }
 
 TAO_CosEC_EventChannel_i*
-CosEC_ServantBase::create_cosec (CORBA::Environment &ACE_TRY_ENV)
+CosEC_ServantBase::create_cosec (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Create the CosEC servant.
   TAO_CosEC_EventChannel_i* _cosec_servant;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index f77b0f725f8..129acbaee48 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -58,55 +58,55 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
                      PortableServer::POA_ptr poa,
                      char *eventTypeIds,
                      char *eventSourceIds,
-                     char *source_type_pairs,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     char *source_type_pairs
+                     TAO_ENV_ARG_DECL);
   // This method creates a local scheduler, rtec and cosec.
   // The POA <poa> specified here is used when <activate> is called to
   // activate the contained servants.
   // The POA <thispoa> is used to activate this.
 
-  int activate (CORBA::Environment &ACE_TRY_ENV);
+  int activate (TAO_ENV_SINGLE_ARG_DECL);
   // Activates the CosEC with <thispoa_> and friends with the <poa_>
 
-  int activate (const char* servant_id, CORBA::Environment &ACE_TRY_ENV);
+  int activate (const char* servant_id TAO_ENV_ARG_DECL);
   // If the servant_id is not nil then it is used to supply the object id
   // for <this> servant.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivates the CosEC and friends with the POA.
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV)
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV)
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys this Event Channel object.
 
  protected:
   // = RtEC creation, activation and deactivation methods.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (CORBA::Environment &ACE_TRY_ENV);
+  create_rtec (TAO_ENV_SINGLE_ARG_DECL);
   // Create a local rtec.
 
-  virtual void activate_rtec (CORBA::Environment &ACE_TRY_ENV);
+  virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL);
   // Activates the rtec.
 
-  virtual void deactivate_rtec (CORBA::Environment &ACE_TRY_ENV);
+  virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivates the rtec.
 
   // = CosEC creation, activation and deactivation methods.
   TAO_CosEC_EventChannel_i*
-  create_cosec (CORBA::Environment &ACE_TRY_ENV);
+  create_cosec (TAO_ENV_SINGLE_ARG_DECL);
   // Create a local cosec.
 
-  int activate_cosec (CORBA::Environment &ACE_TRY_ENV);
+  int activate_cosec (TAO_ENV_SINGLE_ARG_DECL);
   // Activates the cosec.
 
-  void deactivate_cosec (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivates the cosec.
 
   void init_SupplierQOS (RtecBase::handle_t supp_handle,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index b6f5ca51e2c..5f5cac0743d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -19,8 +19,8 @@ TAO_CosEC_EventChannel_i::~TAO_CosEC_EventChannel_i (void)
 int
 TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
                                 const RtecEventChannelAdmin::SupplierQOS &supplierqos,
-                                RtecEventChannelAdmin::EventChannel_ptr rtec,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                RtecEventChannelAdmin::EventChannel_ptr rtec
+                                TAO_ENV_ARG_DECL)
 {
   // Allocate the admins..
   TAO_CosEC_ConsumerAdmin_i *consumer_;
@@ -38,7 +38,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
   auto_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_);
 
   RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin =
-    rtec->for_consumers (ACE_TRY_ENV);
+    rtec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (auto_consumer_.get ()->init (consumerqos,
@@ -46,15 +46,15 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
     return -1;
 
   this->consumeradmin_ =
-    auto_consumer_.get ()->_this (ACE_TRY_ENV);
+    auto_consumer_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // give the ownership to the POA.
-  auto_consumer_.get ()->_remove_ref (ACE_TRY_ENV);
+  auto_consumer_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin =
-    rtec->for_suppliers (ACE_TRY_ENV);
+    rtec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (auto_supplier_.get ()->init (supplierqos,
@@ -62,11 +62,11 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
     return -1;
 
   this->supplieradmin_ =
-    auto_supplier_.get ()->_this (ACE_TRY_ENV);
+    auto_supplier_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // give the ownership to the POA.
-  auto_supplier_.get ()->_remove_ref (ACE_TRY_ENV);
+  auto_supplier_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->consumer_admin_ = auto_consumer_.release ();
@@ -76,7 +76,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &)
+TAO_CosEC_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
@@ -86,7 +86,7 @@ TAO_CosEC_EventChannel_i::for_consumers (CORBA::Environment &)
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &)
+TAO_CosEC_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
@@ -96,20 +96,20 @@ TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &)
 }
 
 void
-TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplieradmin_ =  CosEventChannelAdmin::SupplierAdmin::_nil ();
@@ -117,9 +117,9 @@ TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_CosEC_EventChannel_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_EventChannel_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->destroy (ACE_TRY_ENV);
+  this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index a3fad3fa03b..fb7015ab3bf 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -58,26 +58,26 @@ public:
 
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             const RtecEventChannelAdmin::SupplierQOS &supplierqos,
-            RtecEventChannelAdmin::EventChannel_ptr rtec,
-            CORBA::Environment &ACE_TRY_ENV);
+            RtecEventChannelAdmin::EventChannel_ptr rtec
+            TAO_ENV_ARG_DECL);
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV)
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The for_consumers method will return the same ConsumerAdmin_ptr
   // everytime its called.
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV)
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The for_suppliers method will return the same SupplierAdmin_ptr
   // everytime its called.
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys this Event Channel object.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // destroys this Event Channel object and <delete>s this object.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index 9e4a3ea8239..c0f97807d8c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -32,7 +32,7 @@ public:
   ~TAO_CosEC_PushSupplierWrapper (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the push supplier.
 
@@ -64,24 +64,24 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
 }
 
 void
-TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ If we keep a list remember to remove this object from the
@@ -103,8 +103,8 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
+                                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::Event buffer[1];
@@ -137,36 +137,36 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
 
   e.data.any_value = data;
 
-  this->proxypushconsumer_->push (events,
-                                  ACE_TRY_ENV);
+  this->proxypushconsumer_->push (events
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->proxypushconsumer_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->proxypushconsumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate the ProxyPushConsumer
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier,
-                                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier
+                                                      TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected))
 {
@@ -184,17 +184,17 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
     auto_wrapper (wrapper);
 
   RtecEventComm::PushSupplier_ptr rtecpushsupplier
-    = auto_wrapper.get ()->_this (ACE_TRY_ENV);
+    = auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (ACE_TRY_ENV);
+  auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxypushconsumer_->connect_push_supplier
     (rtecpushsupplier,
-     this->qos_,
-     ACE_TRY_ENV);
+     this->qos_
+     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->wrapper_ = auto_wrapper.release ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index 6260267fce2..d999ed7ae5f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -61,17 +61,17 @@ public:
   ~TAO_CosEC_ProxyPushConsumer_i (void);
   // Destructor.
 
-  virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void push (const CORBA::Any &data
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the supplier from the event communication.
 
-  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier,
-                                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier
+                                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   // Connects a push supplier.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index 276baf913d2..f1597deac7c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -31,12 +31,12 @@ public:
   ~TAO_CosEC_PushConsumerWrapper (void);
   // Destructor.
 
-  virtual void push (const RtecEventComm::EventSet & data,
-                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void push (const RtecEventComm::EventSet & data
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the consumer from the event channel.
 
@@ -62,8 +62,8 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
+                                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0;
@@ -72,8 +72,8 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
     {
       ACE_TRY
         {
-          this->consumer_->push (set[i].data.any_value,
-                                 ACE_TRY_ENV);
+          this->consumer_->push (set[i].data.any_value
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -85,24 +85,24 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the supplier proxy.
-  this->consumer_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ If we keep a list remember to remove this object from the
@@ -125,24 +125,24 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pps_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->pps_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ If we keep a list remember to remove this object from the
@@ -150,8 +150,8 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer,
-                                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
+                                                      TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError))
@@ -172,16 +172,16 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer
 
   // @@ This code is not exception safe.
   RtecEventComm::PushConsumer_ptr  rtecpushconsumer =
-    auto_wrapper.get ()->_this (ACE_TRY_ENV);
+    auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (ACE_TRY_ENV);
+  auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->pps_->connect_push_consumer (rtecpushconsumer,
-                                     this->qos_,
-                                     ACE_TRY_ENV);
+                                     this->qos_
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->wrapper_ = auto_wrapper.release ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index 9ed4a9e2aff..bf5a7416264 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -54,12 +54,12 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Ends the event communication and disposes this object.
 
-  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer,
-                                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer
+                                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index 9f849ec75bc..99589e9178e 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -9,16 +9,16 @@ main (int argc, char *argv [])
 {
   Basic basic;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      basic.init (argc, argv, ACE_TRY_ENV);
+      basic.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      basic.run (ACE_TRY_ENV);
+      basic.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      basic.shutdown (ACE_TRY_ENV);
+      basic.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
@@ -50,29 +50,29 @@ Basic::~Basic (void)
 }
 
 void
-Basic::init (int argc, char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV)
+Basic::init (int argc, char *argv[]
+                   TAO_ENV_ARG_DECL)
 {
-  this->init_ORB (argc, argv, ACE_TRY_ENV);
+  this->init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->init_CosEC (ACE_TRY_ENV);
+  this->init_CosEC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Basic::init_ORB  (int argc, char *argv [],
-                        CORBA::Environment &ACE_TRY_ENV)
+Basic::init_ORB  (int argc, char *argv []
+                        TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object.in ()))
@@ -80,20 +80,20 @@ Basic::init_ORB  (int argc, char *argv [],
                 " (%P|%t) Unable to initialize the POA.\n"));
 
   root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in (),
-                                  ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_TRY_ENV);
+    root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Basic::init_CosEC (CORBA::Environment &ACE_TRY_ENV)
+Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosEC_ServantBase *ec = 0;
 
@@ -106,11 +106,11 @@ Basic::init_CosEC (CORBA::Environment &ACE_TRY_ENV)
 
   ec->init (this->root_poa_.in(),
             this->root_poa_.in(),
-            0,0,0,
-            ACE_TRY_ENV);
+            0,0,0
+            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  int retval = ec->activate (ACE_TRY_ENV);
+  int retval = ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (retval == -1)
@@ -118,39 +118,39 @@ Basic::init_CosEC (CORBA::Environment &ACE_TRY_ENV)
   // @@ look for more descriptive exception to throw here
 
   CORBA::Object_var obj =
-    this->root_poa_->servant_to_reference (ec, ACE_TRY_ENV);
+    this->root_poa_->servant_to_reference (ec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->cos_ec_ =
-    CosEventChannelAdmin::EventChannel::_narrow (obj._retn (),
-                                                 ACE_TRY_ENV);
+    CosEventChannelAdmin::EventChannel::_narrow (obj._retn ()
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Basic::run (CORBA::Environment &ACE_TRY_ENV)
+Basic::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Create an Any type to pass to the Cos EC.
   CORBA::Any any;
   any <<= (CORBA::Long)50;
 
   this->consumer_.open (this->cos_ec_.in (),
-                        this->orb_.in (),
-                        ACE_TRY_ENV);
+                        this->orb_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_.connect (ACE_TRY_ENV);
+  this->consumer_.connect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_.open (this->cos_ec_.in (),
-                        ACE_TRY_ENV);
+  this->supplier_.open (this->cos_ec_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_.connect (ACE_TRY_ENV);
+  this->supplier_.connect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_.send_event (any,
-                              ACE_TRY_ENV);
+  this->supplier_.send_event (any
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // this->orb_->run ();
@@ -163,14 +163,14 @@ Basic::run (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Basic::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Basic::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->supplier_.close (ACE_TRY_ENV);
+  this->supplier_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_.close (ACE_TRY_ENV);
+  this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->cos_ec_->destroy (ACE_TRY_ENV);
+  this->cos_ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
index 7003df0dc61..d504ea9ddc7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -36,23 +36,23 @@ public:
   ~Basic (void);
   // Destructor.
 
-  void init (int argc, char *argv[],CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv[] TAO_ENV_ARG_DECL);
   // Starts up an ORB and the CosEC.
   // Returns 0 on success, -1 on error.
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Connects a consumer and a supplier to the CosEC and sends 1 event
   // across.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Closes down the CosEC.
 
 private:
-  void init_ORB (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int argc, char *argv[] TAO_ENV_ARG_DECL);
   // initializes the ORB.
   // Returns 0 on success, -1 on error.
 
-  void init_CosEC (CORBA::Environment &ACE_TRY_ENV);
+  void init_CosEC (TAO_ENV_SINGLE_ARG_DECL);
   // initializes the COS EC.
   // Returns 0 on success, -1 on error.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 44bdfb9e7fd..7b31e7d4f58 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -5,21 +5,21 @@
 
 void
 Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::ORB_ptr orb,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::ORB_ptr orb
+                     TAO_ENV_ARG_DECL)
 {
   this->orb_ = orb;
 
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (ACE_TRY_ENV);
+    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_admin_ =
@@ -27,32 +27,32 @@ Consumer::close (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Consumer::connect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::connect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                ACE_TRY_ENV);
+  this->supplier_proxy_->connect_push_consumer (objref.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -60,8 +60,8 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Consumer::push (const CORBA::Any &,
-                     CORBA::Environment &)
+Consumer::push (const CORBA::Any &
+                     TAO_ENV_ARG_DECL_NOT_USED)
  ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -74,7 +74,7 @@ Consumer::push (const CORBA::Any &,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -82,15 +82,15 @@ Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index b6fc3584905..9c66fc562eb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -33,29 +33,29 @@ class Consumer : public POA_CosEventComm::PushConsumer
 
 public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::ORB_ptr orb,
-             CORBA::Environment& ACE_TRY_ENV);
+             CORBA::ORB_ptr orb
+             TAO_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (TAO_ENV_SINGLE_ARG_DECL);
   // Connect the Consumer to the EventChannel.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void push (const CORBA::Any &data
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
       ));
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 903fd57b924..3293d16514d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -4,19 +4,19 @@
 #include "Supplier.h"
 
 void
-Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::Environment& ACE_TRY_ENV)
+Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
+                     TAO_ENV_ARG_DECL)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (ACE_TRY_ENV);
+    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_admin_ =
@@ -24,31 +24,31 @@ Supplier::close (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Supplier::connect (CORBA::Environment &ACE_TRY_ENV)
+Supplier::connect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
+    this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                ACE_TRY_ENV);
+  this->consumer_proxy_->connect_push_supplier (objref.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -56,15 +56,15 @@ Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Supplier::send_event (const CORBA::Any & data,
-                           CORBA::Environment &ACE_TRY_ENV)
+Supplier::send_event (const CORBA::Any & data
+                           TAO_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data, ACE_TRY_ENV);
+  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -72,15 +72,15 @@ Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 90a0bea70e9..7e96e452ddb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -31,23 +31,23 @@ class Supplier : public POA_CosEventComm::PushSupplier
   //   The Supplier is a simple Push Supplier that connects to
   //   the CosEC and sends events to it.
 public:
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment &ACE_TRY_ENV);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
+             TAO_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (TAO_ENV_SINGLE_ARG_DECL);
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, but do not forget about it or close it.
 
-  void send_event (const CORBA::Any &data,
-                   CORBA::Environment &ACE_TRY_ENV);
+  void send_event (const CORBA::Any &data
+                   TAO_ENV_ARG_DECL);
   // Send one event.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 75634dcfc3c..cb2a02f80c8 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -44,19 +44,19 @@ Consumer::parse_args (int argc, char *argv [])
 }
 
 void
-Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::Environment& ACE_TRY_ENV)
+Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel
+                     TAO_ENV_ARG_DECL)
 {
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (ACE_TRY_ENV);
+    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_admin_ =
@@ -64,32 +64,32 @@ Consumer::close (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Consumer::connect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::connect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                ACE_TRY_ENV);
+  this->supplier_proxy_->connect_push_consumer (objref.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -97,8 +97,8 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Consumer::push (const CORBA::Any &,
-                     CORBA::Environment &ACE_TRY_ENV)
+Consumer::push (const CORBA::Any &
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any &,
                   "(%P):%s\n",
                   "exiting the consumer."));
 
-      this->close (ACE_TRY_ENV);
+      this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->shutdown ();
@@ -129,7 +129,7 @@ Consumer::push (const CORBA::Any &,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -137,30 +137,30 @@ Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Consumer::init_Consumer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
    {
-      this->open (this->cos_ec_,
-                  ACE_TRY_ENV);
+      this->open (this->cos_ec_
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect (ACE_TRY_ENV);
+      this->connect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index cb05f223e2b..fdfed82b2b6 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -40,29 +40,29 @@ public:
   int init_Consumer (void);
   // Initialize the Consumer.
 
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment& ACE_TRY_ENV);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
+             TAO_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (TAO_ENV_SINGLE_ARG_DECL);
   // Connect the Consumer to the EventChannel.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
-  virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void push (const CORBA::Any &data
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
       ));
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 63f8931ea7e..eb1b5231c54 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -39,18 +39,18 @@ Multiple::init (int argc, char *argv[])
 int
 Multiple::init_ORB  (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "",
-                                    ACE_TRY_ENV);
+                                    ""
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object  =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
+        this->orb_->resolve_initial_references("RootPOA"
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -59,15 +59,15 @@ Multiple::init_ORB  (int argc, char *argv [])
                           -1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -85,7 +85,7 @@ Multiple::init_ORB  (int argc, char *argv [])
 int
 Multiple::init_CosEC (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialization of the naming service.
@@ -101,16 +101,16 @@ Multiple::init_CosEC (void)
         CORBA::string_dup (this->service_name);
 
       CORBA::Object_var EC_obj =
-        this->naming_client_->resolve (ec_ref_name,
-				      ACE_TRY_ENV);
+        this->naming_client_->resolve (ec_ref_name
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to
       // CosEventChannelAdmin::EventChannel
       // using the <_narrow> method.
       this->cos_ec_ =
-        CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in (),
-                                                     ACE_TRY_ENV);
+        CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -128,10 +128,10 @@ Multiple::init_CosEC (void)
 int
 Multiple::runORB (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 7e820a11853..f549159e1b7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -43,19 +43,19 @@ Supplier::parse_args (int argc, char *argv [])
 }
 
 void
-Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::Environment& ACE_TRY_ENV)
+Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
+                     TAO_ENV_ARG_DECL)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (ACE_TRY_ENV);
+    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_admin_ =
@@ -63,31 +63,31 @@ Supplier::close (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Supplier::connect (CORBA::Environment &ACE_TRY_ENV)
+Supplier::connect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
+    this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                ACE_TRY_ENV);
+  this->consumer_proxy_->connect_push_supplier (objref.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -95,15 +95,15 @@ Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Supplier::send_event (const CORBA::Any & data,
-                           CORBA::Environment &ACE_TRY_ENV)
+Supplier::send_event (const CORBA::Any & data
+                           TAO_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data, ACE_TRY_ENV);
+  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
         CORBA::SystemException
         ))
@@ -111,23 +111,23 @@ Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Supplier::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Create an Any type to pass to the Cos EC.
@@ -136,11 +136,11 @@ Supplier::run (void)
       CORBA::Any any;
       cany >>= any;
 
-      this->open (this->cos_ec_,
-                  ACE_TRY_ENV);
+      this->open (this->cos_ec_
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect (ACE_TRY_ENV);
+      this->connect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -151,15 +151,15 @@ Supplier::run (void)
            count != 0;
            count--)
         {
-          this->send_event (any,
-                            ACE_TRY_ENV);
+          this->send_event (any
+                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P):Done!. exiting now..\n"));
 
-      this->close (ACE_TRY_ENV);
+      this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 9c6c0f60e83..9de704696bd 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -37,23 +37,23 @@ public:
   Supplier ();
   // Constructor.
 
-  void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment &ACE_TRY_ENV);
+  void open (CosEventChannelAdmin::EventChannel_ptr event_channel
+             TAO_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (TAO_ENV_SINGLE_ARG_DECL);
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, but do not forget about it or close it.
 
-  void send_event (const CORBA::Any &data,
-                   CORBA::Environment &ACE_TRY_ENV);
+  void send_event (const CORBA::Any &data
+                   TAO_ENV_ARG_DECL);
   // Send one event.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index ff7e31746ae..c425e7c6bdb 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -23,15 +23,15 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Do *NOT* make a copy because we don't want the ORB to outlive 
+      // Do *NOT* make a copy because we don't want the ORB to outlive
       // the Consumer object.
       this->orb_ = orb.in ();
 
@@ -43,46 +43,46 @@ Consumer::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        CosEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        CosEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventComm::PushConsumer_var consumer =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier->connect_push_consumer (consumer.in (), ACE_TRY_ENV);
+      supplier->connect_push_consumer (consumer.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Wait for events, using work_pending()/perform_work() may help 
+      // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
       orb->run ();
 
@@ -103,8 +103,8 @@ Consumer::run (int argc, char* argv[])
 }
 
 void
-Consumer::push (const CORBA::Any &,
-                CORBA::Environment &)
+Consumer::push (const CORBA::Any &
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count_ ++;
@@ -117,13 +117,13 @@ Consumer::push (const CORBA::Any &,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 2897e12f086..4ef9e96d7ce 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -40,10 +40,10 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any &event,
-                     CORBA::Environment &)
+  virtual void push (const CORBA::Any &event
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index c4b09bda47e..c13a78fe03b 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -15,12 +15,12 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) == -1)
@@ -31,30 +31,30 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_CEC_EventChannel_Attributes attributes (poa.in (),
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in (), ACE_TRY_ENV);
+        orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 66d7d1a9647..63476ce6f9e 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -22,12 +22,12 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (argc <= 1)
@@ -38,43 +38,43 @@ Supplier::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        CosEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        CosEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventComm::PushSupplier_var supplier =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer->connect_push_supplier (supplier.in (), ACE_TRY_ENV);
+      consumer->connect_push_supplier (supplier.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Push the events...
@@ -85,28 +85,28 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event, ACE_TRY_ENV);
+          consumer->push (event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_TRY_ENV);
+      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the EC....
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA
-      poa->destroy (1, 0, ACE_TRY_ENV);
+      poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -119,7 +119,7 @@ Supplier::run (int argc, char* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index 8ba44609759..cc5a8a9014e 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -28,37 +28,37 @@ FilterClient::~FilterClient ()
 }
 
 void
-FilterClient::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV)
+FilterClient::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
 {
-  init_ORB (argc, argv, ACE_TRY_ENV);
+  init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  resolve_naming_service (ACE_TRY_ENV);
+  resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  resolve_Notify_factory (ACE_TRY_ENV);
+  resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_EC (ACE_TRY_ENV);
+  create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_supplieradmin (ACE_TRY_ENV);
+  create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_consumeradmin (ACE_TRY_ENV);
+  create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_consumers (ACE_TRY_ENV);
+  create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_suppliers (ACE_TRY_ENV);
+  create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::run (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  send_events (ACE_TRY_ENV);
+  send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE)
@@ -77,18 +77,18 @@ FilterClient::done (void)
 
 void
 FilterClient::init_ORB (int argc,
-                      char *argv [],
-                      CORBA::Environment &ACE_TRY_ENV)
+                      char *argv []
+                      TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object))
@@ -98,24 +98,24 @@ FilterClient::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object,
-                                  ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_TRY_ENV);
+    root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME,
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -123,60 +123,60 @@ FilterClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_context_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (),
-                                                         ACE_TRY_ENV);
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::create_EC (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-FilterClient::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec_->default_filter_factory (ACE_TRY_ENV);
+    ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var sa_filter =
-    ffact->create_filter (TCL_GRAMMAR, ACE_TRY_ENV);
+    ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
@@ -187,31 +187,31 @@ FilterClient::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
 
-  sa_filter->add_constraints (constraint_list, ACE_TRY_ENV);
+  sa_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_admin_->add_filter (sa_filter.in (), ACE_TRY_ENV);
+  supplier_admin_->add_filter (sa_filter.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV)
+FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec_->default_filter_factory (ACE_TRY_ENV);
+    ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var ca_filter =
-    ffact->create_filter (TCL_GRAMMAR, ACE_TRY_ENV);
+    ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
@@ -227,10 +227,10 @@ FilterClient:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
 
-  ca_filter->add_constraints (constraint_list, ACE_TRY_ENV);
+  ca_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_admin_->add_filter (ca_filter.in (), ACE_TRY_ENV);
+  consumer_admin_->add_filter (ca_filter.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the CA to receive all type of events
@@ -242,19 +242,19 @@ FilterClient:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV)
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV);
+  this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::create_consumers (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   // startup the first consumer.
   ACE_NEW_THROW_EX (consumer_1,
                     Filter_StructuredPushConsumer (this, "consumer1"),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->connect (consumer_admin_.in (), ACE_TRY_ENV);
+  consumer_1->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // startup the second consumer.
@@ -262,19 +262,19 @@ FilterClient::create_consumers (CORBA::Environment &ACE_TRY_ENV)
                     Filter_StructuredPushConsumer (this, "consumer2"),
                     CORBA::NO_MEMORY ());
 
-  consumer_2->connect (consumer_admin_.in (), ACE_TRY_ENV);
+  consumer_2->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::create_suppliers (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
                     Filter_StructuredPushSupplier ("supplier1"),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->connect (supplier_admin_.in (), ACE_TRY_ENV);
+  supplier_1->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // startup the second supplier
@@ -282,12 +282,12 @@ FilterClient::create_suppliers (CORBA::Environment &ACE_TRY_ENV)
                     Filter_StructuredPushSupplier ("supplier2"),
                     CORBA::NO_MEMORY ());
 
-  supplier_2->connect (supplier_admin_.in (), ACE_TRY_ENV);
+  supplier_2->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::send_events (CORBA::Environment &ACE_TRY_ENV)
+FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -332,10 +332,10 @@ FilterClient::send_events (CORBA::Environment &ACE_TRY_ENV)
       // any
       event.remainder_of_body <<= (CORBA::Long)i;
 
-      supplier_1->send_event (event, ACE_TRY_ENV);
+      supplier_1->send_event (event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      supplier_2->send_event (event, ACE_TRY_ENV);
+      supplier_2->send_event (event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -352,15 +352,15 @@ Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
 }
 
 void
-Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV)
+Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -368,27 +368,29 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in (), ACE_TRY_ENV);
+    _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_supplier_->connect_structured_push_consumer (objref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Filter_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Filter_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier(ACE_TRY_ENV);
+    disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Filter_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV
-)
+Filter_StructuredPushConsumer::offer_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -398,7 +400,9 @@ Filter_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq
 }
 
 void
-Filter_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/)
+Filter_StructuredPushConsumer::push_structured_event
+   (const CosNotification::StructuredEvent & notification
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -423,7 +427,8 @@ Filter_StructuredPushConsumer::push_structured_event (const CosNotification::Str
 }
 
 void
-Filter_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &/*ACE_TRY_ENV*/)
+Filter_StructuredPushConsumer::disconnect_structured_push_consumer
+   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -444,41 +449,43 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier ()
 }
 
 void
-Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Filter_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV);
+  this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Filter_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */, CORBA::Environment & /*ACE_TRY_ENV*/
-      )
+Filter_StructuredPushSupplier::subscription_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed */
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -488,19 +495,21 @@ Filter_StructuredPushSupplier::subscription_change (const CosNotification::Event
 }
 
 void
-Filter_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV)
+Filter_StructuredPushSupplier::send_event
+   (const CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   ACE_DEBUG ((LM_DEBUG,
               "%s is sending an event \n", my_name_.fast_rep ()));
 
-  proxy_consumer_->push_structured_event (event, ACE_TRY_ENV);
+  proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Filter_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Environment &/*ACE_TRY_ENV*/)
+Filter_StructuredPushSupplier::disconnect_structured_push_supplier
+   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index 35fd599f4b5..6054e2bd1ab 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -46,41 +46,41 @@ class FilterClient
   ~FilterClient ();
   // Destructor
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Init the Client.
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the demo.
 
   void done (void);
   // Consumer calls done, We're done.
 
  protected:
-  void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create an EC.
 
-  void create_supplieradmin(CORBA::Environment &ACE_TRY_ENV);
+  void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (CORBA::Environment &ACE_TRY_ENV);
+  void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL);
   // Create the Consumer Admin.
 
-  void create_consumers (CORBA::Environment &ACE_TRY_ENV);
+  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Create and initialize the consumers.
 
-  void create_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // create and initialize the suppliers.
 
-  void send_events (CORBA::Environment &ACE_TRY_ENV);
+  void send_events (TAO_ENV_SINGLE_ARG_DECL);
   // send the events.
 
   // = Data Members
@@ -145,11 +145,11 @@ class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushCo
   Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
 protected:
@@ -174,8 +174,8 @@ protected:
   // = NotifyPublish method
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -184,8 +184,8 @@ protected:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -193,7 +193,7 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -215,16 +215,16 @@ class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSu
   Filter_StructuredPushSupplier (const char* my_name);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+                TAO_ENV_ARG_DECL);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event,
-                           CORBA::Environment &ACE_TRY_ENV);
+  virtual void send_event (const CosNotification::StructuredEvent& event
+                           TAO_ENV_ARG_DECL);
   // Send one event.
 
 protected:
@@ -245,8 +245,8 @@ protected:
   // = NotifySubscribe
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -255,7 +255,7 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 8304eee4f45..3957d8425e5 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -10,11 +10,11 @@ main (int argc, char *argv [])
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv,
-                   ACE_TRY_ENV); //Init the Client
+      client.init (argc, argv
+                   TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      client.run (ACE_TRY_ENV);
+      client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 9ee389f0ce4..13af016f3b7 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -30,30 +30,30 @@ Subscribe::~Subscribe ()
 }
 
 void
-Subscribe::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV)
+Subscribe::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
 {
-  init_ORB (argc, argv, ACE_TRY_ENV);
+  init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  resolve_naming_service (ACE_TRY_ENV);
+  resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  resolve_Notify_factory (ACE_TRY_ENV);
+  resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_EC (ACE_TRY_ENV);
+  create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_supplieradmin (ACE_TRY_ENV);
+  create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_consumeradmin (ACE_TRY_ENV);
+  create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_consumers (ACE_TRY_ENV);
+  create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_suppliers (ACE_TRY_ENV);
+  create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::run (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->send_events (ACE_TRY_ENV);
+  this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb.
@@ -72,18 +72,18 @@ Subscribe::done (void)
 
 void
 Subscribe::init_ORB (int argc,
-                      char *argv [],
-                      CORBA::Environment &ACE_TRY_ENV)
+                      char *argv []
+                      TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object))
@@ -93,23 +93,23 @@ Subscribe::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object, ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_TRY_ENV);
+    root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME,
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -117,96 +117,96 @@ Subscribe::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_context_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (),
-                                                         ACE_TRY_ENV);
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::create_EC (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-Subscribe::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
 
 void
-Subscribe:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV)
+Subscribe:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-Subscribe::create_consumers (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   consumer_1_ = new Subscribe_StructuredPushConsumer (this);
-  consumer_1_->connect (this->consumer_admin_.in (),
-                        ACE_TRY_ENV);
+  consumer_1_->connect (this->consumer_admin_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   consumer_2_ = new Subscribe_StructuredPushConsumer (this);
-  consumer_2_->connect (this->consumer_admin_.in (),
-                        ACE_TRY_ENV);
+  consumer_2_->connect (this->consumer_admin_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::create_suppliers (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   supplier_1_ = new Subscribe_StructuredPushSupplier ();
-  supplier_1_->connect (this->supplier_admin_.in (),
-                        ACE_TRY_ENV);
+  supplier_1_->connect (this->supplier_admin_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   supplier_2_ = new Subscribe_StructuredPushSupplier ();
-  supplier_2_->connect (this->supplier_admin_.in (),
-                        ACE_TRY_ENV);
+  supplier_2_->connect (this->supplier_admin_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV)
+Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Setup the CA to receive event_type : "domain_A", "Type_a"
   CosNotification::EventTypeSeq added(1);
@@ -220,7 +220,7 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV)
   removed[0].domain_name =  CORBA::string_dup ("*");
   removed[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV);
+  this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b"
@@ -232,8 +232,8 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV)
   added_1.length (1);
   removed_1.length (0);
 
-  this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1,
-                                                           ACE_TRY_ENV);
+  this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
@@ -245,8 +245,8 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV)
   added_2.length (1);
   removed_2.length (0);
 
-  this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2,
-                                                           ACE_TRY_ENV);
+  this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the events - one of each type
@@ -286,11 +286,11 @@ Subscribe::send_events (CORBA::Environment &ACE_TRY_ENV)
  // let supplier 1 send all these events
   for (int i = 0; i < 1; ++i)
     {
-      supplier_1_->send_event (event1, ACE_TRY_ENV);
+      supplier_1_->send_event (event1 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      supplier_1_->send_event (event2, ACE_TRY_ENV);
+      supplier_1_->send_event (event2 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      supplier_1_->send_event (event3, ACE_TRY_ENV);
+      supplier_1_->send_event (event3 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -306,15 +306,17 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer ()
 }
 
 void
-Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV)
+Subscribe_StructuredPushConsumer::connect
+   (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+    TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -322,27 +324,29 @@ Subscribe_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in (), ACE_TRY_ENV);
+    _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_supplier_->connect_structured_push_consumer (objref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Subscribe_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier(ACE_TRY_ENV);
+    disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV
-)
+Subscribe_StructuredPushConsumer::offer_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -352,7 +356,9 @@ Subscribe_StructuredPushConsumer::offer_change (const CosNotification::EventType
 }
 
 void
-Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/)
+Subscribe_StructuredPushConsumer::push_structured_event
+   (const CosNotification::StructuredEvent & notification
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -372,7 +378,8 @@ Subscribe_StructuredPushConsumer::push_structured_event (const CosNotification::
 }
 
 void
-Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &/*ACE_TRY_ENV*/)
+Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
+   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -397,41 +404,45 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier ()
 }
 
 void
-Subscribe_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+Subscribe_StructuredPushSupplier::connect
+   (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+    TAO_ENV_ARG_DECL)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Subscribe_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV);
+  this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */, CORBA::Environment & /*ACE_TRY_ENV*/
-      )
+Subscribe_StructuredPushSupplier::subscription_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed */
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -441,16 +452,19 @@ Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::Ev
 }
 
 void
-Subscribe_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV)
+Subscribe_StructuredPushSupplier::send_event
+   (const CosNotification::StructuredEvent& event
+    TAO_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event, ACE_TRY_ENV);
+  proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Environment &/*ACE_TRY_ENV*/)
+Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
+   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index e2b1d0ad833..37124da02eb 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -42,41 +42,41 @@ class Subscribe
   Subscribe (void);
   ~Subscribe ();
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Init the Client.
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the demo.
 
   void done (void);
   // Called when all events we are waiting for have occured.
 
  protected:
-  void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create an EC.
 
-  void create_supplieradmin(CORBA::Environment &ACE_TRY_ENV);
+  void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (CORBA::Environment &ACE_TRY_ENV);
+  void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL);
   // Create the Consumer Admin.
 
-  void create_consumers (CORBA::Environment &ACE_TRY_ENV);
+  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Create and initialize the consumers.
 
-  void create_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // create and initialize the suppliers.
 
-  void send_events (CORBA::Environment &ACE_TRY_ENV);
+  void send_events (TAO_ENV_SINGLE_ARG_DECL);
   // send the events.
 
   // = Data Members
@@ -135,11 +135,11 @@ class Subscribe_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPus
   Subscribe_StructuredPushConsumer (Subscribe* subscribe);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
@@ -163,8 +163,8 @@ protected:
   // = NotifyPublish method
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -173,8 +173,8 @@ protected:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -182,7 +182,7 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -204,16 +204,16 @@ class Subscribe_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPus
   Subscribe_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+                TAO_ENV_ARG_DECL);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event,
-                           CORBA::Environment &ACE_TRY_ENV);
+  virtual void send_event (const CosNotification::StructuredEvent& event
+                           TAO_ENV_ARG_DECL);
   // Send one event.
 
 protected:
@@ -231,8 +231,8 @@ protected:
   // = NotifySubscribe
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -241,7 +241,7 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index 70dba60011e..e7e5550a01e 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -10,11 +10,11 @@ main (int argc, char *argv [])
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv,
-                   ACE_TRY_ENV); //Init the Client
+      client.init (argc, argv
+                   TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      client.run (ACE_TRY_ENV);
+      client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index 03988761554..bfa2b4e8bd8 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -11,8 +11,8 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
-                      RtecUDPAdmin::UDP_Addr_out addr,
-                      CORBA::Environment&)
+                      RtecUDPAdmin::UDP_Addr_out addr
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index a75f2a774ce..fc3610771df 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -40,8 +40,8 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr,
-                         CORBA::Environment&)
+                         RtecUDPAdmin::UDP_Addr_out addr
+                         TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index eef1b14038d..c6e79b3ef6b 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -12,15 +12,15 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                   TAO_ENV_ARG_DECL)
 {
   this->proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var me =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Simple subscription, but usually the helper classes in
@@ -39,18 +39,18 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
   h1.type   = ACE_ES_EVENT_UNDEFINED;  // first free event type
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-  this->proxy_->connect_push_consumer (me.in (), qos,
-                                       ACE_TRY_ENV);
+  this->proxy_->connect_push_consumer (me.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Disconnect from the proxy
-      this->proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+      this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -62,20 +62,20 @@ Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   // Deactivate this object
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   // Deactivate the object
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -95,7 +95,7 @@ Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 69bd65ab206..c71328b15d4 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -37,19 +37,19 @@ public:
   Consumer (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                TAO_ENV_ARG_DECL);
   // Connect to the Event Channel
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index bd62c075bb4..da99b2c6898 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -33,32 +33,24 @@ main (int argc, char* argv[])
   //
   // and defined in:
   //
-  // $ACE_ROOT/ace/CORBA_macros.h
+  // $ACE_ROOT/TAO/tao/orbconf.h - for Environment parameter definitions
+  //
+  // $ACE_ROOT/ace/CORBA_macros.h - for try/catch et al.
   //
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the ACE_TRY_ENV argument.
+  // and avoid the TAO_ENV_SINGLE_ARG_PARAMETER argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  // This would be OK except for the fact that event channel library
-  // is compiled with support for platforms without exceptions, so
-  // some of the classes (the consumers and suppliers), must receive
-  // the extra CORBA::Environment argument.
-  // In platforms with native C++ exception support the argument must
-  // be present, but it can be ignored, and the standard C++ exception
-  // mechanisms can be used instead.
-  // Still we are workin on some way to avoid the extra argument
-  // altogether, at least for platforms that do not require it.
-  //
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments, you usually want to do this after
@@ -76,15 +68,15 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETS THE ORB SETUP
@@ -107,14 +99,14 @@ main (int argc, char* argv[])
       // that may involve creating some threads.
       // But it should always be invoked because several internal data
       // structures are initialized at that point.
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The event channel is activated as any other CORBA servant.
       // In this case we use the simple implicit activation with the
       // RootPOA
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
@@ -151,7 +143,7 @@ main (int argc, char* argv[])
       // Now we create and activate the servant
       AddrServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var address_server =
-        as_impl._this (ACE_TRY_ENV);
+        as_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We need a local socket to send the data, open it and check
@@ -167,8 +159,8 @@ main (int argc, char* argv[])
       TAO_ECG_UDP_Sender sender;
       sender.init (event_channel.in (),
                    address_server.in (),
-                   &endpoint,
-                   ACE_TRY_ENV);
+                   &endpoint
+                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now we connect the sender as a consumer of events, it will
@@ -183,7 +175,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender.open (sub, ACE_TRY_ENV);
+      sender.open (sub TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // To receive events we need to setup an event handler:
@@ -200,8 +192,8 @@ main (int argc, char* argv[])
       // required by all the local consumer.
       // Then it register for the multicast groups that carry those
       // events:
-      int r = mcast_eh.open (event_channel.in (),
-                             ACE_TRY_ENV);
+      int r = mcast_eh.open (event_channel.in ()
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         {
@@ -224,8 +216,8 @@ main (int argc, char* argv[])
                      address_server.in (),
                      orb->orb_core ()->reactor (),
                      expire,
-                     max_expiration_count,
-                     ACE_TRY_ENV);
+                     max_expiration_count
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The Receiver is also a supplier of events.  The exact type of
@@ -245,7 +237,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver.open (pub, ACE_TRY_ENV);
+      receiver.open (pub TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
@@ -256,19 +248,19 @@ main (int argc, char* argv[])
       // channel
       Consumer consumer;
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer.connect (consumer_admin.in (),
-                        ACE_TRY_ENV);
+      consumer.connect (consumer_admin.in ()
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // And now create a supplier
       Supplier supplier;
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier.connect (supplier_admin.in (),
-                        ACE_TRY_ENV);
+      supplier.connect (supplier_admin.in ()
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE CLIENT SETUP
@@ -281,7 +273,7 @@ main (int argc, char* argv[])
       for (int i = 0; i != 1000; ++i)
         {
           CORBA::Boolean there_is_work =
-            orb->work_pending (ACE_TRY_ENV);
+            orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (there_is_work)
             {
@@ -290,12 +282,12 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv, ACE_TRY_ENV);
+              orb->perform_work (tv TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
-          supplier.perform_push (ACE_TRY_ENV);
+          supplier.perform_push (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -304,16 +296,16 @@ main (int argc, char* argv[])
       // **************** HERE STARTS THE CLEANUP CODE
 
       // First the easy ones
-      supplier.disconnect (ACE_TRY_ENV);
+      supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer.disconnect (ACE_TRY_ENV);
+      consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now let us close the Receiver
-      receiver.close (ACE_TRY_ENV);
+      receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      r = mcast_eh.close (ACE_TRY_ENV);
+      r = mcast_eh.close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         {
@@ -322,13 +314,13 @@ main (int argc, char* argv[])
         }
 
       // And also close the sender of events
-      sender.close (ACE_TRY_ENV);
+      sender.close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The event channel must be destroyed, so it can release its
       // resources, and inform all the clients that are still
       // connected that it is going away.
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivating the event channel implementation is not strictly
@@ -340,24 +332,24 @@ main (int argc, char* argv[])
         // is the root POA, but the code is more robust if we don't
         // rely on that.
         PortableServer::POA_var poa =
-          ec_impl._default_POA (ACE_TRY_ENV);
+          ec_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl, ACE_TRY_ENV);
+          poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
         // Deactivate the object
-        poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+        poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Finally destroy the ORB
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE CLEANUP CODE
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index a23d243809e..1904326e03e 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -11,15 +11,15 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+                   TAO_ENV_ARG_DECL)
 {
   this->proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var me =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Simple publication, but usually the helper classes in
@@ -33,18 +33,18 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
   h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
   h0.source = 1;                      // first free event source
 
-  this->proxy_->connect_push_supplier (me.in (), qos,
-                                       ACE_TRY_ENV);
+  this->proxy_->connect_push_supplier (me.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Disconnect from the EC
   ACE_TRY
     {
-      this->proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+      this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -53,17 +53,17 @@ Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
   ACE_ENDTRY;
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV)
+Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -75,7 +75,7 @@ Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV)
       // Avoid loops throught the event channel federations
       event[0].header.ttl    = 1;
 
-      this->proxy_->push (event, ACE_TRY_ENV);
+      this->proxy_->push (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -85,7 +85,7 @@ Supplier::perform_push (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 35743ec5bb4..a8d6c6ff31d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -38,19 +38,19 @@ public:
   Supplier (void);
   // Constructor
 
-  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+                TAO_ENV_ARG_DECL);
   // Connect to the event channel
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the event channel
 
-  void perform_push (CORBA::Environment &ACE_TRY_ENV);
+  void perform_push (TAO_ENV_SINGLE_ARG_DECL);
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 8b5f1b76dfa..4793a20ab13 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -9,8 +9,8 @@ Consumer::Consumer (void)
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -25,7 +25,7 @@ Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index 58c7e18af17..20c1ffad011 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -44,10 +44,10 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 };
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 5ec946fc760..a5e70795367 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -30,12 +30,12 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) == -1)
@@ -46,15 +46,15 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -62,11 +62,11 @@ main (int argc, char* argv[])
 #if 0
       // Obtain a reference to the naming service...
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -93,7 +93,7 @@ main (int argc, char* argv[])
         }
 
       RtecScheduler::Scheduler_var scheduler =
-        sched_impl->_this (ACE_TRY_ENV);
+        sched_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if 0
@@ -105,8 +105,8 @@ main (int argc, char* argv[])
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in (),
-                              ACE_TRY_ENV);
+      naming_context->rebind (schedule_name, scheduler.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -121,7 +121,7 @@ main (int argc, char* argv[])
                                            &module_factory);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        event_channel_impl._this (ACE_TRY_ENV);
+        event_channel_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
 
@@ -131,12 +131,12 @@ main (int argc, char* argv[])
 
       TAO_EC_Event_Channel ec_impl (attributes);
       ACE_DEBUG ((LM_DEBUG, "activating EC\n"));
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "EC activated\n"));
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -148,7 +148,7 @@ main (int argc, char* argv[])
       Consumer consumer_impl;
 
       RtecScheduler::handle_t consumer_rt_info1 =
-        scheduler->create ("consumer_event_1", ACE_TRY_ENV);
+        scheduler->create ("consumer_event_1" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Let's say that the execution time for event 1 is 2
@@ -163,12 +163,12 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::handle_t consumer_rt_info2 =
-        scheduler->create ("consumer_event_2", ACE_TRY_ENV);
+        scheduler->create ("consumer_event_2" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Let's say that the execution time for event 2 is 1
@@ -182,8 +182,8 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       time,
                       0,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ConsumerQOS_Factory consumer_qos;
@@ -197,21 +197,21 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var consumer =
-        consumer_impl._this (ACE_TRY_ENV);
+        consumer_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumer\n"));
       supplier_proxy->connect_push_consumer (consumer.in (),
-                                             consumer_qos.get_ConsumerQOS (),
-                                             ACE_TRY_ENV);
+                                             consumer_qos.get_ConsumerQOS ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "consumer connected\n"));
 
@@ -220,7 +220,7 @@ main (int argc, char* argv[])
       Supplier supplier_impl;
 
       RtecScheduler::handle_t supplier_rt_info1 =
-        scheduler->create ("supplier_event_1", ACE_TRY_ENV);
+        scheduler->create ("supplier_event_1" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The execution times are set to reasonable values, but
@@ -239,12 +239,12 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::handle_t supplier_rt_info2 =
-        scheduler->create ("supplier_event_2", ACE_TRY_ENV);
+        scheduler->create ("supplier_event_2" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The execution times are set to reasonable values, but
@@ -262,8 +262,8 @@ main (int argc, char* argv[])
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0,
                       1,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::EventSourceID supplier_id = 1;
@@ -279,21 +279,21 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var supplier =
-        supplier_impl._this (ACE_TRY_ENV);
+        supplier_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connecting supplier\n"));
       consumer_proxy->connect_push_supplier (supplier.in (),
-                                             supplier_qos.get_SupplierQOS (),
-                                             ACE_TRY_ENV);
+                                             supplier_qos.get_SupplierQOS ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "supplier connected\n"));
 
@@ -329,8 +329,8 @@ main (int argc, char* argv[])
                                          max_os_priority,
                                          infos.out (),
                                          configs.out (),
-                                         anomalies.out (),
-                                         ACE_TRY_ENV);
+                                         anomalies.out ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Dump the schedule to a file..
@@ -362,12 +362,12 @@ main (int argc, char* argv[])
         {
           if (i % 2 == 0)
             {
-              consumer_proxy->push (event1, ACE_TRY_ENV);
+              consumer_proxy->push (event1 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
-              consumer_proxy->push (event2, ACE_TRY_ENV);
+              consumer_proxy->push (event2 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index dc8e1a26b29..d0d81303d5c 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -24,15 +24,15 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Do *NOT* make a copy because we don't want the ORB to outlive 
+      // Do *NOT* make a copy because we don't want the ORB to outlive
       // the run() method.
       this->orb_ = orb.in ();
 
@@ -44,40 +44,40 @@ Consumer::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var consumer =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple subscription, but usually the helper classes in
@@ -94,11 +94,11 @@ Consumer::run (int argc, char* argv[])
       h1.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
-      supplier->connect_push_consumer (consumer.in (), qos,
-                                       ACE_TRY_ENV);
+      supplier->connect_push_consumer (consumer.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Wait for events, using work_pending()/perform_work() may help 
+      // Wait for events, using work_pending()/perform_work() may help
       // or using another thread, this example is too simple for that.
       orb->run ();
 
@@ -119,8 +119,8 @@ Consumer::run (int argc, char* argv[])
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -140,13 +140,13 @@ Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 352096048f1..e7dfda0c32a 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -41,10 +41,10 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index 5df20ad8a45..e1631f7dcae 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -15,12 +15,12 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) == -1)
@@ -31,30 +31,30 @@ main (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_EC_Event_Channel_Attributes attributes (poa.in (),
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in (), ACE_TRY_ENV);
+        orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 831128a3620..32ea062d450 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -23,12 +23,12 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (argc <= 1)
@@ -39,40 +39,40 @@ Supplier::run (int argc, char* argv[])
         }
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var supplier =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple publication, but usually the helper classes in
@@ -84,8 +84,8 @@ Supplier::run (int argc, char* argv[])
       h0.type   = ACE_ES_EVENT_UNDEFINED; // first free event type
       h0.source = 1;                      // first free event source
 
-      consumer->connect_push_supplier (supplier.in (), qos,
-                                       ACE_TRY_ENV);
+      consumer->connect_push_supplier (supplier.in (), qos
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Push the events...
@@ -99,28 +99,28 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event, ACE_TRY_ENV);
+          consumer->push (event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (ACE_TRY_ENV);
+      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the EC....
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA
-      poa->destroy (1, 0, ACE_TRY_ENV);
+      poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -133,7 +133,7 @@ Supplier::run (int argc, char* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (CORBA::Environment &)
+Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index f2c264f787f..bbef4bc291e 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -14,61 +14,61 @@ static int authorize_1 = 1;
 static int authorize_2 = 1;
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV)
+SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
- 
+
   /// Get a reference to the SecurityCurrent object.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("SecurityCurrent", ACE_TRY_ENV);
+    orb->resolve_initial_references ("SecurityCurrent" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-    /// Narrow it down correctly. 
+    /// Narrow it down correctly.
   SecurityLevel1::Current_var current =
     SecurityLevel1::Current::_narrow (obj.in ());
-  
+
   /// Check for nil reference.
   if (CORBA::is_nil (current.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to initialize the SecurityCurrent object\n"),
                       1);
-  
+
   Security::AttributeType desired_attribute_1;
-  
+
   /// @@ Need to check more abt this variable
   desired_attribute.attribute_family.family_definer = 0;
-      
+
   /// Implies Privilege Attributes
   desired_attribute.attribute_family.family = 1;
-  
+
   ///  AccessId: the identity of the principal used for access
   ///  control
   desired_attribute.attibute_type = 2;
 
   // Second desired attribute
   Security::AttributeType desired_attribute_2;
-  
+
   /// @@ Need to check more abt this variable
   desired_attribute.attribute_family.family_definer = 0;
-      
+
   /// Implies Privilege Attributes.
   desired_attribute.attribute_family.family = 1;
-  
+
   /// Primary Group ID.
   /// @@ I am not sure if Ossama will have all these attribute types
   ///    If it is not the same, one might have to change the comments
   ///    to show the attribute_type that is checked and change the
   ///    number accordingly.
   desired_attribute.attibute_type = 3;
-  
+
   /// Define the AttributeTypeList
   Security::AttributeTypeList attribute_type_list;
   attribute_type_list.length (2);
   attribute_type_list[0] = &desired_attribute_1;
   attribute_type_list[1] = &desired_attribute_2;
-  
+
   /// Get the desired security attributes
-  Security::AttributeList_var attribute_list = 
+  Security::AttributeList_var attribute_list =
     current->get_attributes (attribute_type_list);
 
   /* @@ What did we do till now ??
@@ -80,7 +80,7 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV)
    *    The type which is returned from the get_attribute method is a
    *    sequence of the AttributeList struct. This struct has three
    *    members: the attribute type, the defining_authority and the
-   *    value of the attribute type. 
+   *    value of the attribute type.
    *
    * @@ What should we do now ??
    *    Compare the returned values with the values we, as in the
@@ -91,7 +91,7 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV)
    *    which are valid to authorize access to the requested
    *    invocation. Or complete this stuff with a single if condition
    *    make things easier.
-   *    
+   *
    */
 
   if ((attribute_type == 1) && (attribute_value == 10))
@@ -99,8 +99,8 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV)
       // Lets say, this is the valid case.
       authorize_1 = 0;
     }
-  
-  /// If the owner of this invocation is authorized to invoke this 
+
+  /// If the owner of this invocation is authorized to invoke this
   /// method, return 0 else return 1.
   if (authorize_1 == 0)
     return 0;
@@ -110,10 +110,10 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV)
 
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level2 (CORBA::Environment &)
+SLevel1_Server_i::authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  /// If the owner of this invocation is authorized to invoke this 
+  /// If the owner of this invocation is authorized to invoke this
   /// method, return 0 else return 1.
   if (authorize_2 == 0)
     return 0;
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index 90e6c48b5a8..c61fc5f0f55 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -37,18 +37,18 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SLevel1_Server_var server =
-        SLevel1_Server::_narrow (object.in (), ACE_TRY_ENV);
+        SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -59,21 +59,21 @@ main (int argc, char *argv [])
                             1);
         }
 
-      CORBA::Boolean authorized = 
-        server->authorize_level1 (ACE_TRY_ENV);
+      CORBA::Boolean authorized =
+        server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (authorized == 0)
         ACE_DEBUG ((LM_DEBUG,
                     "AUTHORIZED\n"));
       else if (authorized == 1)
         ACE_DEBUG ((LM_DEBUG,
                     "DENIED: You Do NOT have enough privileges\n"));
-        
-      server->shutdown (ACE_TRY_ENV);
+
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -86,4 +86,4 @@ main (int argc, char *argv [])
 
   return 0;
 }
-      
+
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index f96308403d4..7a70989ebf0 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -15,12 +15,12 @@ main (int argc, char *argv[])
     {
       /// Our regular ORB Initialization.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -30,37 +30,37 @@ main (int argc, char *argv[])
 
       /// Narrow down the reference to the currect interface.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SLevel1_Server_i level1_server ();
 
       SLevel1_Server_var server =
-        level1_server._this (ACE_TRY_ENV);
+        level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
 
       // Start the ORB
       orb->run ();
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 50283cca84f..d6358fbab54 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -39,18 +39,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -67,15 +67,15 @@ main (int argc, char *argv[])
           char *line = buf.read ('\n');
           if (line == 0)
             break;
-          server->send_line (line, ACE_TRY_ENV);
+          server->send_line (line TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           buf.alloc ()->free (line);
         }
-        
-      server->shutdown (ACE_TRY_ENV);
+
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index b7a6d2ee3eb..dac538f1328 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -64,37 +64,37 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 7066b59589b..c292b05581b 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -9,15 +9,15 @@
 ACE_RCSID(Send_File, test_i, "$Id$")
 
 void
-Simple_Server_i::send_line (const char *line,
-                            CORBA::Environment&)
+Simple_Server_i::send_line (const char *line
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s\n", line));
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment&)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index 8bcd872056b..ccf178af83f 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -31,11 +31,11 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void send_line (const char *line,
-                  CORBA::Environment&)
+  void send_line (const char *line
+                  TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 5c289498b2d..f48848f066c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -70,8 +70,8 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
 // Stop the transfer of data of the stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
@@ -90,7 +90,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec,
                 if (this->flow_connection_map_.find (flow_name_key,
                                                      flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->stop (ACE_TRY_ENV);
+                    flow_connection_entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
                     ACE_TRY_CHECK;
                   }
               }
@@ -101,7 +101,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec,
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->stop (ACE_TRY_ENV);
+                  entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -119,8 +119,8 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec,
 // Start the transfer of data in the stream.
 // Empty the_spec means apply operation to all flows
 void
-TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
@@ -140,7 +140,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
                 if (this->flow_connection_map_.find (flow_name_key,
                                                      flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->start (ACE_TRY_ENV);
+                    flow_connection_entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
                     ACE_TRY_CHECK;
                   }
               }
@@ -151,7 +151,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->start (ACE_TRY_ENV);
+                  entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -171,8 +171,8 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
 // the_spec means apply operation to all flows
 
 void
-TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
@@ -190,7 +190,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec,
                 FlowConnection_Map::ENTRY *flow_connection_entry = 0;
                 if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->destroy (ACE_TRY_ENV);
+                    flow_connection_entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
                     ACE_TRY_CHECK;
                   }
               }
@@ -202,7 +202,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec,
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->destroy (ACE_TRY_ENV);
+                  entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -221,8 +221,8 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec,
 // Empty the_spec means apply operation to all flows
 CORBA::Boolean
 TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos,
-                                  const AVStreams::flowSpec &flowspec,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const AVStreams::flowSpec &flowspec
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed))
@@ -230,12 +230,12 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos,
   ACE_TRY
     {
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,	
-		    "TAO_Basic_StreamCtrl::modify_QoS\n"));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_Basic_StreamCtrl::modify_QoS\n"));
+
       AVStreams::flowSpec in_flowspec;
       AVStreams::flowSpec out_flowspec;
-      
+
       in_flowspec.length (0);
       out_flowspec.length (0);
 
@@ -243,34 +243,34 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos,
       int out_index = 0;
 
       for (u_int i=0;i < flowspec.length ();i++)
-	{
-	  TAO_Forward_FlowSpec_Entry entry;
-	  entry.parse (flowspec [i].in ());
-	  int direction = entry.direction ();
-	  if (direction == 0)
-	    {
-	      in_flowspec.length (in_index + 1);
-	      in_flowspec [in_index++] = CORBA::string_dup (entry.entry_to_string ());
-	    }
-	  else
-	    {
-	      out_flowspec.length (out_index + 1);
-	      out_flowspec [out_index++] = CORBA::string_dup (entry.entry_to_string ());
-	    }
-	}
+        {
+          TAO_Forward_FlowSpec_Entry entry;
+          entry.parse (flowspec [i].in ());
+          int direction = entry.direction ();
+          if (direction == 0)
+            {
+              in_flowspec.length (in_index + 1);
+              in_flowspec [in_index++] = CORBA::string_dup (entry.entry_to_string ());
+            }
+          else
+            {
+              out_flowspec.length (out_index + 1);
+              out_flowspec [out_index++] = CORBA::string_dup (entry.entry_to_string ());
+            }
+        }
 
       if (in_flowspec.length () != 0)
-	{
-	  this->vdev_a_->modify_QoS (new_qos, in_flowspec, ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+        {
+          this->vdev_a_->modify_QoS (new_qos, in_flowspec TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
       if (out_flowspec.length () != 0)
-	{
-	  this->vdev_b_->modify_QoS (new_qos, out_flowspec, ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
-	}
+        {
+          this->vdev_b_->modify_QoS (new_qos, out_flowspec TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+        }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Basic_StreamCtrl::modify_QoS");
@@ -284,8 +284,8 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos,
 // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
 // E.g., loss of flow, reestablishment of flow, etc..
 void
-TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/,
-                                  CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/
+                                  TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -296,8 +296,8 @@ TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*t
 void
 TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
                                     const char  *fp_name,
-                                    const CORBA::Any &fp_settings,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const CORBA::Any &fp_settings
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -305,15 +305,15 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
 {
   if (!CORBA::is_nil (this->sep_a_.in ()))
     {
-      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings, ACE_TRY_ENV);
+      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 // Gets the flow connection.
 CORBA::Object_ptr
-TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
+                                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported))
@@ -329,8 +329,8 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name,
 // Sets the flow connection.
 void
 TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
-                                           CORBA::Object_ptr flow_connection_obj,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           CORBA::Object_ptr flow_connection_obj
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::notSupported))
@@ -338,7 +338,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
   AVStreams::FlowConnection_ptr flow_connection = AVStreams::FlowConnection::_nil ();
   ACE_TRY
     {
-      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj, ACE_TRY_ENV);
+      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -370,12 +370,12 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
 
 CORBA::Boolean
 TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
-                           const AVStreams::streamQoS &/* qos_spec */,
-                           CORBA::Environment &/* ACE_TRY_ENV */)
+                           const AVStreams::streamQoS &/* qos_spec */
+                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "TAO_Negotiator::negotiate\n"));
+              "TAO_Negotiator::negotiate\n"));
   return 0;
 }
 
@@ -413,11 +413,11 @@ int
 MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const
 {
   CORBA::Boolean result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       result =
-        this->mmdevice_->_is_equivalent (hash_key.mmdevice_, ACE_TRY_ENV);
+        this->mmdevice_->_is_equivalent (hash_key.mmdevice_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -435,14 +435,14 @@ operator < (const MMDevice_Map_Hash_Key &left,
             const MMDevice_Map_Hash_Key &right)
 {
   int result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_,
-                                                      ACE_TRY_ENV);
+      CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_,
-                                                        ACE_TRY_ENV);
+      CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = left_hash < right_hash;
     }
@@ -460,11 +460,11 @@ u_long
 MMDevice_Map_Hash_Key::hash (void)  const
 {
   u_long result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      result = this->mmdevice_->_hash (this->hash_maximum_,
-                                       ACE_TRY_ENV);
+      result = this->mmdevice_->_hash (this->hash_maximum_
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -484,10 +484,10 @@ MMDevice_Map_Hash_Key::hash (void)  const
 TAO_StreamCtrl::TAO_StreamCtrl (void)
   :mcastconfigif_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->streamctrl_ = this->_this (ACE_TRY_ENV);
+      this->streamctrl_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       char buf [BUFSIZ];
       int result = ACE_OS::hostname (buf, BUFSIZ);
@@ -524,14 +524,14 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void)
 // Stop the transfer of data of the stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   ACE_TRY
     {
-      TAO_Basic_StreamCtrl::stop (flow_spec, ACE_TRY_ENV);
+      TAO_Basic_StreamCtrl::stop (flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -539,13 +539,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec,
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -561,14 +561,14 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec,
 // Start the transfer of data in the stream.
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   ACE_TRY
     {
-      TAO_Basic_StreamCtrl::start (flow_spec, ACE_TRY_ENV);
+      TAO_Basic_StreamCtrl::start (flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -577,13 +577,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -600,14 +600,14 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
 // the streamendpoint and vdev associated with this stream
 // Empty the_spec means apply operation to all flows
 void
-TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
   ACE_TRY
     {
-      TAO_Basic_StreamCtrl::destroy (flow_spec, ACE_TRY_ENV);
+      TAO_Basic_StreamCtrl::destroy (flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -616,13 +616,13 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec,
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -643,8 +643,8 @@ CORBA::Boolean
 TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                            AVStreams::MMDevice_ptr b_party,
                            AVStreams::streamQoS &the_qos,
-                           const AVStreams::flowSpec &the_flows,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           const AVStreams::flowSpec &the_flows
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -692,8 +692,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     the_qos,
                                     met_qos,
                                     named_vdev.inout (),
-                                    the_flows,
-                                    ACE_TRY_ENV);
+                                    the_flows
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (TAO_debug_level > 0)
@@ -702,22 +702,22 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               CORBA::Any streamctrl_any;
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_a_->define_property ("Related_StreamCtrl",
-                                             streamctrl_any,
-                                             ACE_TRY_ENV);
+                                             streamctrl_any
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any vdev_a_any;
               vdev_a_any <<= this->vdev_a_.in ();
               this->sep_a_->define_property ("Related_VDev",
-                                             vdev_a_any,
-                                             ACE_TRY_ENV);
+                                             vdev_a_any
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any streamendpoint_a_any;
               streamendpoint_a_any <<= this->sep_a_.in ();
               this->vdev_a_->define_property ("Related_StreamEndpoint",
-					      streamendpoint_a_any,
-					      ACE_TRY_ENV);
+                                              streamendpoint_a_any
+                                              TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
 
@@ -726,8 +726,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               CORBA::Any mmdevice_a_any;
               mmdevice_a_any <<= a_party_copy;
               this->vdev_a_->define_property ("Related_MMDevice",
-                                              mmdevice_a_any,
-                                              ACE_TRY_ENV);
+                                              mmdevice_a_any
+                                              TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // add the mmdevice, sep and vdev to the map.
@@ -765,37 +765,37 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     the_qos,
                                     met_qos,
                                     named_vdev.inout (),
-                                    the_flows,
-                                    ACE_TRY_ENV);
+                                    the_flows
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
 
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                           "\n(%P|%t)stream_endpoint_b_ = %s",
-                          TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in (),
-                                                                              ACE_TRY_ENV)));
+                          TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()
+                                                                              TAO_ENV_ARG_PARAMETER)));
               ACE_TRY_CHECK;
               // Define ourselves as the related_streamctrl property of the sep.
               CORBA::Any streamctrl_any;
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_b_->define_property ("Related_StreamCtrl",
-                                             streamctrl_any,
-                                             ACE_TRY_ENV);
+                                             streamctrl_any
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any vdev_b_any;
               vdev_b_any <<= this->vdev_b_.in ();
               this->sep_b_->define_property ("Related_VDev",
-                                             vdev_b_any,
-                                             ACE_TRY_ENV);
+                                             vdev_b_any
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any streamendpoint_b_any;
               streamendpoint_b_any <<= this->sep_b_.in ();
               this->vdev_b_->define_property ("Related_StreamEndpoint",
-					      streamendpoint_b_any,
-					      ACE_TRY_ENV);
+                                              streamendpoint_b_any
+                                              TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
 
@@ -804,8 +804,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               CORBA::Any mmdevice_b_any;
               mmdevice_b_any <<= b_party_copy;
               this->vdev_b_->define_property ("Related_MMDevice",
-                                              mmdevice_b_any,
-                                              ACE_TRY_ENV);
+                                              mmdevice_b_any
+                                              TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               // add the mmdevice, sep and vdev to the map.
               MMDevice_Map_Entry map_entry;
@@ -835,13 +835,13 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           sep_a_peer_any <<= sep_a_peer.in();
           sep_b_peer_any <<= sep_b_peer.in();
           this->sep_a_->define_property ("PeerAdapter",
-                                          sep_a_peer_any,
-                                          ACE_TRY_ENV);
+                                          sep_a_peer_any
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->sep_b_->define_property ("PeerAdapter",
-                                         sep_b_peer_any,
-                                         ACE_TRY_ENV);
+                                         sep_b_peer_any
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -853,21 +853,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           // instead.
           ACE_TRY_EX (set_source_id)
             {
-              CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows",
-									   ACE_TRY_ENV);
+              CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows"
+                                                                           TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (set_source_id);
               AVStreams::flowSpec_var flows;
               *flows_any >>= flows.out ();
               for (u_int i=0; i< flows->length ();i++)
                 {
                   CORBA::Object_var fep_obj =
-                    this->sep_a_->get_fep (flows [i], ACE_TRY_ENV);
+                    this->sep_a_->get_fep (flows [i] TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (set_source_id);
                   ACE_TRY_EX (producer_check)
                     {
                       AVStreams::FlowProducer_var producer =
-                        AVStreams::FlowProducer::_narrow (fep_obj.in (),
-                                                          ACE_TRY_ENV);
+                        AVStreams::FlowProducer::_narrow (fep_obj.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (producer_check);
                       producer->set_source_id (this->source_id_++);
                     }
@@ -891,8 +891,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               // many producers who do not have flow interfaces. Then
               // the streamctrl has to give an array of source ids to
               // the sep.
-              this->sep_a_->set_source_id (this->source_id_++,
-                                           ACE_TRY_ENV);
+              this->sep_a_->set_source_id (this->source_id_++
+                                           TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_ENDTRY;
@@ -903,15 +903,15 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                               TAO_MCastConfigIf,
                               0);
               // @@: Deactivating the object thru poa means calling remove_ref after _this.
-              this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_TRY_ENV);
+              this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           // Multicast source being added.
           CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (this->streamctrl_.in (),
                                                                  this->mcastconfigif_ptr_.in (),
                                                                  the_qos,
-                                                                 the_flows,
-                                                                 ACE_TRY_ENV);
+                                                                 the_flows
+                                                                 TAO_ENV_ARG_PARAMETER);
           if (!result)
             ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0);
         }
@@ -925,8 +925,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                 ACE_ERROR_RETURN ((LM_ERROR, "first add a source and then a sink\n"), 0);
               this->mcastconfigif_->set_peer (this->vdev_b_.in (),
                                               the_qos,
-                                              the_flows,
-                                              ACE_TRY_ENV);
+                                              the_flows
+                                              TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -937,8 +937,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               //  ACE adds support for ATM multicast.
               connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (),
                                                                  the_qos,
-                                                                 the_flows,
-                                                                 ACE_TRY_ENV);
+                                                                 the_flows
+                                                                 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (connect_leaf);
               connect_leaf_success = 1;
             }
@@ -958,9 +958,9 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n"));
               AVStreams::flowSpec connect_flows = the_flows;
-              this->sep_a_->multiconnect (the_qos, connect_flows, ACE_TRY_ENV);
+              this->sep_a_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
-              this->sep_b_->multiconnect (the_qos, connect_flows, ACE_TRY_ENV);
+              this->sep_b_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -973,15 +973,15 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               this->vdev_a_->set_peer (this->streamctrl_.in (),
                                        this->vdev_b_.in (),
                                        the_qos,
-                                       the_flows,
-                                       ACE_TRY_ENV);
+                                       the_flows
+                                       TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
               this->vdev_b_->set_peer (this->streamctrl_.in (),
                                        this->vdev_a_.in (),
                                        the_qos,
-                                       the_flows,
-                                       ACE_TRY_ENV);
+                                       the_flows
+                                       TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
 
@@ -990,8 +990,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               CORBA::Boolean result  =
                 this->sep_a_->connect (this->sep_b_.in (),
                                        the_qos,
-                                       the_flows,
-                                       ACE_TRY_ENV);
+                                       the_flows
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0);
@@ -1003,8 +1003,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               this->bind (this->sep_a_.in (),
                           this->sep_b_.in (),
                           the_qos,
-                          the_flows,
-                          ACE_TRY_ENV);
+                          the_flows
+                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -1025,8 +1025,8 @@ CORBA::Boolean
 TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::StreamEndPoint_B_ptr sep_b,
                       AVStreams::streamQoS &stream_qos,
-                      const AVStreams::flowSpec &flow_spec,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      const AVStreams::flowSpec &flow_spec
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -1049,25 +1049,25 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       CORBA::Any sep_any;
       sep_any <<= sep_b;
       sep_a->define_property ("PeerAdapter",
-                              sep_any,
-                              ACE_TRY_ENV);
+                              sep_any
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       sep_any <<= sep_a;
       sep_b->define_property ("PeerAdapter",
-                              sep_any,
-                              ACE_TRY_ENV);
+                              sep_any
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // since its full profile we do the viable stream setup algorithm.
       // get the flows for the A streamendpoint.
       // the flows spec is empty and hence we do a exhaustive match.
       AVStreams::flowSpec a_flows, b_flows;
       CORBA::Any_var flows_any;
-      flows_any = sep_a->get_property_value ("Flows", ACE_TRY_ENV);
+      flows_any = sep_a->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::flowSpec *temp_flows;
       flows_any.in () >>= temp_flows;
       a_flows = *temp_flows;
-      flows_any = sep_b->get_property_value ("Flows", ACE_TRY_ENV);
+      flows_any = sep_b->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       flows_any.in () >>= temp_flows;
       b_flows = *temp_flows;
@@ -1085,12 +1085,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           const char *flowname = a_flows[i];
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
-            sep_a->get_fep (flowname,
-                            ACE_TRY_ENV);
+            sep_a->get_fep (flowname
+                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           AVStreams::FlowEndPoint_ptr fep =
-            AVStreams::FlowEndPoint::_narrow (fep_obj.in (),
-                                              ACE_TRY_ENV);
+            AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_CString fep_key (flowname);
           result = a_fep_map->bind (fep_key, fep);
@@ -1103,12 +1103,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           const char *flowname = b_flows[i];
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
-            sep_b->get_fep (flowname,
-                            ACE_TRY_ENV);
+            sep_b->get_fep (flowname
+                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           AVStreams::FlowEndPoint_ptr fep =
-            AVStreams::FlowEndPoint::_narrow (fep_obj.in (),
-                                              ACE_TRY_ENV);
+            AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_CString fep_key (flowname);
           result = b_fep_map->bind (fep_key, fep);
@@ -1172,7 +1172,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
             {
               AVStreams::FlowEndPoint_ptr fep_a = a_feps_entry->int_id_;
               AVStreams::FlowEndPoint_var connected_to =
-                fep_a->get_connected_fep (ACE_TRY_ENV);
+                fep_a->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (flow_connect);
 
               if (!CORBA::is_nil (connected_to.in ()))
@@ -1189,7 +1189,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                   AVStreams::FlowConnection_var flow_connection;
 
                   AVStreams::FlowEndPoint_var connected_to =
-                    fep_b->get_connected_fep (ACE_TRY_ENV);
+                    fep_b->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flow_connect);
 
                   if (!CORBA::is_nil (connected_to.in ()))
@@ -1198,28 +1198,28 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       continue;
                     }
 
-                  if (fep_a->is_fep_compatible (fep_b,
-                                                ACE_TRY_ENV) == 1)
+                  if (fep_a->is_fep_compatible (fep_b
+                                                TAO_ENV_ARG_PARAMETER) == 1)
                     {
                       ACE_TRY_CHECK_EX (flow_connect);
                       // assume that flow names are same so that we
                       // can use either of them.
                       CORBA::Object_var flow_connection_obj;
                       CORBA::Any_var flowname_any =
-                        fep_a->get_property_value ("Flow",
-                                                   ACE_TRY_ENV);
+                        fep_a->get_property_value ("Flow"
+                                                   TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (flow_connect);
                       const char *flowname = 0;
                       flowname_any.in () >>= flowname;
                       ACE_TRY_EX (flow_connection)
                         {
                           flow_connection_obj =
-                            this->get_flow_connection (flowname,
-                                                       ACE_TRY_ENV);
+                            this->get_flow_connection (flowname
+                                                       TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
                           flow_connection =
-                            AVStreams::FlowConnection::_narrow (flow_connection_obj.in (),
-                                                                ACE_TRY_ENV);
+                            AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
+                                                                TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
                         }
                       ACE_CATCHANY
@@ -1228,11 +1228,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                           ACE_NEW_RETURN (flowConnection,
                                           TAO_FlowConnection,
                                           0);
-                          flow_connection = flowConnection->_this (ACE_TRY_ENV);
+                          flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connect);
                           this->set_flow_connection (flowname,
-                                                     flow_connection.in (),
-                                                     ACE_TRY_ENV);
+                                                     flow_connection.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connect);
                         }
                       ACE_ENDTRY;
@@ -1250,12 +1250,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       ACE_TRY_EX (producer_check)
                         {
                           producer =
-                            AVStreams::FlowProducer::_narrow (fep_a,
-                                                              ACE_TRY_ENV);
+                            AVStreams::FlowProducer::_narrow (fep_a
+                                                              TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (producer_check);
                           consumer =
-                            AVStreams::FlowConsumer::_narrow (fep_b,
-                                                              ACE_TRY_ENV);
+                            AVStreams::FlowConsumer::_narrow (fep_b
+                                                              TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (producer_check);
 
                           // If the types don't match then try in
@@ -1263,12 +1263,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                           if (CORBA::is_nil (producer.in ()))
                             {
                               producer =
-                                AVStreams::FlowProducer::_narrow (fep_b,
-                                                                  ACE_TRY_ENV);
+                                AVStreams::FlowProducer::_narrow (fep_b
+                                                                  TAO_ENV_ARG_PARAMETER);
                               ACE_TRY_CHECK_EX (producer_check);
                               consumer =
-                                AVStreams::FlowConsumer::_narrow (fep_a,
-                                                                  ACE_TRY_ENV);
+                                AVStreams::FlowConsumer::_narrow (fep_a
+                                                                  TAO_ENV_ARG_PARAMETER);
                               ACE_TRY_CHECK_EX (producer_check);
                             }
                           // At this point they should both be
@@ -1286,13 +1286,13 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       ACE_ENDTRY;
                       ACE_CHECK_RETURN (0);
                       CORBA::String_var fep_a_name, fep_b_name;
-                      flowname_any = fep_a->get_property_value ("FlowName",
-                                                                ACE_TRY_ENV);
+                      flowname_any = fep_a->get_property_value ("FlowName"
+                                                                TAO_ENV_ARG_PARAMETER);
                       const char *temp_name;
                       flowname_any.in () >>= temp_name;
                       fep_a_name = CORBA::string_dup (temp_name);
-                      flowname_any = fep_b->get_property_value ("FlowName",
-                                                                ACE_TRY_ENV);
+                      flowname_any = fep_b->get_property_value ("FlowName"
+                                                                TAO_ENV_ARG_PARAMETER);
                       flowname_any.in () >>= temp_name;
                       fep_b_name = CORBA::string_dup (temp_name);
                       AVStreams::QoS flow_qos;
@@ -1310,8 +1310,8 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                         }
                       flow_connection->connect (producer.in (),
                                                 consumer.in (),
-                                                flow_qos,
-                                                ACE_TRY_ENV);
+                                                flow_qos
+                                                TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (flow_connect);
                     }
                 }
@@ -1325,15 +1325,15 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
         }
       ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
-    }                             
+    }
   ACE_CATCHANY
     {
       // error was thrown because one of the streamendpoints is light profile.
       // Now connect the streams together
       this->sep_a_->connect (this->sep_b_.in (),
                              stream_qos,
-                             flow_spec,
-                             ACE_TRY_ENV);
+                             flow_spec
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -1342,7 +1342,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
 }
 
 void
-TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
@@ -1358,13 +1358,13 @@ TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV)
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec, ACE_TRY_ENV);
+          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1379,8 +1379,8 @@ TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
-                              const AVStreams::flowSpec &/* the_spec */,
-                              CORBA::Environment &/* ACE_TRY_ENV */)
+                              const AVStreams::flowSpec &/* the_spec */
+                              TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1389,8 +1389,8 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
 
 void
 TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
-                            const AVStreams::flowSpec & /* the_spec */,
-                            CORBA::Environment &/* ACE_TRY_ENV */)
+                            const AVStreams::flowSpec & /* the_spec */
+                            TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1399,8 +1399,8 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
 
 AVStreams::VDev_ptr
 TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                  AVStreams::StreamEndPoint_out sep,
-                                  CORBA::Environment &/* ACE_TRY_ENV */)
+                                  AVStreams::StreamEndPoint_out sep
+                                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
@@ -1420,15 +1420,15 @@ TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
 
 CORBA::Boolean
 TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &the_qos,
-                            const AVStreams::flowSpec &the_spec,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            const AVStreams::flowSpec &the_spec
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
-  if (TAO_debug_level > 0)	
+  if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
-	      "TAO_StreamCtrl::modify_QoS\n"));
+              "TAO_StreamCtrl::modify_QoS\n"));
 
 
   if (this->mcastconfigif_ != 0)
@@ -1438,7 +1438,7 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &the_qos,
     }
   else
     {
-      TAO_Basic_StreamCtrl::modify_QoS (the_qos, the_spec, ACE_TRY_ENV);
+      TAO_Basic_StreamCtrl::modify_QoS (the_qos, the_spec TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -1462,8 +1462,8 @@ TAO_MCastConfigIf::~TAO_MCastConfigIf (void)
 CORBA::Boolean
 TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
                              AVStreams::streamQoS & qos,
-                             const AVStreams::flowSpec & flow_spec,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             const AVStreams::flowSpec & flow_spec
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
@@ -1474,7 +1474,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
       ACE_NEW_RETURN (info,
                       Peer_Info,
                       0);
-      info->peer_ = AVStreams::VDev::_narrow (peer, ACE_TRY_ENV);
+      info->peer_ = AVStreams::VDev::_narrow (peer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       info->qos_ = qos;
       info->flow_spec_ = flow_spec;
@@ -1492,8 +1492,8 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
 
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
-TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Peer_Info *info;
@@ -1503,7 +1503,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
            (info = this->peer_list_iterator_.next ()) != 0;
            this->peer_list_iterator_.advance ())
         {
-          info->peer_->configure (a_configuration, ACE_TRY_ENV);
+          info->peer_->configure (a_configuration TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1518,8 +1518,8 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
 
 
 void
-TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial,
-                                              CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial
+                                              TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->initial_configuration_ = initial;
@@ -1528,8 +1528,8 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::set_format (const char * flowName,
-                               const char * format_name,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const char * format_name
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -1542,7 +1542,7 @@ TAO_MCastConfigIf::set_format (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_format (flowName, format_name, ACE_TRY_ENV);
+              info->peer_->set_format (flowName, format_name TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -1559,8 +1559,8 @@ TAO_MCastConfigIf::set_format (const char * flowName,
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::set_dev_params (const char * flowName,
-                                   const CosPropertyService::Properties & new_params,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const CosPropertyService::Properties & new_params
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -1575,7 +1575,7 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_dev_params (flowName, new_params, ACE_TRY_ENV);
+              info->peer_->set_dev_params (flowName, new_params TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -1628,22 +1628,22 @@ TAO_Base_StreamEndPoint::handle_open (void)
 }
 
 int
-TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &,
-                                      CORBA::Environment &)
+TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &
+                                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &,
-                                       CORBA::Environment &)
+TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &
+                                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &,
-                                         CORBA::Environment &)
+TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
@@ -1664,8 +1664,8 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &)
 
 // The following function is for backward compatibility.
 CORBA::Boolean
-TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &,
-                                                 CORBA::Environment &)
+TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &
+                                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 1;
 }
@@ -1702,7 +1702,7 @@ TAO_Base_StreamEndPoint::set_flow_handler (const char *flowname,
   ACE_CString flow_name_key (flowname);
   if (this->flow_handler_map_.bind (flow_name_key, handler) != 0)
     ACE_ERROR ((LM_ERROR,
-		"Error in storing flow handler\n"));
+                "Error in storing flow handler\n"));
 }
 
 void
@@ -1712,7 +1712,7 @@ TAO_Base_StreamEndPoint::set_control_flow_handler (const char *flowname,
   ACE_CString flow_name_key (flowname);
   if (this->control_flow_handler_map_.bind (flow_name_key, handler) != 0)
     ACE_ERROR ((LM_ERROR,
-		"Error in storing control flow handler\n"));
+                "Error in storing control flow handler\n"));
 }
 
 // ----------------------------------------------------------------------
@@ -1736,8 +1736,8 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void)
 CORBA::Boolean
 TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                              AVStreams::streamQoS &qos,
-                             const AVStreams::flowSpec &the_spec,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             const AVStreams::flowSpec &the_spec
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -1751,8 +1751,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
     {
       if (!CORBA::is_nil (this->negotiator_.in ()))
         {
-	  ACE_DEBUG ((LM_DEBUG,
-		      "NEGOTIATOR AVIALABLE\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      "NEGOTIATOR AVIALABLE\n"));
 
           CORBA::Any_var negotiator_any = responder->get_property_value ("Negotiator");
 
@@ -1762,8 +1762,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
             {
               CORBA::Boolean result =
                 this->negotiator_->negotiate (peer_negotiator,
-                                              qos,
-                                              ACE_TRY_ENV);
+                                              qos
+                                              TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (negotiate);
               if (!result)
                 if (TAO_debug_level > 0)
@@ -1784,7 +1784,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
         {
           // choose protocols based on what the remote endpoint can support.
           CORBA::Any_var protocols_any =
-            responder->get_property_value ("AvailableProtocols", ACE_TRY_ENV);
+            responder->get_property_value ("AvailableProtocols" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (available_protocols);
           AVStreams::protocolSpec peer_protocols;
           AVStreams::protocolSpec *temp_protocols;
@@ -1814,18 +1814,18 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       AVStreams::streamQoS network_qos;
       if (qos.length () > 0)
         {
-	  if (TAO_debug_level > 0)
-	    ACE_DEBUG ((LM_DEBUG,
-			"QoS is Specified\n"));
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "QoS is Specified\n"));
 
           int result = this->translate_qos (qos,
-					    network_qos);
+                                            network_qos);
           if (result != 0)
             if (TAO_debug_level > 0)
               ACE_DEBUG ((LM_DEBUG,
-			  "QoS translation failed\n"));
+                          "QoS translation failed\n"));
 
-	  this->qos ().set (network_qos);
+          this->qos ().set (network_qos);
         }
 
 
@@ -1833,8 +1833,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
       this->handle_preconnect (flow_spec);
 
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, 
-		    "TAO_StreamEndPoint::connect: flow_spec_length = %d\n",
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO_StreamEndPoint::connect: flow_spec_length = %d\n",
                     flow_spec.length ()));
       u_int i;
       for (i=0;i<flow_spec.length ();i++)
@@ -1863,14 +1863,14 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
         ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0);
 
 
-      AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_TRY_ENV);
+      AVStreams::StreamEndPoint_var streamendpoint = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       retv = responder->request_connection (streamendpoint.in (),
                                             0,
                                             network_qos,
-                                            flow_spec,
-                                            ACE_TRY_ENV);
+                                            flow_spec
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -1886,13 +1886,13 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                           0);
           if (entry->parse (flow_spec[i].in ()) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
-			       "Reverse_Flow_Spec_Set::parse failed\n"),
-			      0);
+                               "Reverse_Flow_Spec_Set::parse failed\n"),
+                              0);
 
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-			"TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n",
-			entry->entry_to_string ()));
+                        "TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n",
+                        entry->entry_to_string ()));
 
           this->reverse_flow_spec_set.insert (entry);
         }
@@ -1903,8 +1903,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                                                              TAO_AV_Core::TAO_AV_ENDPOINT_A);
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-			   "TAO_AV_Core::init_reverse_flows failed\n"),
-			  0);
+                           "TAO_AV_Core::init_reverse_flows failed\n"),
+                          0);
 
       // Make the upcall to the app
       retv = this->handle_postconnect (flow_spec);
@@ -1937,13 +1937,13 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos,
 // Empty the_spec --> apply to all flows
 
 void
-TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   // Make the upcall into the app
-  this->handle_stop (flow_spec, ACE_TRY_ENV);
+  this->handle_stop (flow_spec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (flow_spec.length () > 0)
@@ -1985,14 +1985,14 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec,
 // Start the physical flow of data on the stream
 // Empty the_spec --> apply to all flows
 void
-TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n"));
   // Make the upcall into the app
-  this->handle_start (flow_spec, ACE_TRY_ENV);
+  this->handle_start (flow_spec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (flow_spec.length () > 0)
@@ -2076,8 +2076,8 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
 
 // Close the connection
 void
-TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec,
-                             CORBA::Environment &/* ACE_TRY_ENV */)
+TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
+                             TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
@@ -2154,7 +2154,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec,
     }
 
   // Make the upcall into the app
-  //  this->handle_destroy (the_spec, ACE_TRY_ENV);
+  //  this->handle_destroy (the_spec TAO_ENV_ARG_PARAMETER);
   //
 }
 
@@ -2164,8 +2164,8 @@ CORBA::Boolean
 TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiator*/,
                                         CORBA::Boolean /*is_mcast*/,
                                         AVStreams::streamQoS &qos,
-                                        AVStreams::flowSpec &flow_spec,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        AVStreams::flowSpec &flow_spec
+                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpDenied,
                    AVStreams::noSuchFlow,
@@ -2175,8 +2175,8 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
-  
+                "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
+
 
   int result = 0;
   ACE_TRY
@@ -2184,18 +2184,18 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
       AVStreams::streamQoS network_qos;
       if (qos.length () > 0)
         {
-	 if (TAO_debug_level > 0) 
-	  ACE_DEBUG ((LM_DEBUG,
-		      "QoS is Specified\n"));
-	  
+         if (TAO_debug_level > 0)
+          ACE_DEBUG ((LM_DEBUG,
+                      "QoS is Specified\n"));
+
           int result = this->translate_qos (qos, network_qos);
           if (result != 0)
             if (TAO_debug_level > 0)
               ACE_DEBUG ((LM_DEBUG, "QoS translation failed\n"));
-	  
-	  this->qos ().set (network_qos);
-	}
-      
+
+          this->qos ().set (network_qos);
+        }
+
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "\n(%P|%t) TAO_StreamEndPoint::request_connection: "
@@ -2211,19 +2211,19 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
                           TAO_Forward_FlowSpec_Entry,
                           0);
 
-	  if(TAO_debug_level > 0)
-	     ACE_DEBUG(( LM_DEBUG, "%N:%l Parsing flow spec: %s\n", flow_spec[i].in() ));
+          if(TAO_debug_level > 0)
+             ACE_DEBUG(( LM_DEBUG, "%N:%l Parsing flow spec: %s\n", flow_spec[i].in() ));
 
           if (entry->parse (flow_spec[i]) == -1)
-	  {
+          {
             if (TAO_debug_level > 0)
               ACE_DEBUG ((LM_DEBUG, "%N:%l Error parsing flow_spec: %s\n", flow_spec[i].in() ));
             return 0;
-	  }
+          }
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-			"TAO_StreamEndPoint::request_connection Flow Spec %s",
-			entry->entry_to_string ()));
+                        "TAO_StreamEndPoint::request_connection Flow Spec %s",
+                        entry->entry_to_string ()));
 
           this->forward_flow_spec_set.insert (entry);
         }
@@ -2237,13 +2237,13 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
         return 0;
 
       // Make the upcall to the app
-      result = this->handle_connection_requested (flow_spec, ACE_TRY_ENV);
+      result = this->handle_connection_requested (flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-			   "TAO_StreamEndpoint::request_connection");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "TAO_StreamEndpoint::request_connection");
       return 0;
     }
   ACE_ENDTRY;
@@ -2253,12 +2253,12 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
 
 int
 TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
-				const AVStreams::flowSpec &the_flows,
-				CORBA::Environment &/*ACE_TRY_ENV*/)
+                                const AVStreams::flowSpec &the_flows
+                                TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_StreamEndPoint::change_qos\n"));
+                "TAO_StreamEndPoint::change_qos\n"));
 
   TAO_AV_QoS qos (new_qos);
   for (int i = 0; (unsigned) i < the_flows.length (); i++)
@@ -2268,21 +2268,21 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
       ACE_CString flow_name_key (entry.flowname ());
       Flow_Handler_Map_Entry *handler_entry;
       if (this->flow_handler_map_.find (flow_name_key,
-					handler_entry) == 0)
-	{
-	  AVStreams::QoS flow_qos;
-	  if (qos.get_flow_qos (entry.flowname (), flow_qos) != 0)
-	    ACE_DEBUG ((LM_DEBUG,
-			"New QoS for the flow %s is not specified\n",
-			entry.flowname ()));
-	  int result;
-	  result = handler_entry->int_id_->change_qos (flow_qos);
-	  if (result != 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Modifying QoS Failed\n"),
-			      -1);
-
-	}
+                                        handler_entry) == 0)
+        {
+          AVStreams::QoS flow_qos;
+          if (qos.get_flow_qos (entry.flowname (), flow_qos) != 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "New QoS for the flow %s is not specified\n",
+                        entry.flowname ()));
+          int result;
+          result = handler_entry->int_id_->change_qos (flow_qos);
+          if (result != 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Modifying QoS Failed\n"),
+                              -1);
+
+        }
     }
   return 0;
 }
@@ -2290,15 +2290,15 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
 // Refers to modification of transport QoS.
 CORBA::Boolean
 TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &/* new_qos */,
-                                const AVStreams::flowSpec &/* the_flows */,
-                                CORBA::Environment &/* ACE_TRY_ENV */)
+                                const AVStreams::flowSpec &/* the_flows */
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
   if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
-	      "TAO_StreamEndPoint::modify_QoS\n"));
+              "TAO_StreamEndPoint::modify_QoS\n"));
   return 1;
 
 }
@@ -2306,8 +2306,8 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &/* new_qos */,
 // Sets the list of protocols this streamendpoint can understand.
 
 CORBA::Boolean
-TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols,
-                                              CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols
+                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -2316,8 +2316,8 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
 
       protocol_restriction_any <<= protocols;
       this->define_property ("ProtocolRestriction",
-                             protocol_restriction_any,
-                             ACE_TRY_ENV);
+                             protocol_restriction_any
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->protocols_ = protocols;
     }
@@ -2333,14 +2333,13 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
 
 
 void
-TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::streamOpFailed))
 {
   ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 // Sets the status of the flow protocol.
@@ -2348,8 +2347,8 @@ TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec,
 void
 TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
                                   const char *fp_name,
-                                  const CORBA::Any &fp_settings,
-                                  CORBA::Environment &/*ACE_TRY_ENV*/)
+                                  const CORBA::Any &fp_settings
+                                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -2362,8 +2361,8 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
 
 
 CORBA::Object_ptr
-TAO_StreamEndPoint::get_fep (const char *flow_name,
-                             CORBA::Environment &)
+TAO_StreamEndPoint::get_fep (const char *flow_name
+                             TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
@@ -2376,8 +2375,8 @@ TAO_StreamEndPoint::get_fep (const char *flow_name,
 }
 
 char*
-TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
@@ -2398,8 +2397,8 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep,
       CORBA::Any flowname_any;
       flowname_any <<= flow_name.in ();
       fep->define_property ("Flow",
-                            flowname_any,
-                            ACE_TRY_ENV);
+                            flowname_any
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2413,8 +2412,8 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep,
 }
 
 char*
-TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
@@ -2423,7 +2422,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep,
   ACE_TRY
     {
       CORBA::Any_var flow_name_any =
-        fep->get_property_value ("FlowName", ACE_TRY_ENV);
+        fep->get_property_value ("FlowName" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *tmp;
@@ -2433,7 +2432,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep,
   ACE_CATCHANY
     {
       flow_name =
-        this->add_fep_i_add_property (fep, ACE_TRY_ENV);
+        this->add_fep_i_add_property (fep TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   ACE_ENDTRY;
@@ -2441,23 +2440,23 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep,
 }
 
 char *
-TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   AVStreams::FlowEndPoint_var fep =
-    AVStreams::FlowEndPoint::_narrow (fep_obj, ACE_TRY_ENV);
+    AVStreams::FlowEndPoint::_narrow (fep_obj TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var flow_name =
-    this->add_fep_i (fep.in (), ACE_TRY_ENV);
+    this->add_fep_i (fep.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TRY
     {
-      fep->lock (ACE_TRY_ENV);
+      fep->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Add it to the sequence of flowNames supported.
       // put the flowname and the flowendpoint in a hashtable.
@@ -2474,8 +2473,8 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj,
       CORBA::Any flows_any;
       flows_any <<= this->flows_;
       this->define_property ("Flows",
-                             flows_any,
-                             ACE_TRY_ENV);
+                             flows_any
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2489,8 +2488,8 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj,
 
 
 void
-TAO_StreamEndPoint::remove_fep (const char *flow_name,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::remove_fep (const char *flow_name
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
@@ -2512,8 +2511,8 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name,
       flows <<= new_flows;
       this->flows_ = new_flows;
       this->define_property ("Flows",
-                             flows,
-                             ACE_TRY_ENV);
+                             flows
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2526,8 +2525,8 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name,
 
 // Sets the negotiator object.
 void
-TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -2535,8 +2534,8 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
       CORBA::Any negotiator;
       negotiator <<= new_negotiator;
       this->define_property ("Negotiator",
-                             negotiator,
-                             ACE_TRY_ENV);
+                             negotiator
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator);
     }
@@ -2552,8 +2551,8 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
 // Sets the public key used for this streamendpoint.
 void
 TAO_StreamEndPoint::set_key (const char *flow_name,
-                             const AVStreams::key & the_key,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             const AVStreams::key & the_key
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -2564,8 +2563,8 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
       char PublicKey_property [BUFSIZ];
       ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name);
       this->define_property (PublicKey_property,
-                             PublicKey,
-                             ACE_TRY_ENV);
+                             PublicKey
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2578,8 +2577,8 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
 
 // Set the source id.
 void
-TAO_StreamEndPoint::set_source_id (CORBA::Long source_id,
-                                   CORBA::Environment &)
+TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
+                                   TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -2587,8 +2586,8 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id,
 
 CORBA::Boolean
 TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
-                                  AVStreams::flowSpec &/*flow_spec*/,
-                                  CORBA::Environment &/*ACE_TRY_ENV*/)
+                                  AVStreams::flowSpec &/*flow_spec*/
+                                  TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n"));
@@ -2638,8 +2637,8 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
 // IP Multicast style connect.
 CORBA::Boolean
 TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
-                                    AVStreams::flowSpec &flow_spec,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    AVStreams::flowSpec &flow_spec
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -2676,7 +2675,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                   if (result < 0)
                     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ()));
                   // Narrow it to FlowProducer.
-                  AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint, ACE_TRY_ENV);
+                  AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (narrow);
                   // Else narrow succeeeded.
                   if (!CORBA::is_nil (producer.in ()))
@@ -2687,8 +2686,8 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                           if (CORBA::is_nil (this->streamctrl_.in ()))
                               {
                                 CORBA::Any_var streamctrl_any;
-                                streamctrl_any = this->get_property_value ("Related_StreamCtrl",
-                                                                           ACE_TRY_ENV);
+                                streamctrl_any = this->get_property_value ("Related_StreamCtrl"
+                                                                           TAO_ENV_ARG_PARAMETER);
                                 ACE_TRY_CHECK;
                                 AVStreams::StreamCtrl_ptr streamctrl;
                                 streamctrl_any.in () >>= streamctrl;
@@ -2696,11 +2695,11 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                               }
 
                           CORBA::Object_var flow_connection_obj =
-                            this->streamctrl_->get_flow_connection (forward_entry->flowname (),
-                                                                    ACE_TRY_ENV);
+                            this->streamctrl_->get_flow_connection (forward_entry->flowname ()
+                                                                    TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
-                          flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in (),
-                                                                                ACE_TRY_ENV);
+                          flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
+                                                                                TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
                         }
                       ACE_CATCHANY
@@ -2713,11 +2712,11 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                           flowConnection->set_mcast_addr (this->mcast_addr_, this->mcast_port_);
                           this->mcast_port_++;
                           flowConnection->set_protocol (forward_entry->carrier_protocol_str ());
-                          flow_connection = flowConnection->_this (ACE_TRY_ENV);
+                          flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
                           ACE_TRY_CHECK;
                           this->streamctrl_->set_flow_connection (forward_entry->flowname (),
-                                                                  flow_connection.in (),
-                                                                  ACE_TRY_ENV);
+                                                                  flow_connection.in ()
+                                                                  TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
                         }
                       ACE_ENDTRY;
@@ -2726,13 +2725,13 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                         {
                           CORBA::Any fp_settings;
                           flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (),
-                                                              fp_settings,
-                                                              ACE_TRY_ENV);
+                                                              fp_settings
+                                                              TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
                         }
                       result = flow_connection->add_producer (producer.in (),
-                                                              flow_qos,
-                                                              ACE_TRY_ENV);
+                                                              flow_qos
+                                                              TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
                       if (result == 0)
                         ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0);
@@ -2831,8 +2830,8 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
 CORBA::Boolean
 TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
                                     AVStreams::streamQoS & /* the_qos */,
-                                    const AVStreams::flowSpec & /* the_flows */,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const AVStreams::flowSpec & /* the_flows */
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -2845,8 +2844,8 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */
 // Multicast not supported yet.
 void
 TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
-                                       const AVStreams::flowSpec & /* theSpec */,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       const AVStreams::flowSpec & /* theSpec */
+                                       TAO_ENV_ARG_DECL)
 
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
@@ -2874,8 +2873,8 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
 
 CORBA::Boolean
 TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
-                                    AVStreams::flowSpec &flow_spec,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    AVStreams::flowSpec &flow_spec
+                                    TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -2901,7 +2900,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
               AVStreams::FlowConsumer_var consumer;
               ACE_TRY_EX (narrow)
                 {
-                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in (), ACE_TRY_ENV);
+                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (narrow);
                 }
               ACE_CATCHANY
@@ -2921,19 +2920,19 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
                   if (CORBA::is_nil (this->streamctrl_.in ()))
                     {
                       CORBA::Any_var streamctrl_any;
-                      streamctrl_any = this->get_property_value ("Related_StreamCtrl",
-                                                                 ACE_TRY_ENV);
+                      streamctrl_any = this->get_property_value ("Related_StreamCtrl"
+                                                                 TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
                       AVStreams::StreamCtrl_ptr streamctrl;
                       streamctrl_any.in () >>= streamctrl;
                       this->streamctrl_ = AVStreams::StreamCtrl::_duplicate (streamctrl);
                     }
                   CORBA::Object_var flow_connection_obj =
-                    this->streamctrl_->get_flow_connection (forward_entry->flowname (),
-                                                            ACE_TRY_ENV);
+                    this->streamctrl_->get_flow_connection (forward_entry->flowname ()
+                                                            TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flow_connection);
-                  flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in (),
-                                                                        ACE_TRY_ENV);
+                  flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
+                                                                        TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flow_connection);
                 }
               ACE_CATCHANY
@@ -2944,8 +2943,8 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
               ACE_ENDTRY;
               ACE_CHECK_RETURN (0);
               result = flow_connection->add_consumer (consumer.in (),
-                                                      flow_qos,
-                                                      ACE_TRY_ENV);
+                                                      flow_qos
+                                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0);
@@ -3026,8 +3025,8 @@ CORBA::Boolean
 TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     AVStreams::VDev_ptr the_peer_dev,
                     AVStreams::streamQoS &the_qos,
-                    const AVStreams::flowSpec &the_spec,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const AVStreams::flowSpec &the_spec
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3042,8 +3041,8 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called"));
 
-      CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev,
-                                                                                  ACE_TRY_ENV);
+      CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev
+                                                                                  TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -3054,8 +3053,8 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
       CORBA::Any anyval;
       anyval <<= ior.in ();
       this->define_property ("Related_VDev",
-                             anyval,
-                             ACE_TRY_ENV);
+                             anyval
+                             TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -3064,8 +3063,8 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
 
       CORBA::Any_var anyptr;
       const char *media_ctrl_ior;
-      anyptr = this->peer_->get_property_value ("Related_MediaCtrl",
-                                                ACE_TRY_ENV);
+      anyptr = this->peer_->get_property_value ("Related_MediaCtrl"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       anyptr.in () >>= media_ctrl_ior;
@@ -3074,10 +3073,10 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     media_ctrl_ior));
       CORBA::Object_ptr media_ctrl_obj =
         TAO_ORB_Core_instance ()->orb ()->string_to_object
-        (media_ctrl_ior, ACE_TRY_ENV);
+        (media_ctrl_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      result = this->set_media_ctrl (media_ctrl_obj, ACE_TRY_ENV);
+      result = this->set_media_ctrl (media_ctrl_obj TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3091,12 +3090,11 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
 }
 
 CORBA::Boolean
-TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl
+                          TAO_ENV_ARG_DECL_NOT_USED)
 
 {
 //  ACE_UNUSED_ARG (media_ctrl);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   // FIX MEMORY LEAK:
@@ -3113,8 +3111,8 @@ CORBA::Boolean
 TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
                           AVStreams::MCastConfigIf_ptr mcast_peer,
                           AVStreams::streamQoS &/* the_qos */,
-                          const AVStreams::flowSpec &/* the_spec */,
-                          CORBA::Environment &/* ACE_TRY_ENV */)
+                          const AVStreams::flowSpec &/* the_spec */
+                          TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3126,8 +3124,8 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
 
 // applications should override this to handle configuration changes.
 void
-TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/,
-                     CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
+                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -3137,8 +3135,8 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/,
 // sets the media format used for the flowname as a property.
 void
 TAO_VDev::set_format (const char *flowName,
-                      const char *format_name,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      const char *format_name
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -3151,8 +3149,8 @@ TAO_VDev::set_format (const char *flowName,
       CORBA::Any format;
       format <<= format_name;
       this->define_property (format_property,
-                             format,
-                             ACE_TRY_ENV);
+                             format
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3168,8 +3166,8 @@ TAO_VDev::set_format (const char *flowName,
 // sets the device parameters for the flowname as a property.
 void
 TAO_VDev::set_dev_params (const char *flowName,
-                          const CosPropertyService::Properties &new_params,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          const CosPropertyService::Properties &new_params
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -3183,8 +3181,8 @@ TAO_VDev::set_dev_params (const char *flowName,
       CORBA::Any devParams;
       devParams <<= new_params;
       this->define_property (devParams_property,
-                             devParams,
-                             ACE_TRY_ENV);
+                             devParams
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3200,15 +3198,15 @@ TAO_VDev::set_dev_params (const char *flowName,
 // QoS Modification should be handled by the application currently.
 CORBA::Boolean
 TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
-                      const AVStreams::flowSpec &flowspec,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      const AVStreams::flowSpec &flowspec
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
   if (TAO_debug_level > 0)
   ACE_DEBUG ((LM_DEBUG,
-	     "TAO_VDev::modify_QoS\n"));
+             "TAO_VDev::modify_QoS\n"));
 
   if (flowspec.length () != 0)
     {
@@ -3216,35 +3214,35 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
       entry.parse (flowspec [0]);
       int direction = entry.direction ();
       if (direction == 0)
-	{
-	  AVStreams::StreamEndPoint_A_ptr sep_a;
-
-	  CORBA::Any_ptr streamendpoint_a_any =
-	  this->get_property_value ("Related_StreamEndpoint",
-				    ACE_TRY_ENV);
-	  ACE_CHECK_RETURN (0);
-
-	  *streamendpoint_a_any >>= sep_a;
-	  if (sep_a != 0)
-	    {
-	      sep_a->modify_QoS (the_qos, flowspec, ACE_TRY_ENV);
-	      ACE_CHECK_RETURN (0);
-	    }
-	  else ACE_DEBUG ((LM_DEBUG,
-			   "Stream EndPoint Not Found\n"));
-	}
+        {
+          AVStreams::StreamEndPoint_A_ptr sep_a;
+
+          CORBA::Any_ptr streamendpoint_a_any =
+          this->get_property_value ("Related_StreamEndpoint"
+                                    TAO_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          *streamendpoint_a_any >>= sep_a;
+          if (sep_a != 0)
+            {
+              sep_a->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER);
+              ACE_CHECK_RETURN (0);
+            }
+          else ACE_DEBUG ((LM_DEBUG,
+                           "Stream EndPoint Not Found\n"));
+        }
       else
-	{
-	  AVStreams::StreamEndPoint_B_ptr sep_b;
-
-	  CORBA::Any_ptr streamendpoint_b_any =
-	  this->get_property_value ("Related_StreamEndpoint",
-				    ACE_TRY_ENV);
-	  ACE_CHECK_RETURN (0);
-	  *streamendpoint_b_any >>= sep_b;
-	  sep_b->modify_QoS (the_qos, flowspec, ACE_TRY_ENV);
-	  ACE_CHECK_RETURN (0);
-	}
+        {
+          AVStreams::StreamEndPoint_B_ptr sep_b;
+
+          CORBA::Any_ptr streamendpoint_b_any =
+          this->get_property_value ("Related_StreamEndpoint"
+                                    TAO_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+          *streamendpoint_b_any >>= sep_b;
+          sep_b->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+        }
   }
   return 1;
 }
@@ -3278,8 +3276,8 @@ AVStreams::StreamCtrl_ptr
 TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
                     AVStreams::streamQoS &the_qos,
                     CORBA::Boolean_out is_met,
-                    const AVStreams::flowSpec &the_spec,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const AVStreams::flowSpec &the_spec
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -3292,15 +3290,15 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
       ACE_NEW_RETURN (this->stream_ctrl_,
                       TAO_StreamCtrl,
                       0);
-      AVStreams::MMDevice_var mmdevice = this->_this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var mmdevice = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->stream_ctrl_->bind_devs (peer_device,
                                      mmdevice.in (),
                                      the_qos,
-                                     the_spec,
-                                     ACE_TRY_ENV);
+                                     the_spec
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      streamctrl = this->stream_ctrl_->_this (ACE_TRY_ENV);
+      streamctrl = this->stream_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3318,8 +3316,8 @@ AVStreams::StreamCtrl_ptr
 TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out is_met,
-                          const AVStreams::flowSpec &the_spec,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          const AVStreams::flowSpec &the_spec
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -3329,7 +3327,6 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
   ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   return 0;
@@ -3342,8 +3339,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out met_qos,
                           char *&/*named_vdev*/,
-                          const AVStreams::flowSpec &flow_spec,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          const AVStreams::flowSpec &flow_spec
+                          TAO_ENV_ARG_DECL)
 {
   AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ());
   AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ());
@@ -3355,8 +3352,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
         case MMDEVICE_A:
           {
             if (this->endpoint_strategy_->create_A (sep_a,
-                                                    the_vdev,
-                                                    ACE_TRY_ENV) == -1)
+                                                    the_vdev
+                                                    TAO_ENV_ARG_PARAMETER) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_A\n"),
@@ -3367,8 +3364,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
         case MMDEVICE_B:
           {
             if (this->endpoint_strategy_->create_B (sep_b,
-                                                    the_vdev,
-                                                    ACE_TRY_ENV) == -1)
+                                                    the_vdev
+                                                    TAO_ENV_ARG_PARAMETER) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_B\n"),
@@ -3397,12 +3394,12 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                 {
                   // Get the flowconnection for this flow.
                   CORBA::Object_var flowconnection_obj =
-                    streamctrl->get_flow_connection (forward_entry.flowname (), ACE_TRY_ENV);
+                    streamctrl->get_flow_connection (forward_entry.flowname () TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flowconnection);
                   if (!CORBA::is_nil (flowconnection_obj.in ()))
                     {
-                      flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in (),
-                                                                           ACE_TRY_ENV);
+                      flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in ()
+                                                                           TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (flowconnection);
                     }
                 }
@@ -3439,8 +3436,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_producer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout (),
-                                                       ACE_TRY_ENV);
+                                                       named_fdev.inout ()
+                                                       TAO_ENV_ARG_PARAMETER);
                         }
                         break;
                       case MMDEVICE_B:
@@ -3449,8 +3446,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_consumer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout (),
-                                                       ACE_TRY_ENV);
+                                                       named_fdev.inout ()
+                                                       TAO_ENV_ARG_PARAMETER);
                         }
                         break;
                       }
@@ -3470,8 +3467,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_consumer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout (),
-                                                       ACE_TRY_ENV);
+                                                       named_fdev.inout ()
+                                                       TAO_ENV_ARG_PARAMETER);
                         }
                         break;
                       case MMDEVICE_B:
@@ -3483,8 +3480,8 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                             flow_dev->create_producer (flowconnection.in (),
                                                        flow_qos,
                                                        met_qos,
-                                                       named_fdev.inout (),
-                                                       ACE_TRY_ENV);
+                                                       named_fdev.inout ()
+                                                       TAO_ENV_ARG_PARAMETER);
                         }
                         break;
                       }
@@ -3496,10 +3493,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                 }
               CORBA::Any flowname_any;
               flowname_any <<= forward_entry.flowname ();
-              flow_endpoint->define_property ("FlowName", flowname_any, ACE_TRY_ENV);
+              flow_endpoint->define_property ("FlowName", flowname_any TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
-              sep->add_fep (flow_endpoint.in (),
-                            ACE_TRY_ENV);
+              sep->add_fep (flow_endpoint.in ()
+                            TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -3520,8 +3517,8 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
                         AVStreams::streamQoS &stream_qos,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
-                        const AVStreams::flowSpec &flow_spec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        const AVStreams::flowSpec &flow_spec
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3530,7 +3527,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
                    AVStreams::noSuchFlow))
 {
   CORBA::String_var str_ctrl_ior =
-       TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl, ACE_TRY_ENV);
+       TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   AVStreams::StreamEndPoint_A_ptr sep_a = 0;
@@ -3541,9 +3538,9 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
   AVStreams::StreamEndPoint_var sep;
   ACE_TRY
     {
-      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec, ACE_TRY_ENV);
+      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in(), ACE_TRY_ENV);
+      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3563,8 +3560,8 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
                         AVStreams::streamQoS &stream_qos,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
-                        const AVStreams::flowSpec &flow_spec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        const AVStreams::flowSpec &flow_spec
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3582,9 +3579,9 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
 
   ACE_TRY
     {
-      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec, ACE_TRY_ENV);
+      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in(), ACE_TRY_ENV);
+      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3601,8 +3598,8 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
 // destroys the streamendpoint and the Vdev.
 void
 TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
-                       const char * /* vdev_name */,
-                       CORBA::Environment &/*ACE_TRY_ENV*/)
+                       const char * /* vdev_name */
+                       TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -3615,8 +3612,8 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
 }
 
 char *
-TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
@@ -3634,7 +3631,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev,
       ACE_OS::sprintf (tmp, "flow%d", flow_num_++);
       CORBA::Any flowname_any;
       flowname_any <<= flow_name.in ();
-      fdev->define_property ("Flow", flowname_any, ACE_TRY_ENV);
+      fdev->define_property ("Flow", flowname_any TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3648,8 +3645,8 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev,
 
 // Adds the fdev object to the MMDevice.
 char *
-TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
@@ -3659,14 +3656,14 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj,
   ACE_TRY_EX (flow_name)
     {
       CORBA::Any_ptr flow_name_any;
-      fdev = AVStreams::FDev::_narrow (fdev_obj, ACE_TRY_ENV);
+      fdev = AVStreams::FDev::_narrow (fdev_obj TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (flow_name);
 
       if (CORBA::is_nil (fdev.in ()))
           return 0;
 
 
-      flow_name_any = fdev->get_property_value ("Flow", ACE_TRY_ENV);
+      flow_name_any = fdev->get_property_value ("Flow" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (flow_name);
 
       const char *tmp;
@@ -3676,7 +3673,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj,
   ACE_CATCHANY
     {
       flow_name =
-        this->add_fdev_i (fdev.in (), ACE_TRY_ENV);
+        this->add_fdev_i (fdev.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   ACE_ENDTRY;
@@ -3700,8 +3697,8 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj,
   ACE_TRY_EX (flows)
     {
       this->define_property ("Flows",
-                             flows_any,
-                             ACE_TRY_ENV);
+                             flows_any
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (flows);
     }
   ACE_CATCHANY
@@ -3716,13 +3713,12 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj,
 
 // Gets the FDev object associated with this flow.
 CORBA::Object_ptr
-TAO_MMDevice::get_fdev (const char *flow_name,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_MMDevice::get_fdev (const char *flow_name
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   ACE_CString fdev_name_key (flow_name);
@@ -3734,8 +3730,8 @@ TAO_MMDevice::get_fdev (const char *flow_name,
 
 // Removes the fdev from this MMDevice.
 void
-TAO_MMDevice::remove_fdev (const char *flow_name,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_MMDevice::remove_fdev (const char *flow_name
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow,
@@ -3761,8 +3757,8 @@ TAO_MMDevice::remove_fdev (const char *flow_name,
       flows <<= new_flows;
       this->flows_ = new_flows;
       this->define_property ("Flows",
-                             flows,
-                             ACE_TRY_ENV);
+                             flows
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3818,7 +3814,7 @@ TAO_FlowConnection::set_protocol (const char *protocol)
 
 // stop this flow.
 void
-TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -3829,7 +3825,7 @@ TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->stop (ACE_TRY_ENV);
+          (*producer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -3838,7 +3834,7 @@ TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->stop (ACE_TRY_ENV);
+          (*consumer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -3853,7 +3849,7 @@ TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV)
 
 // start this flow.
 void
-TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -3864,7 +3860,7 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->start (ACE_TRY_ENV);
+          (*consumer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
@@ -3873,7 +3869,7 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->start (ACE_TRY_ENV);
+          (*producer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -3888,7 +3884,7 @@ TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
 
 // destroy this flow.
 void
-TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -3899,7 +3895,7 @@ TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->destroy (ACE_TRY_ENV);
+          (*producer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -3908,7 +3904,7 @@ TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->destroy (ACE_TRY_ENV);
+          (*consumer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -3926,13 +3922,12 @@ TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 // modify the QoS for this flow.
 CORBA::Boolean
-TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
   ACE_UNUSED_ARG (new_qos);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   return 0;
 }
@@ -3940,8 +3935,8 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos,
 // use the specified flow protocol for this flow.
 CORBA::Boolean
 TAO_FlowConnection::use_flow_protocol (const char * fp_name,
-                                       const CORBA::Any & fp_settings,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       const CORBA::Any & fp_settings
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
@@ -3955,7 +3950,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        producer_begin != producer_end; ++producer_begin)
     {
       (*producer_begin)->use_flow_protocol
-        (fp_name, fp_settings, ACE_TRY_ENV);
+        (fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -3965,26 +3960,25 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        consumer_begin != consumer_end; ++consumer_begin)
     {
       (*consumer_begin)->use_flow_protocol
-        (fp_name, fp_settings, ACE_TRY_ENV);
+        (fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
 }
 
 void
-TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (the_event);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 CORBA::Boolean
 TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   AVStreams::FDev_ptr b_party,
-                                  AVStreams::QoS & flow_qos,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  AVStreams::QoS & flow_qos
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3993,7 +3987,7 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
   CORBA::Boolean result = 0;
   ACE_TRY
     {
-      AVStreams::FlowConnection_var flowconnection = this->_this (ACE_TRY_ENV);
+      AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Boolean met_qos;
       CORBA::String_var named_fdev ((const char *)"");
@@ -4001,20 +3995,20 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
         a_party->create_producer (flowconnection.in (),
                                   flow_qos,
                                   met_qos,
-                                  named_fdev.inout (),
-                                  ACE_TRY_ENV);
+                                  named_fdev.inout ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::FlowConsumer_var consumer =
         b_party->create_consumer (flowconnection.in (),
                                   flow_qos,
                                   met_qos,
-                                  named_fdev.inout (),
-                                  ACE_TRY_ENV);
+                                  named_fdev.inout ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = this->connect (producer.in (),
                               consumer.in (),
-                              flow_qos,
-                              ACE_TRY_ENV);
+                              flow_qos
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4031,8 +4025,8 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
 CORBA::Boolean
 TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
                              AVStreams::FlowConsumer_ptr consumer,
-                             AVStreams::QoS & the_qos,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             AVStreams::QoS & the_qos
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::FEPMismatch,
@@ -4049,27 +4043,27 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
       this->flow_producer_set_.insert (flow_producer);
       this->flow_consumer_set_.insert (flow_consumer);
       AVStreams::FlowConnection_var flowconnection =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       flow_producer->set_peer (flowconnection.in (),
                                flow_consumer,
-                               the_qos,
-                               ACE_TRY_ENV);
+                               the_qos
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       flow_consumer->set_peer (flowconnection.in (),
                                flow_producer,
-                               the_qos,
-                               ACE_TRY_ENV);
+                               the_qos
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *consumer_address =
         flow_consumer->go_to_listen (the_qos,
                                      0, // false for is_mcast
                                      flow_producer,
-                                     this->fp_name_.inout (),
-                                     ACE_TRY_ENV);
+                                     this->fp_name_.inout ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (consumer_address, "") == 0)
@@ -4078,13 +4072,13 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
           consumer_address = flow_producer->go_to_listen (the_qos,
                                                           0, // false for is_mcast
                                                           flow_consumer,
-                                                          this->fp_name_.inout (),
-                                                          ACE_TRY_ENV);
+                                                          this->fp_name_.inout ()
+                                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           flow_consumer->connect_to_peer (the_qos,
                                           consumer_address,
-                                          this->fp_name_.inout (),
-                                          ACE_TRY_ENV);
+                                          this->fp_name_.inout ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           // @@ Naga: We have to find means to set the reverse channel for the producer.
           // Its broken in the point-to_point case for UDP.
@@ -4094,8 +4088,8 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
           if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowConnection::connect_to_peer addres: %s", consumer_address));
           flow_producer->connect_to_peer (the_qos,
                                           consumer_address,
-                                          this->fp_name_.inout (),
-                                          ACE_TRY_ENV);
+                                          this->fp_name_.inout ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -4110,18 +4104,17 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
 
 
 CORBA::Boolean
-TAO_FlowConnection::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   return  0;
 }
 
 CORBA::Boolean
 TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
-                                  AVStreams::QoS & the_qos,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  AVStreams::QoS & the_qos
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected,
                    AVStreams::notSupported))
@@ -4139,8 +4132,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           FlowProducer_SetItor end = this->flow_producer_set_.end ();
           for (; begin != end; ++begin)
             {
-              if ((*begin)->_is_equivalent (producer,
-                                            ACE_TRY_ENV))
+              if ((*begin)->_is_equivalent (producer
+                                            TAO_ENV_ARG_PARAMETER))
               // producer exists in the set, a duplicate.
               ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1);
             }
@@ -4174,8 +4167,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           char *address = flow_producer->connect_mcast (the_qos,
                                                         met_qos,
                                                         mcast_address,
-                                                        this->fp_name_.in (),
-                                                        ACE_TRY_ENV);
+                                                        this->fp_name_.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
           if (this->producer_address_.in () == 0)
@@ -4198,15 +4191,15 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
               ACE_NEW_RETURN (this->mcastconfigif_i_,
                               TAO_MCastConfigIf,
                               0);
-              this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_TRY_ENV);
+              this->mcastconfigif_ = this->mcastconfigif_i_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          AVStreams::FlowConnection_var flowconnection = this->_this (ACE_TRY_ENV);
+          AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           flow_producer->set_Mcast_peer (flowconnection.in (),
                                          this->mcastconfigif_.in (),
-                                         the_qos,
-                                         ACE_TRY_ENV);
+                                         the_qos
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4221,8 +4214,8 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
 
 CORBA::Boolean
 TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
-                                  AVStreams::QoS & the_qos,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  AVStreams::QoS & the_qos
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected))
 {
@@ -4234,8 +4227,8 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       FlowConsumer_SetItor end = this->flow_consumer_set_.end ();
       for (; begin != end; ++begin)
         {
-          if ((*begin)->_is_equivalent (consumer,
-                                        ACE_TRY_ENV))
+          if ((*begin)->_is_equivalent (consumer
+                                        TAO_ENV_ARG_PARAMETER))
             // Consumer exists in the set, a duplicate.
             ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1);
         }
@@ -4259,22 +4252,22 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
 
       if (!this->ip_multicast_)
         {
-          flow_consumer->set_protocol_restriction (protocols,
-                                                   ACE_TRY_ENV);
+          flow_consumer->set_protocol_restriction (protocols
+                                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           char * address =
             flow_consumer->go_to_listen (the_qos,
                                          1,
                                          flow_producer,
-                                         this->fp_name_.inout (),
-                                         ACE_TRY_ENV);
+                                         this->fp_name_.inout ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           CORBA::Boolean is_met;
           flow_producer->connect_mcast (the_qos,
                                         is_met,
                                         address,
-                                        this->fp_name_.inout (),
-                                        ACE_TRY_ENV);
+                                        this->fp_name_.inout ()
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
        else
@@ -4286,15 +4279,15 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
           // IP Multicasting.
           flow_consumer->connect_to_peer (the_qos,
                                           this->producer_address_.in (),
-                                          this->fp_name_.inout (),
-                                          ACE_TRY_ENV);
+                                          this->fp_name_.inout ()
+                                          TAO_ENV_ARG_PARAMETER);
 
           //  char * address =
           //             flow_consumer->go_to_listen (the_qos,
           //                                          1,
           //                                          flow_producer,
           //                                          this->fp_name_.inout (),
-          //                                          ACE_TRY_ENV);
+          //                                          TAO_ENV_SINGLE_ARG_PARAMETER);
 
           //            ACE_TRY_CHECK;
         }
@@ -4307,8 +4300,8 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       stream_qos [0] = the_qos;
       this->mcastconfigif_->set_peer (flow_consumer,
                                       stream_qos,
-                                      flow_spec,
-                                      ACE_TRY_ENV);
+                                      flow_spec
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4322,13 +4315,12 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
 }
 
 CORBA::Boolean
-TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notConnected))
 {
   ACE_UNUSED_ARG (target);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   return 0;
 }
@@ -4352,7 +4344,7 @@ TAO_FlowEndPoint::TAO_FlowEndPoint (const char *flowname,
 
 void
 TAO_FlowEndPoint::set_flow_handler (const char * /*flowname*/,
-				    TAO_AV_Flow_Handler * /*handler*/)
+                                    TAO_AV_Flow_Handler * /*handler*/)
 {
 }
 
@@ -4365,17 +4357,17 @@ TAO_FlowEndPoint::open (const char *flowname,
   this->format_ = format;
 
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::Any flowname_any;
       flowname_any <<= flowname;
       this->define_property ("Flow",
-                             flowname_any,
-                             ACE_TRY_ENV);
+                             flowname_any
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->set_format (format,
-                        ACE_TRY_ENV);
+      this->set_format (format
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->protocol_addresses_ = protocols;
       AVStreams::protocolSpec protocol_spec (protocols.length ());
@@ -4388,8 +4380,8 @@ TAO_FlowEndPoint::open (const char *flowname,
           protocol_spec [i] = CORBA::string_dup (entry.carrier_protocol_str ());
           if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol_spec[i].in ()));
         }
-      this->set_protocol_restriction (protocol_spec,
-                                      ACE_TRY_ENV);
+      this->set_protocol_restriction (protocol_spec
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4413,11 +4405,10 @@ TAO_FlowEndPoint::set_flowname (const char *flowname)
 // used by one flowconnection so that multiple connections cant use
 // the same flowendpoint.
 CORBA::Boolean
-TAO_FlowEndPoint::lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // lock the current flowendpoint
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   if (this->lock_)
@@ -4428,10 +4419,9 @@ TAO_FlowEndPoint::lock (CORBA::Environment &ACE_TRY_ENV)
 
 // unlocks the flowendpoint , becomes free to be used in another flow.
 void
-TAO_FlowEndPoint::unlock (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK;
 
   this->lock_ = 0;
@@ -4439,7 +4429,7 @@ TAO_FlowEndPoint::unlock (CORBA::Environment &ACE_TRY_ENV)
 
 
 void
-TAO_FlowEndPoint::destroy (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result = TAO_AV_Core::deactivate_servant (this);
@@ -4452,7 +4442,7 @@ TAO_FlowEndPoint::destroy (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -4460,26 +4450,25 @@ TAO_FlowEndPoint::related_sep (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 void
-TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep,
-                               CORBA::Environment &)
+TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep
+                               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep);
 }
 
 AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (CORBA::Environment &)
+TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
 }
 
 void
-TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK;
 
   this->related_flow_connection_ = AVStreams::FlowConnection::_duplicate (related_flow_connection);
@@ -4487,7 +4476,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
 
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
-TAO_FlowEndPoint::get_connected_fep (CORBA::Environment &)
+TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notConnected,
                    AVStreams::notSupported))
@@ -4497,8 +4486,8 @@ TAO_FlowEndPoint::get_connected_fep (CORBA::Environment &)
 
 CORBA::Boolean
 TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
-                                     const CORBA::Any & ,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     const CORBA::Any &
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
@@ -4509,8 +4498,8 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
       CORBA::Any flowname_property;
       flowname_property <<= fp_name;
       this->define_property ("FlowProtocol",
-                             flowname_property,
-                             ACE_TRY_ENV);
+                             flowname_property
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4524,8 +4513,8 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
 }
 
 void
-TAO_FlowEndPoint::set_format (const char * format,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::set_format (const char * format
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -4537,8 +4526,8 @@ TAO_FlowEndPoint::set_format (const char * format,
       CORBA::Any format_val;
       format_val <<= format;
       this->define_property ("Format",
-                             format_val,
-                             ACE_TRY_ENV);
+                             format_val
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4550,8 +4539,8 @@ TAO_FlowEndPoint::set_format (const char * format,
 }
 
 void
-TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -4562,8 +4551,8 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
       CORBA::Any DevParams_property;
       DevParams_property <<= new_settings;
       this->define_property ("DevParams",
-                             DevParams_property,
-                             ACE_TRY_ENV);
+                             DevParams_property
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4575,8 +4564,8 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
 }
 
 void
-TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols
+                                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -4592,12 +4581,12 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
       CORBA::Any AvailableProtocols_property;
       AvailableProtocols_property <<= protocols;
       this->define_property ("AvailableProtocols",
-                             AvailableProtocols_property,
-                             ACE_TRY_ENV);
+                             AvailableProtocols_property
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::protocolSpec *temp_spec;
-      CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols",
-                                                          ACE_TRY_ENV);
+      CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols"
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       temp_any.in () >>= temp_spec;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
@@ -4617,8 +4606,8 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
 }
 
 CORBA::Boolean
-TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::deviceQosMismatch))
@@ -4633,8 +4622,8 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep,
       CORBA::String_var my_format, peer_format;
 
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format";
-      format_ptr = this->get_property_value ("Format",
-                                             ACE_TRY_ENV);
+      format_ptr = this->get_property_value ("Format"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *temp_format;
@@ -4642,8 +4631,8 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep,
       my_format = CORBA::string_dup (temp_format);
       // get my peer's format value
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]";
-      format_ptr = peer_fep->get_property_value ("Format",
-                                                 ACE_TRY_ENV);
+      format_ptr = peer_fep->get_property_value ("Format"
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       format_ptr.in () >>= temp_format;
       peer_format = CORBA::string_dup (temp_format);
@@ -4658,16 +4647,16 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep,
 
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols";
-      AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols",
-                                                         ACE_TRY_ENV);
+      AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols"
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AvailableProtocols_ptr.in () >>= temp_protocols;
       my_protocol_spec = *temp_protocols;
 
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]";
-      AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols",
-                                                             ACE_TRY_ENV);
+      AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols"
+                                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AvailableProtocols_ptr.in () >>= temp_protocols;
       peer_protocol_spec = *temp_protocols;
@@ -4712,8 +4701,8 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep,
 CORBA::Boolean
 TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                             AVStreams::FlowEndPoint_ptr the_peer_fep,
-                            AVStreams::QoS & /* the_qos */,
-                            CORBA::Environment &/* ACE_TRY_ENV */)
+                            AVStreams::QoS & /* the_qos */
+                            TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
@@ -4726,8 +4715,8 @@ TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
 CORBA::Boolean
 TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                                   AVStreams::MCastConfigIf_ptr mcast_peer,
-                                  AVStreams::QoS & /* the_qos */,
-                                  CORBA::Environment &/* ACE_TRY_ENV */)
+                                  AVStreams::QoS & /* the_qos */
+                                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
@@ -4740,8 +4729,8 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
                                   AVStreams::QoS & /*the_qos*/,
                                   CORBA::Boolean /*is_mcast*/,
                                   AVStreams::FlowEndPoint_ptr peer_fep,
-                                  char *& flowProtocol,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  char *& flowProtocol
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4762,14 +4751,14 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
   AVStreams::protocolSpec my_protocol_spec, peer_protocol_spec;
   AVStreams::protocolSpec *temp_protocols;
   CORBA::Any_var AvailableProtocols_ptr =
-    peer_fep->get_property_value ("AvailableProtocols",
-                                  ACE_TRY_ENV);
+    peer_fep->get_property_value ("AvailableProtocols"
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   AvailableProtocols_ptr.in () >>= temp_protocols;
   peer_protocol_spec = *temp_protocols;
   AvailableProtocols_ptr =
-    this->get_property_value ("AvailableProtocols",
-                              ACE_TRY_ENV);
+    this->get_property_value ("AvailableProtocols"
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   AvailableProtocols_ptr.in () >>= temp_protocols;
   my_protocol_spec = *temp_protocols;
@@ -4833,8 +4822,8 @@ CORBA::Boolean
 TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                      AVStreams::QoS & /*the_qos*/,
                                      const char * address,
-                                     const char * use_flow_protocol,
-                                     CORBA::Environment &/*ACE_TRY_ENV*/)
+                                     const char * use_flow_protocol
+                                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -4897,8 +4886,8 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname,
 
 // gets the reverse channel for feedback.
 char *
-TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/,
-                                   CORBA::Environment &/* ACE_TRY_ENV */)
+TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
+                                   TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -4906,7 +4895,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/,
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowProducer::stop (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4919,7 +4908,7 @@ TAO_FlowProducer::stop (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 void
-TAO_FlowProducer::start (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_FlowProducer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4942,8 +4931,8 @@ char *
 TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
-                                char *& flowProtocol,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                char *& flowProtocol
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4953,15 +4942,15 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                the_qos,
                                is_mcast,
                                peer_fep,
-                               flowProtocol,
-                               ACE_TRY_ENV);
+                               flowProtocol
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
-                                   const char * use_flow_protocol,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const char * use_flow_protocol
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -4970,16 +4959,16 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_PRODUCER,
                                   the_qos,
                                   address,
-                                  use_flow_protocol,
-                                  ACE_TRY_ENV);
+                                  use_flow_protocol
+                                  TAO_ENV_ARG_PARAMETER);
 }
 //  Connect to a IP multicast address.
 char *
 TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
                                  CORBA::Boolean_out /* is_met */,
                                  const char *address,
-                                 const char * use_flow_protocol,
-                                 CORBA::Environment &/*ACE_TRY_ENV*/)
+                                 const char * use_flow_protocol
+                                 TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::notSupported,
@@ -5022,8 +5011,8 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
 
 // sets the key for this flow.
 void
-TAO_FlowProducer::set_key (const AVStreams::key & the_key,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowProducer::set_key (const AVStreams::key & the_key
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -5031,8 +5020,8 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key,
       CORBA::Any anyval;
       anyval <<= the_key;
       this->define_property ("PublicKey",
-                             anyval,
-                             ACE_TRY_ENV);
+                             anyval
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -5045,8 +5034,8 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key,
 
 // source id to be used to distinguish this source from others.
 void
-TAO_FlowProducer::set_source_id (CORBA::Long source_id,
-                                 CORBA::Environment &/* ACE_TRY_ENV */)
+TAO_FlowProducer::set_source_id (CORBA::Long source_id
+                                 TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -5071,7 +5060,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowConsumer::stop (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5081,7 +5070,7 @@ TAO_FlowConsumer::stop (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 void
-TAO_FlowConsumer::start (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_FlowConsumer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5096,8 +5085,8 @@ char *
 TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
-                                char *& flowProtocol,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                char *& flowProtocol
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -5107,15 +5096,15 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                the_qos,
                                is_mcast,
                                peer_fep,
-                               flowProtocol,
-                               ACE_TRY_ENV);
+                               flowProtocol
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
-                                   const char * use_flow_protocol,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const char * use_flow_protocol
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -5124,8 +5113,8 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
   return this->connect_to_peer_i (TAO_FlowSpec_Entry::TAO_AV_CONSUMER,
                                   the_qos,
                                   address,
-                                  use_flow_protocol,
-                                  ACE_TRY_ENV);
+                                  use_flow_protocol
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 //------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 0de8277fc7e..c4f7103d87f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -76,7 +76,7 @@ public:
 
 /**
  * @class TAO_Basic_StreamCtrl
- * @brief Base class for StreamCtrl, implements basic stream start 
+ * @brief Base class for StreamCtrl, implements basic stream start
  *        and stop functionality.
  */
 class TAO_AV_Export TAO_Basic_StreamCtrl
@@ -94,15 +94,15 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void stop (const AVStreams::flowSpec &the_spec
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void start (const AVStreams::flowSpec &the_spec
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -111,39 +111,39 @@ public:
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void destroy (const AVStreams::flowSpec &the_spec
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                     const AVStreams::flowSpec &the_spec
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
 
   /// Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   /// E.g., loss of flow, reestablishment of flow, etc..
-  virtual void push_event (const struct CosPropertyService::Property & the_event,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void push_event (const struct CosPropertyService::Property & the_event
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to control the flow protocol parameters.
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ())
+                             const CORBA::Any &fp_settings
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
 
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
-  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name,
-                                                 CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Object_ptr get_flow_connection (const char *flow_name
+                                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -151,8 +151,8 @@ public:
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
   virtual void set_flow_connection (const char *flow_name,
-                                    CORBA::Object_ptr flow_connection,
-                                    CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                    CORBA::Object_ptr flow_connection
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -185,8 +185,8 @@ class TAO_AV_Export TAO_Negotiator
 {
 public:
   virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
-                                    const AVStreams::streamQoS &qos_spec,
-                                    CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
+                                    const AVStreams::streamQoS &qos_spec
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -250,15 +250,15 @@ public:
 
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
-  virtual void stop (const AVStreams::flowSpec &the_spec,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void stop (const AVStreams::flowSpec &the_spec
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
-  virtual void start (const AVStreams::flowSpec &the_spec,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void start (const AVStreams::flowSpec &the_spec
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -267,8 +267,8 @@ public:
    * the streamendpoint and vdev associated with this stream
    * Empty the_spec means apply operation to all flows
    */
-  virtual void destroy (const AVStreams::flowSpec &the_spec,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void destroy (const AVStreams::flowSpec &the_spec
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -282,8 +282,8 @@ public:
   virtual CORBA::Boolean bind_devs (AVStreams::MMDevice_ptr a_party,
                                     AVStreams::MMDevice_ptr b_party,
                                     AVStreams::streamQoS& the_qos,
-                                    const AVStreams::flowSpec& the_flows,
-                                    CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                    const AVStreams::flowSpec& the_flows
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -297,44 +297,44 @@ public:
   virtual CORBA::Boolean bind (AVStreams::StreamEndPoint_A_ptr a_party,
                                AVStreams::StreamEndPoint_B_ptr b_party,
                                AVStreams::streamQoS &the_qos,
-                               const AVStreams::flowSpec &the_flows,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ())
+                               const AVStreams::flowSpec &the_flows
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed));
 
   virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
-                           const AVStreams::flowSpec & the_spec,
-                           CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
+                           const AVStreams::flowSpec & the_spec
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
 
   /// Unbind the_ep from the stream. Empty the_spec means apply to all flows.
   virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
-                             const AVStreams::flowSpec &the_spec,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ())
+                             const AVStreams::flowSpec &the_spec
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
 
   /// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-  virtual void unbind (CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void unbind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed));
 
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                                AVStreams::StreamEndPoint_out sep,
-                                                CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
+                                                AVStreams::StreamEndPoint_out sep
+                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed));
 
   /// Changes the QoS associated with the stream
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                     const AVStreams::flowSpec &the_spec
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -385,30 +385,29 @@ public:
 
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
-                                   const AVStreams::flowSpec & the_spec,
-                                   CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
+                                   const AVStreams::flowSpec & the_spec
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
 
-  virtual void configure (const CosPropertyService::Property & a_configuration,
-                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
+  virtual void configure (const CosPropertyService::Property & a_configuration
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_initial_configuration (const CosPropertyService::Properties & initial,
-                                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
+  virtual void set_initial_configuration (const CosPropertyService::Properties & initial
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_format (const char * flowName,
-                           const char * format_name,
-                           CORBA::Environment &ACE_TRY_ENV =
-                           CORBA::Environment::default_environment ())
+                           const char * format_name
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   virtual void set_dev_params (const char * flowName,
-                               const CosPropertyService::Properties & new_params,
-                               CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ())
+                               const CosPropertyService::Properties & new_params
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
@@ -494,16 +493,16 @@ public:
   virtual int handle_close (void);
 
   /// Application needs to define this
-  virtual int handle_stop (const AVStreams::flowSpec &the_spec,
-                            CORBA::Environment &env = CORBA::Environment::default_environment ());
+  virtual int handle_stop (const AVStreams::flowSpec &the_spec
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Application needs to define this
-  virtual int handle_start (const AVStreams::flowSpec &the_spec,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ());
+  virtual int handle_start (const AVStreams::flowSpec &the_spec
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Application needs to define this
-  virtual int handle_destroy (const AVStreams::flowSpec &the_spec,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ());
+  virtual int handle_destroy (const AVStreams::flowSpec &the_spec
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Application needs to define this
   virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec);
@@ -512,8 +511,8 @@ public:
   virtual CORBA::Boolean handle_postconnect (AVStreams::flowSpec &the_spec);
 
   /// Application needs to define this
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,
-                                                      CORBA::Environment &env = CORBA::Environment::default_environment ());
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
+                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -525,7 +524,7 @@ public:
                                    TAO_AV_Protocol_Object *object);
 
   virtual void set_flow_handler (const char *flowname,
-				 TAO_AV_Flow_Handler *handler);
+                                 TAO_AV_Flow_Handler *handler);
 
   virtual void set_control_flow_handler (const char *flowname,
                                          TAO_AV_Flow_Handler *handler);
@@ -546,7 +545,7 @@ class TAO_AV_Connector;
 class TAO_Forward_FlowSpec_Entry;
 class TAO_Reverse_FlowSpec_Entry;
 
-/** 
+/**
  * @class TAO_StreamEndPoint
  * @brief The Stream EndPoint. Used to implement one endpoint of a stream
  *        that implements the transport layer.
@@ -563,28 +562,28 @@ public:
   TAO_StreamEndPoint (void);
 
    /// Stop the stream. Empty the_spec means, for all the flows
-  virtual void stop (const AVStreams::flowSpec &the_spec,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void stop (const AVStreams::flowSpec &the_spec
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the stream, Empty the_spec means, for all the flows
-  virtual void start (const AVStreams::flowSpec &the_spec,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void start (const AVStreams::flowSpec &the_spec
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Destroy the stream, Empty the_spec means, for all the flows
-  virtual void destroy (const AVStreams::flowSpec &the_spec,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void destroy (const AVStreams::flowSpec &the_spec
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Called by StreamCtrl. responder is the peer to connect to
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS& qos_spec,
-                                  const AVStreams::flowSpec& the_spec,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                  const AVStreams::flowSpec& the_spec
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -595,8 +594,8 @@ public:
   virtual CORBA::Boolean request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                              CORBA::Boolean is_mcast,
                                              AVStreams::streamQoS &qos,
-                                             AVStreams::flowSpec &the_spec,
-                                             CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                             AVStreams::flowSpec &the_spec
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpDenied,
                      AVStreams::noSuchFlow,
@@ -605,24 +604,24 @@ public:
 
   /// Change the transport qos on a stream
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_flows,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                     const AVStreams::flowSpec &the_flows
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
-  
+
   virtual int change_qos (AVStreams::streamQoS &new_qos,
-			  const AVStreams::flowSpec &the_flows,
-			  CORBA::Environment &env = CORBA::Environment::default_environment ());
-  
+                          const AVStreams::flowSpec &the_flows
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   /// Used to restrict the set of protocols
-  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,
-                                                   CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec
+                                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// disconnect the flows
-  virtual void disconnect (const AVStreams::flowSpec &the_spec,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void disconnect (const AVStreams::flowSpec &the_spec
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::streamOpFailed));
@@ -630,65 +629,65 @@ public:
   /// Used to control the flow
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
-                             const CORBA::Any &fp_settings,
-                             CORBA::Environment &env = CORBA::Environment::default_environment ())
+                             const CORBA::Any &fp_settings
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual CORBA::Object_ptr get_fep (const char *flow_name,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Object_ptr get_fep (const char *flow_name
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual char * add_fep (CORBA::Object_ptr the_fep,
-                          CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual char * add_fep (CORBA::Object_ptr the_fep
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not implemented in the light profile, throws notsupported
-  virtual void remove_fep (const char *fep_name,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void remove_fep (const char *fep_name
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Used to "attach" a negotiator to the endpoint
-  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used for public key encryption.
   virtual void set_key (const char *flow_name,
-                        const AVStreams::key & the_key,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ())
+                        const AVStreams::key & the_key
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to set a unique id for packets sent by this streamendpoint
-  virtual void set_source_id (CORBA::Long source_id,
-                              CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void set_source_id (CORBA::Long source_id
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destructor
   virtual ~TAO_StreamEndPoint (void);
 
   CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                               AVStreams::flowSpec &the_spec,
-                               CORBA::Environment &ACE_TRY_ENV);
+                               AVStreams::flowSpec &the_spec
+                               TAO_ENV_ARG_DECL);
 
 protected:
   /// Helper methods to implement add_fep()
-  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep,
-                   CORBA::Environment &ACE_TRY_ENV)
+  char* add_fep_i (AVStreams::FlowEndPoint_ptr fep
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
-  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep,
-                                CORBA::Environment &ACE_TRY_ENV)
+  char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
@@ -753,8 +752,8 @@ public:
 
   /// Used for ATM-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                       AVStreams::flowSpec &the_spec
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -763,8 +762,8 @@ public:
   /// Used for ATM-style multicast
   virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                        AVStreams::streamQoS &the_qos,
-                                       const AVStreams::flowSpec &the_flows,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                       const AVStreams::flowSpec &the_flows
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -773,8 +772,8 @@ public:
 
   /// Used to remove a multicast leaf
   virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
-                                const AVStreams::flowSpec &theSpec,
-                                CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                const AVStreams::flowSpec &theSpec
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -806,8 +805,8 @@ public:
 
   /// Used for internet-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
-                                       AVStreams::flowSpec &the_spec,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                       AVStreams::flowSpec &the_spec
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -837,8 +836,8 @@ public:
   virtual CORBA::Boolean set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                    AVStreams::VDev_ptr the_peer_dev,
                                    AVStreams::streamQoS &the_qos,
-                                   const AVStreams::flowSpec &the_spec,
-                                   CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                   const AVStreams::flowSpec &the_spec
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -848,39 +847,39 @@ public:
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::streamQoS &the_qos,
-                                         const AVStreams::flowSpec &the_spec,
-                                         CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                         const AVStreams::flowSpec &the_spec
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
 
   /// Called by the peer VDev to configure the device (catch all)
-  virtual void configure (const CosPropertyService::Property &the_config_mesg,
-                          CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void configure (const CosPropertyService::Property &the_config_mesg
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// Used to set a format on a flowname
   virtual void set_format (const char *flowName,
-                           const char *format_name,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+                           const char *format_name
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Used to set device parameters
   virtual void set_dev_params (const char *flowName,
-                               const CosPropertyService::Properties &new_params,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ())
+                               const CosPropertyService::Properties &new_params
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// Called to change QoS of the device
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
-                                     const AVStreams::flowSpec &the_spec,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                     const AVStreams::flowSpec &the_spec
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -890,8 +889,8 @@ public:
 
 protected:
   /// hook called after set_peer is done to set the media ctrl of the peer vdev.
-  virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl,
-                                         CORBA::Environment &env = CORBA::Environment::default_environment ());
+  virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// My stream controller
   AVStreams::StreamCtrl_var streamctrl_;
@@ -930,16 +929,16 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec,
-                                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
+                                                     const AVStreams::flowSpec &the_spec
+                                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Can be used to request the MMDevice to create a new StreamCtrl,
   /// and call bind_devs on it
   virtual AVStreams::StreamCtrl_ptr  bind (AVStreams::MMDevice_ptr peer_device,
                                            AVStreams::streamQoS &the_qos,
                                            CORBA::Boolean_out is_met,
-                                           const AVStreams::flowSpec &the_spec,
-                                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                           const AVStreams::flowSpec &the_spec
+                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -949,8 +948,8 @@ public:
   virtual AVStreams::StreamCtrl_ptr  bind_mcast (AVStreams::MMDevice_ptr first_peer,
                                                  AVStreams::streamQoS &the_qos,
                                                  CORBA::Boolean_out is_met,
-                                                 const AVStreams::flowSpec &the_spec,
-                                                 CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                                 const AVStreams::flowSpec &the_spec
+                                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -962,8 +961,8 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec,
-                                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                                     const AVStreams::flowSpec &the_spec
+                                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -977,8 +976,8 @@ public:
                                                      AVStreams::streamQoS &the_qos,
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
-                                                     const AVStreams::flowSpec &the_spec,
-                                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                                     const AVStreams::flowSpec &the_spec
+                                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -988,28 +987,28 @@ public:
 
   /// Remove the StreamEndPoint and the related vdev
   virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
-                        const char *vdev_name,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ())
+                        const char *vdev_name
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Not supported in the light profile, raises notsupported
-  virtual char * add_fdev (CORBA::Object_ptr the_fdev,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual char * add_fdev (CORBA::Object_ptr the_fdev
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not supported in the light profile, raises notsupported
-  virtual CORBA::Object_ptr get_fdev (const char *flow_name,
-                                      CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Object_ptr get_fdev (const char *flow_name
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not supported in the light profile, raises notsupported
-  virtual void remove_fdev (const char *flow_name,
-                            CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void remove_fdev (const char *flow_name
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow,
@@ -1020,8 +1019,8 @@ public:
 
 protected:
   /// Helper method to implement add_fdev()
-  char* add_fdev_i (AVStreams::FDev_ptr fdev,
-                    CORBA::Environment &ACE_TRY_ENV)
+  char* add_fdev_i (AVStreams::FDev_ptr fdev
+                    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed));
@@ -1070,42 +1069,42 @@ public:
   TAO_FlowConnection (void);
 
   /// stop this flow.
-  virtual void stop (CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow.
-  virtual void start (CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// destroy this flow.
-  virtual void destroy (CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// modify the QoS for this flow.
-  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
   /// use the specified flow protocol for this flow.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings,
-                                            CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                            const CORBA::Any & fp_settings
+                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// pushes an event , to be handled by the application.
-  virtual void push_event (const AVStreams::streamEvent & the_event,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void push_event (const AVStreams::streamEvent & the_event
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// connect 2 Flow Devices.
   virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party,
                                        AVStreams::FDev_ptr b_party,
-                                       AVStreams::QoS & the_qos,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                       AVStreams::QoS & the_qos
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -1114,35 +1113,35 @@ public:
   /// Connect a flow producer and consumer under this flow connection.
   virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::FlowConsumer_ptr flow_consumer,
-                                  AVStreams::QoS & the_qos,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                  AVStreams::QoS & the_qos
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::FEPMismatch,
                      AVStreams::alreadyConnected));
 
   /// disconnect this flow connection.
-  virtual CORBA::Boolean disconnect (CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Boolean disconnect (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// adds the producer to this flow connection.
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
-                                       AVStreams::QoS & the_qos,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                       AVStreams::QoS & the_qos
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected,
                      AVStreams::notSupported));
 
   /// adds a consumer to this flow connection.
   virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
-                                       AVStreams::QoS & the_qos,
-                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                       AVStreams::QoS & the_qos
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected));
 
   /// drops a flow endpoint from the flow.
-  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notConnected));
 
@@ -1172,7 +1171,7 @@ protected:
 
 /**
  * @class TAO_FlowEndPoint
- * @brief This class is used per flow e.g video flow and an audio flow 
+ * @brief This class is used per flow e.g video flow and an audio flow
  *        to encapsulate the transport details.
  */
 class TAO_AV_Export TAO_FlowEndPoint :
@@ -1204,82 +1203,75 @@ public:
                                    TAO_AV_Protocol_Object *object);
 
   /// lock the flow endpoint for a particular flow.
-  virtual CORBA::Boolean lock (CORBA::Environment &env =
-                               CORBA::Environment::default_environment ())
+  virtual CORBA::Boolean lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// unlock the flow endpoint for subsequent use.
-  virtual void unlock (CORBA::Environment &env =
-                       CORBA::Environment::default_environment ())
+  virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// destroy this flow.
-  virtual void destroy (CORBA::Environment &env =
-                        CORBA::Environment::default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// get method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual AVStreams::StreamEndPoint_ptr related_sep(CORBA::Environment &env =
-                                                    CORBA::Environment::default_environment ())
+  virtual AVStreams::StreamEndPoint_ptr related_sep(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// set method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep,
-                            CORBA::Environment &env =
-                            CORBA::Environment::default_environment ())
+  virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual AVStreams::FlowConnection_ptr related_flow_connection(CORBA::Environment &env =
-                                                                CORBA::Environment::default_environment ())
+  virtual AVStreams::FlowConnection_ptr related_flow_connection(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // accessor for the related flow connection attribute.
 
   /// set method for the related flow connection attribute.
-  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection,
-                                        CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// returns the other flowendpoint to which this is connected.
-  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (CORBA::Environment &env =
-                                                         CORBA::Environment::default_environment ())
+  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notConnected,
                      AVStreams::notSupported));
 
   //// use the specified flow protocol.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
-                                            const CORBA::Any & fp_settings,
-                                            CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                            const CORBA::Any & fp_settings
+                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// sets the data format.
-  virtual void set_format (const char * format,
-                           CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void set_format (const char * format
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// sets the device parameters.
-  virtual void set_dev_params (const CosPropertyService::Properties & new_settings,
-                               CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void set_dev_params (const CosPropertyService::Properties & new_settings
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// sets the list of protocols to be used.
-  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec,
-                                         CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// checks whether the passed flowendpoint is compatible with this.
-  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep,
-                                            CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep
+                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::deviceQosMismatch));
@@ -1287,8 +1279,8 @@ public:
   /// sets the peer flowendpoint.
   virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc,
                                    AVStreams::FlowEndPoint_ptr the_peer_fep,
-                                   AVStreams::QoS & the_qos,
-                                   CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                   AVStreams::QoS & the_qos
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
@@ -1296,9 +1288,8 @@ public:
   /// sets the multicast peer flowendpoint, not implemented.
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
-                                         AVStreams::QoS & the_qos,
-                                         CORBA::Environment &env =
-                                         CORBA::Environment::default_environment ())
+                                         AVStreams::QoS & the_qos
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
@@ -1310,9 +1301,8 @@ public:
    */
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol,
-                                          CORBA::Environment &env =
-                                          CORBA::Environment::default_environment ())
+                                          const char * use_flow_protocol
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1322,9 +1312,8 @@ public:
   virtual CORBA::Boolean connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                             AVStreams::QoS & the_qos,
                                             const char * address,
-                                            const char * use_flow_protocol,
-                                            CORBA::Environment &env =
-                                            CORBA::Environment::default_environment ())
+                                            const char * use_flow_protocol
+                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1338,9 +1327,8 @@ public:
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol,
-                               CORBA::Environment &env =
-                               CORBA::Environment::default_environment ())
+                               char *& flowProtocol
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1351,9 +1339,8 @@ public:
                                  AVStreams::QoS & the_qos,
                                  CORBA::Boolean is_mcast,
                                  AVStreams::FlowEndPoint_ptr peer,
-                                 char *& flowProtocol,
-                                 CORBA::Environment &env =
-                                 CORBA::Environment::default_environment ())
+                                 char *& flowProtocol
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1409,26 +1396,23 @@ public:
    * UDP if the producer is listening and the consumer connects (logically) then the producer needs to
    * know the reverse channel on its peer fep to send data to.
    */
-  virtual char * get_rev_channel (const char * pcol_name,
-                                  CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual char * get_rev_channel (const char * pcol_name
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (CORBA::Environment &env =
-                     CORBA::Environment::default_environment ())
+  virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow, to be overridden by the application.
-  virtual void start (CORBA::Environment &env =
-                      CORBA::Environment::default_environment ())
+  virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol,
-                               CORBA::Environment &env =
-                               CORBA::Environment::default_environment ())
+                               char *& flowProtocol
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1436,9 +1420,8 @@ public:
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol,
-                                          CORBA::Environment &env =
-                                          CORBA::Environment::default_environment ())
+                                          const char * use_flow_protocol
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1448,8 +1431,8 @@ public:
   virtual char * connect_mcast (AVStreams::QoS & the_qos,
                                 CORBA::Boolean_out is_met,
                                 const char * address,
-                                const char * use_flow_protocol,
-                                CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                const char * use_flow_protocol
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::notSupported,
@@ -1459,14 +1442,14 @@ public:
 
 
   /// sets the public key  to be used for encryption of the data.
-  virtual void set_key (const AVStreams::key & the_key,
-                        CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void set_key (const AVStreams::key & the_key
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// sets the source id of this flow producer so that it can be used
   /// to distinguish this producer from others in the multicast case.
-  virtual void set_source_id (CORBA::Long source_id,
-                              CORBA::Environment &env =CORBA::Environment::default_environment())
+  virtual void set_source_id (CORBA::Long source_id
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -1489,21 +1472,18 @@ public:
                     const char *format);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (CORBA::Environment &env =
-                     CORBA::Environment::default_environment ())
+  virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow, to be overridden by the application.
-  virtual void start (CORBA::Environment &env =
-                      CORBA::Environment::default_environment ())
+  virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
-                               char *& flowProtocol,
-                               CORBA::Environment &env =
-                               CORBA::Environment::default_environment ())
+                               char *& flowProtocol
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1511,16 +1491,15 @@ public:
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
-                                          const char * use_flow_protocol,
-                                          CORBA::Environment &env =
-                                          CORBA::Environment::default_environment ())
+                                          const char * use_flow_protocol
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
                      AVStreams::QoSRequestFailed));
 };
 
-/** 
+/**
  * @class TAO_MediaControl
  * @brief Abstract Mediacontrol class.
  *        The following are to be handled by the specialized media control
@@ -1536,34 +1515,34 @@ public:
   TAO_MediaControl (void);
 
   virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
-                                                  AVStreams::PositionKey a_key,
-                                                  CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                                  AVStreams::PositionKey a_key
+                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported)) =0;
 
-  virtual void set_media_position (const AVStreams::Position & a_position,
-                                   CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void set_media_position (const AVStreams::Position & a_position
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void start (const AVStreams::Position & a_position,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void start (const AVStreams::Position & a_position
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void pause (const AVStreams::Position & a_position,
-                      CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void pause (const AVStreams::Position & a_position
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void resume (const AVStreams::Position & a_position,
-                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void resume (const AVStreams::Position & a_position
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
-  virtual void stop (const AVStreams::Position & a_position,
-                     CORBA::Environment &env = CORBA::Environment::default_environment ())
+  virtual void stop (const AVStreams::Position & a_position
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 9cf546235b4..a87e79d155f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -143,8 +143,8 @@ TAO_AV_Core::reactor (void)
 
 int
 TAO_AV_Core::init (CORBA::ORB_ptr orb,
-                   PortableServer::POA_ptr poa,
-                   CORBA::Environment&)
+                   PortableServer::POA_ptr poa
+                   TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init "));
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -163,7 +163,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_AV_Core::init_forward_flows\n"));
+                "TAO_AV_Core::init_forward_flows\n"));
 
   TAO_AV_FlowSpecSet address_flow_set;
   TAO_AV_FlowSpecSet flow_set;
@@ -179,17 +179,17 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
             switch (entry->direction ())
               {
               case TAO_FlowSpec_Entry::TAO_AV_DIR_IN:
-		{
-		  entry->role (TAO_FlowSpec_Entry::TAO_AV_CONSUMER);
-		  break;
-		}
+                {
+                  entry->role (TAO_FlowSpec_Entry::TAO_AV_CONSUMER);
+                  break;
+                }
               case TAO_FlowSpec_Entry::TAO_AV_DIR_OUT:
-		{
-		  entry->role (TAO_FlowSpec_Entry::TAO_AV_PRODUCER);
-		  break;
-		}
+                {
+                  entry->role (TAO_FlowSpec_Entry::TAO_AV_PRODUCER);
+                  break;
+                }
               }
-	    break;
+            break;
           }
         case TAO_AV_Core::TAO_AV_ENDPOINT_A:
           {
@@ -211,9 +211,9 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
       if (address != 0)
         {
           if (TAO_debug_level > 0)
-	    ACE_DEBUG ((LM_DEBUG,
-			"address given for flow %s",
-			entry->flowname ()));
+            ACE_DEBUG ((LM_DEBUG,
+                        "address given for flow %s",
+                        entry->flowname ()));
 
           address_flow_set.insert (entry);
         }
@@ -233,8 +233,8 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
                                                    address_flow_set);
           if (result < 0)
             ACE_ERROR_RETURN ((LM_ERROR,
-			       "TAO_AV_Core::init_forward_flows::acceptor_registry::open failed\n"),
-			      -1);
+                               "TAO_AV_Core::init_forward_flows::acceptor_registry::open failed\n"),
+                              -1);
           TAO_AV_FlowSpecSetItor end = address_flow_set.end ();
           for (TAO_AV_FlowSpecSetItor start = address_flow_set.begin ();
                start != end; ++start)
@@ -246,16 +246,16 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
                   {
                     if (entry->handler () != 0)
                       {
-			//Yamuna:PLEASE CHECK THIS LATER
+                        //Yamuna:PLEASE CHECK THIS LATER
 #ifndef ACE_HAS_RAPI
                         // For IN flows on the A side we should remove the handlers from the reactor.
-			ACE_Event_Handler *event_handler = entry->handler ()->event_handler ();
-			result = event_handler->reactor ()->remove_handler (event_handler,
-									    ACE_Event_Handler::READ_MASK);
-			if (result < 0)
+                        ACE_Event_Handler *event_handler = entry->handler ()->event_handler ();
+                        result = event_handler->reactor ()->remove_handler (event_handler,
+                                                                            ACE_Event_Handler::READ_MASK);
+                        if (result < 0)
                             if (TAO_debug_level > 0)
-			      ACE_DEBUG ((LM_DEBUG,
-					  "TAO_AV_Core::init_forward_flows: remove_handler failed\n"));
+                              ACE_DEBUG ((LM_DEBUG,
+                                          "TAO_AV_Core::init_forward_flows: remove_handler failed\n"));
 #endif /*ACE_HAS_RAPI*/
 
                       }
@@ -269,9 +269,9 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
                 {
                   // entry doesn't exist so add it.
                   flow_spec_set.insert (entry);
-		  //                   size_t len = flow_spec.length ();
-		  //                   flow_spec.length (len+1);
-		  //                   flow_spec [len] = entry->entry_to_string ();
+                  //                   size_t len = flow_spec.length ();
+                  //                   flow_spec.length (len+1);
+                  //                   flow_spec [len] = entry->entry_to_string ();
                 }
             }
         }
@@ -280,8 +280,8 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
       {
         if (address_flow_set.size () > 0)
           {
-	    ACE_DEBUG ((LM_DEBUG,
-			"This connector registry is called ONE\n"));
+            ACE_DEBUG ((LM_DEBUG,
+                        "This connector registry is called ONE\n"));
 
             result = this->connector_registry_->open (endpoint,
                                                       this,
@@ -502,11 +502,11 @@ TAO_AV_Core::init_reverse_flows (TAO_Base_StreamEndPoint *endpoint,
 
     case TAO_AV_Core::TAO_AV_ENDPOINT_A:
       {
-	result = this->connector_registry_->open (endpoint,
-						  this,
-						  connector_flow_set);
+        result = this->connector_registry_->open (endpoint,
+                                                  this,
+                                                  connector_flow_set);
       }
-	break;
+        break;
     default:
       break;
     }
@@ -631,71 +631,71 @@ TAO_AV_Core::load_default_transport_factories (void)
   if (udp_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "UDP Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "UDP Factory"));
 
       ACE_NEW_RETURN (udp_factory,
-		      TAO_AV_UDP_Factory,
-		      -1);
+                      TAO_AV_UDP_Factory,
+                      -1);
     }
-  
+
   ACE_NEW_RETURN (udp_item, TAO_AV_Transport_Item ("UDP_Factory"), -1);
   udp_item->factory (udp_factory);
-  
+
   this->transport_factories_.insert (udp_item);
-  
+
   TAO_AV_Transport_Factory *tcp_factory = 0;
   TAO_AV_Transport_Item *tcp_item = 0;
-  
+
   tcp_factory =
     ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (tcp_factory_str);
   if (tcp_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "TCP Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "TCP Factory"));
 
       ACE_NEW_RETURN (tcp_factory,
-		      TAO_AV_TCP_Factory,
+                      TAO_AV_TCP_Factory,
                           -1);
     }
-  
+
   ACE_NEW_RETURN (tcp_item, TAO_AV_Transport_Item ("TCP_Factory"), -1);
   tcp_item->factory (tcp_factory);
-  
+
   this->transport_factories_.insert (tcp_item);
-  
+
 #ifdef ACE_HAS_RAPI
   const char *udp_qos_factory_str = "UDP_QoS_Factory";
-  
+
   TAO_AV_Transport_Factory *udp_qos_factory = 0;
   TAO_AV_Transport_Item *udp_qos_item = 0;
-  
+
   udp_qos_factory =
         ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (udp_qos_factory_str);
   if (udp_qos_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "UDP QoS Factory"));
-      
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "UDP QoS Factory"));
+
           ACE_NEW_RETURN (udp_qos_factory,
                           TAO_AV_UDP_QoS_Factory,
                           -1);
     }
-  
-  ACE_NEW_RETURN (udp_qos_item, 
-		  TAO_AV_Transport_Item ("UDP_QoS_Factory"),
-		  -1);
-      
+
+  ACE_NEW_RETURN (udp_qos_item,
+                  TAO_AV_Transport_Item ("UDP_QoS_Factory"),
+                  -1);
+
   udp_qos_item->factory (udp_qos_factory);
-      
+
   this->transport_factories_.insert (udp_qos_item);
 #endif /*ACE_HAS_RAPI*/
 
@@ -711,42 +711,42 @@ TAO_AV_Core::init_transport_factories (void)
 
   if (factory == end)
     {
-      if (TAO_debug_level > 0) 
-	ACE_DEBUG ((LM_DEBUG,
-		    "Loading default transport protocols\n"));
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Loading default transport protocols\n"));
       this->load_default_transport_factories ();
     }
   else
     {
       for (; factory != end; factory++)
-	{
-	  const ACE_CString &name = (*factory)->name ();
-	  if (TAO_debug_level > 0) 
-	    ACE_DEBUG ((LM_DEBUG,
-			"%s \n",
-			name.c_str ()));
-	  
-	  (*factory)->factory (
-			       ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (name.c_str ()));
-	  if ((*factory)->factory () == 0)
-	    {
-	      ACE_ERROR_RETURN ((LM_ERROR,
-				 ACE_TEXT ("TAO (%P|%t) Unable to load ")
-				 ACE_TEXT ("protocol <%s>, %p\n"),
-				 name.c_str (), ""),
-				-1);
-	    }
-	  
-	  if (TAO_debug_level > 0)
-	    {
-	      ACE_DEBUG ((LM_DEBUG,
-			  ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"),
-			  name.c_str ()));
-	    }
-	}
-      
+        {
+          const ACE_CString &name = (*factory)->name ();
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "%s \n",
+                        name.c_str ()));
+
+          (*factory)->factory (
+                               ACE_Dynamic_Service<TAO_AV_Transport_Factory>::instance (name.c_str ()));
+          if ((*factory)->factory () == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("TAO (%P|%t) Unable to load ")
+                                 ACE_TEXT ("protocol <%s>, %p\n"),
+                                 name.c_str (), ""),
+                                -1);
+            }
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"),
+                          name.c_str ()));
+            }
+        }
+
     }
-  
+
   return 0;
 }
 
@@ -767,14 +767,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void)
   if (udp_flow_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "UDP Flow Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "UDP Flow Factory"));
 
       ACE_NEW_RETURN (udp_flow_factory,
-		      TAO_AV_UDP_Flow_Factory,
-		      -1);
+                      TAO_AV_UDP_Flow_Factory,
+                      -1);
     }
 
   ACE_NEW_RETURN (udp_item, TAO_AV_Flow_Protocol_Item ("UDP_Flow_Factory"), -1);
@@ -793,14 +793,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void)
   if (udp_qos_flow_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "UDP QoS Flow Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "UDP QoS Flow Factory"));
 
       ACE_NEW_RETURN (udp_qos_flow_factory,
-		      TAO_AV_UDP_QoS_Flow_Factory,
-		      -1);
+                      TAO_AV_UDP_QoS_Flow_Factory,
+                      -1);
     }
 
   ACE_NEW_RETURN (udp_qos_flow_item, TAO_AV_Flow_Protocol_Item ("UDP_QoS_Flow_Factory"), -1);
@@ -818,14 +818,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void)
   if (tcp_flow_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "TCP Flow Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "TCP Flow Factory"));
 
       ACE_NEW_RETURN (tcp_flow_factory,
-		      TAO_AV_TCP_Flow_Factory,
-		      -1);
+                      TAO_AV_TCP_Flow_Factory,
+                      -1);
     }
 
   ACE_NEW_RETURN (tcp_item, TAO_AV_Flow_Protocol_Item ("TCP_Flow_Factory"), -1);
@@ -841,14 +841,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void)
   if (rtp_flow_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "RTP Flow Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "RTP Flow Factory"));
 
       ACE_NEW_RETURN (rtp_flow_factory,
-		      TAO_AV_RTP_Flow_Factory,
-		      -1);
+                      TAO_AV_RTP_Flow_Factory,
+                      -1);
     }
 
   ACE_NEW_RETURN (rtp_item, TAO_AV_Flow_Protocol_Item ("RTP_Flow_Factory"), -1);
@@ -864,14 +864,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void)
   if (rtcp_flow_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "RTCP Flow Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "RTCP Flow Factory"));
 
       ACE_NEW_RETURN (rtcp_flow_factory,
-		      TAO_AV_RTCP_Flow_Factory,
-		      -1);
+                      TAO_AV_RTCP_Flow_Factory,
+                      -1);
     }
 
   ACE_NEW_RETURN (rtcp_item, TAO_AV_Flow_Protocol_Item ("RTCP_Flow_Factory"), -1);
@@ -887,14 +887,14 @@ TAO_AV_Core::load_default_flow_protocol_factories (void)
   if (sfp_flow_factory == 0)
     {
       if (TAO_debug_level)
-	ACE_ERROR ((LM_WARNING,
-		    "(%P|%t) WARNING - No %s found in Service Repository."
-		    "  Using default instance.\n",
-		    "SFP Flow Factory"));
+        ACE_ERROR ((LM_WARNING,
+                    "(%P|%t) WARNING - No %s found in Service Repository."
+                    "  Using default instance.\n",
+                    "SFP Flow Factory"));
 
       ACE_NEW_RETURN (sfp_flow_factory,
-		      TAO_AV_SFP_Factory,
-		      -1);
+                      TAO_AV_SFP_Factory,
+                      -1);
     }
 
   ACE_NEW_RETURN (sfp_item, TAO_AV_Flow_Protocol_Item ("SFP_Flow_Factory"), -1);
@@ -910,42 +910,42 @@ TAO_AV_Core::init_flow_protocol_factories (void)
 {
   TAO_AV_Flow_ProtocolFactorySetItor end = this->flow_protocol_factories_.end ();
   TAO_AV_Flow_ProtocolFactorySetItor factory = this->flow_protocol_factories_.begin ();
-  
+
   if (factory == end)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "Loading default flow protocol factories\n"));
+                  "Loading default flow protocol factories\n"));
 
       this->load_default_flow_protocol_factories ();
     }
   else
     {
       for (; factory != end; factory++)
-	{
-	  const ACE_CString &name = (*factory)->name ();
-	  if (TAO_debug_level > 0) 
-	    ACE_DEBUG ((LM_DEBUG,
-			"%s \n",
-			name.c_str ()));
-
-	  (*factory)->factory (
-			       ACE_Dynamic_Service<TAO_AV_Flow_Protocol_Factory>::instance (name.c_str ()));
-	  if ((*factory)->factory () == 0)
-	    {
-	      ACE_ERROR_RETURN ((LM_ERROR,
-				 ACE_TEXT ("TAO (%P|%t) Unable to load ")
-				 ACE_TEXT ("protocol <%s>, %p\n"),
-				 name.c_str (), ""),
-				-1);
-	    }
-	  
-	  if (TAO_debug_level > 0)
-	    {
-	      ACE_DEBUG ((LM_DEBUG,
-			  ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"),
-			  name.c_str ()));
-	    }
-	}
+        {
+          const ACE_CString &name = (*factory)->name ();
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "%s \n",
+                        name.c_str ()));
+
+          (*factory)->factory (
+                               ACE_Dynamic_Service<TAO_AV_Flow_Protocol_Factory>::instance (name.c_str ()));
+          if ((*factory)->factory () == 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ACE_TEXT ("TAO (%P|%t) Unable to load ")
+                                 ACE_TEXT ("protocol <%s>, %p\n"),
+                                 name.c_str (), ""),
+                                -1);
+            }
+
+          if (TAO_debug_level > 0)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"),
+                          name.c_str ()));
+            }
+        }
 
     }
 
@@ -960,18 +960,18 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant)
   // the servant when all pending requests on this servant are
   // complete.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      PortableServer::POA_var poa = servant->_default_POA (ACE_TRY_ENV);
+      PortableServer::POA_var poa = servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::ObjectId_var id = poa->servant_to_id (servant,
-                                                            ACE_TRY_ENV);
+      PortableServer::ObjectId_var id = poa->servant_to_id (servant
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa->deactivate_object (id.in (),
-                              ACE_TRY_ENV);
+      poa->deactivate_object (id.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index e6714f92db1..1e8a54e45bf 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -83,8 +83,8 @@ public:
   ~TAO_AV_Core (void);
 
   int init (CORBA::ORB_ptr orb,
-            PortableServer::POA_ptr poa,
-            CORBA::Environment &env);
+            PortableServer::POA_ptr poa
+            TAO_ENV_ARG_DECL);
   int run (void);
   int stop_run (void);
   int init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 8919ca23faf..fe0fb2884ad 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -52,8 +52,8 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void)
 // and the remaining calls will fail automagically
 int
 TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */,
-                                    AVStreams::VDev_ptr & /* vdev */,
-                                    CORBA::Environment &)
+                                    AVStreams::VDev_ptr & /* vdev */
+                                    TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating A endpoint\n"),
@@ -66,8 +66,8 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_
 // and the remaining calls will fail automagically
 int
 TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */,
-                                    AVStreams::VDev_ptr & /*vdev */,
-                                    CORBA::Environment &)
+                                    AVStreams::VDev_ptr & /*vdev */
+                                    TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating B endpoint\n"),
@@ -156,19 +156,19 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
                        "remove"),
                       -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Get ourselves a Naming service
-      this->bind_to_naming_service (ACE_TRY_ENV);
+      this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the stream endpoint created by the child from the naming service
-      this->get_stream_endpoint (ACE_TRY_ENV);
+      this->get_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Vdev created by the child from the naming service
-      this->get_vdev (ACE_TRY_ENV);
+      this->get_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -183,7 +183,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
 
 // Get ourselves a Naming service reference
 int
-TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -191,7 +191,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC
         return 0;
 
       CORBA::Object_var naming_obj =
-        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -199,8 +199,8 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC
                            " (%P|%t) Unable to resolve the Name Service.\n"),
                           -1);
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &AC
 
 // Get the VDev created in the child process from the namingservice
 int
-TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -235,14 +235,14 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV)
 
       // Get the CORBA::Object
       CORBA::Object_var vdev =
-        this->naming_context_->resolve (VDev_Name,
-                                        ACE_TRY_ENV);
+        this->naming_context_->resolve (VDev_Name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow it
       this->vdev_ =
-        AVStreams::VDev::_narrow (vdev.in (),
-                                  ACE_TRY_ENV);
+        AVStreams::VDev::_narrow (vdev.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check if valid
@@ -279,8 +279,8 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void)
 // the "A" type endpoint creator
 int
 TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                                           AVStreams::VDev_ptr &vdev,
-                                           CORBA::Environment &)
+                                           AVStreams::VDev_ptr &vdev
+                                           TAO_ENV_ARG_DECL_NOT_USED)
 {
   // use the baseclass activate
   if (this->activate () == -1)
@@ -297,7 +297,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
 
 // Gets the stream endpoint object reference from the naming service
 int
-TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -318,14 +318,14 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE
 
       // Get the CORBA::Object
       CORBA::Object_var stream_endpoint_a =
-        this->naming_context_->resolve (Stream_Endpoint_A_Name,
-                                        ACE_TRY_ENV);
+        this->naming_context_->resolve (Stream_Endpoint_A_Name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the reference
       this->stream_endpoint_a_ =
-        AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in (),
-                                              ACE_TRY_ENV);
+        AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for validity
@@ -362,8 +362,8 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void)
 // Creates and returns a "B" type endpoint
 int
 TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                                              AVStreams::VDev_ptr &vdev,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              AVStreams::VDev_ptr &vdev
+                                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -373,8 +373,8 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
                         -1);
 
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n",
-                TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_,
-                                                                    ACE_TRY_ENV)));
+                TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_
+                                                                    TAO_ENV_ARG_PARAMETER)));
     ACE_TRY_CHECK;
     stream_endpoint = this->stream_endpoint_b_;
     vdev = this->vdev_;
@@ -391,7 +391,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
 
 // Gets the B type stream_endpoint from the Naming service
 int
-TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -412,14 +412,14 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE
 
       // Get the CORBA::Object reference
       CORBA::Object_var stream_endpoint_b =
-        this->naming_context_->resolve (Stream_Endpoint_B_Name,
-                                        ACE_TRY_ENV);
+        this->naming_context_->resolve (Stream_Endpoint_B_Name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the reference
       this->stream_endpoint_b_ =
-        AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in (),
-                                              ACE_TRY_ENV);
+        AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for validity
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 57038d447f8..7323dd79bcb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -43,13 +43,13 @@ public:
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev,
-                        CORBA::Environment &env);
+                        AVStreams::VDev_ptr &vdev
+                        TAO_ENV_ARG_DECL);
 
   /// Called by the MMDevice, when it needs to create an B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev,
-                        CORBA::Environment &env);
+                        AVStreams::VDev_ptr &vdev
+                        TAO_ENV_ARG_DECL);
 
 protected:
   /// The "A" stream endpoint
@@ -87,18 +87,18 @@ public:
 
 protected:
   /// Bind to the naming service
-  virtual int bind_to_naming_service (CORBA::Environment &env);
+  virtual int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL);
 
   /**
    * Get the object reference for the newly created stream
    * endpoint (which will be in the child process)
    * Subclasses will define the functionality for this
    */
-  virtual int get_stream_endpoint (CORBA::Environment &env) = 0;
+  virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Get the Vdev object reference for the newly created
   /// endpoint
-  virtual int get_vdev (CORBA::Environment &env);
+  virtual int get_vdev (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Naming context
   CosNaming::NamingContext_var naming_context_;
@@ -134,11 +134,11 @@ public:
 protected:
   /// Creates an "A" type stream endpoint, and a vdev
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev,
-                        CORBA::Environment &env);
+                        AVStreams::VDev_ptr &vdev
+                        TAO_ENV_ARG_DECL);
 
   /// Gets the "A" type stream endpoint from the child process
-  virtual int get_stream_endpoint (CORBA::Environment &env);
+  virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
 
 };
 
@@ -162,12 +162,12 @@ public:
 protected:
   /// Creates a "B" type stream endpoint, and a vdev
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev,
-                        CORBA::Environment &env);
+                        AVStreams::VDev_ptr &vdev
+                        TAO_ENV_ARG_DECL);
 
 
   /// Gets the object reference of the "B" type streamendpoint.
-  virtual int get_stream_endpoint (CORBA::Environment &env);
+  virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index dbeadcf634a..7d552cc5bfe 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -32,15 +32,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->activate_stream_endpoint (ACE_TRY_ENV);
+      this->activate_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n"));
 
-      this->activate_vdev (ACE_TRY_ENV);
+      this->activate_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n"));
 
-      this->activate_mediactrl (ACE_TRY_ENV);
+      this->activate_mediactrl (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n"));
     }
@@ -56,22 +56,22 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL)
 {
 
   PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant,
-                                 ACE_TRY_ENV);
+    this->poa_->activate_object (servant
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in (),
-                                 ACE_TRY_ENV);
+    this->poa_->id_to_reference (id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return str._retn ();
@@ -81,7 +81,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate VDev into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -91,16 +91,16 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
         return -1;
 
       // Activate the object under the root poa.
-      CORBA::String_var vdev_ior = this->activate_with_poa (vdev,
-                                                            ACE_TRY_ENV);
+      CORBA::String_var vdev_ior = this->activate_with_poa (vdev
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n",
                   vdev_ior. in ()));
 
       // Save the object reference, so that create_A can return it
-      this->vdev_ = vdev->_this (ACE_TRY_ENV);
+      this->vdev_ = vdev->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      vdev->_remove_ref (ACE_TRY_ENV);
+      vdev->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -117,7 +117,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate the media_controller
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -127,8 +127,8 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
         return -1;
 
       // Activate the mediactrl object under the root poa.
-      CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl,
-                                                                 ACE_TRY_ENV);
+      CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl
+                                                                 TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n",
@@ -138,18 +138,18 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       // Associate the media controller object reference with the vdev, as per the OMG spec
       CORBA::Any anyval;
       CORBA::Object_var media_ctrl_obj
-        = media_ctrl->_this (ACE_TRY_ENV);
+        = media_ctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      media_ctrl->_remove_ref (ACE_TRY_ENV);
+      media_ctrl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      anyval <<= this->orb_->object_to_string (media_ctrl_obj.in (),
-                                               ACE_TRY_ENV);
+      anyval <<= this->orb_->object_to_string (media_ctrl_obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
      this->vdev_->define_property ("Related_MediaCtrl",
-                                   anyval,
-                                   ACE_TRY_ENV);
+                                   anyval
+                                   TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -231,8 +231,8 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                                                                                      AVStreams::VDev_ptr &vdev,
-                                                                                      CORBA::Environment &/* ACE_TRY_ENV */)
+                                                                                      AVStreams::VDev_ptr &vdev
+                                                                                      TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -248,7 +248,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
 // Put the stream_endpoint into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -258,15 +258,15 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
       if (this->make_stream_endpoint (stream_endpoint_a) == -1)
         return -1;
 
-      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a,
-                                                                            ACE_TRY_ENV);
+      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a
+                                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
 
       // Save the object references, so that create_a can return them
-      this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_TRY_ENV);
+      this->stream_endpoint_a_ = stream_endpoint_a->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      stream_endpoint_a->_remove_ref (ACE_TRY_ENV);
+      stream_endpoint_a->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -309,7 +309,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
 // Activate stream_endpoint
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -317,14 +317,14 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
 
       if (this->make_stream_endpoint (stream_endpoint_b) == -1)
         return -1;
-      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_b,
-                                                                       ACE_TRY_ENV);
+      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_b
+                                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
 
-      this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_TRY_ENV);
+      this->stream_endpoint_b_ = stream_endpoint_b->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      stream_endpoint_b->_remove_ref (ACE_TRY_ENV);
+      stream_endpoint_b->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -341,8 +341,8 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                                                                                      AVStreams::VDev_ptr &vdev,
-                                                                                      CORBA::Environment &/* ACE_TRY_ENV */)
+                                                                                      AVStreams::VDev_ptr &vdev
+                                                                                      TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -389,20 +389,20 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 
       // create the objects and activate them in the poa
       this->activate_objects (argc,
-                              argv,
-                              ACE_TRY_ENV);
+                              argv
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get ourselves a naming_service object reference
-      this->bind_to_naming_service (ACE_TRY_ENV);
+      this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the vdev with the naming service
-      this->register_vdev (ACE_TRY_ENV);
+      this->register_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // register the stream_endpoing with the naming_service
-      this->register_stream_endpoint (ACE_TRY_ENV);
+      this->register_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -423,23 +423,23 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant,
-                                                                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant
+                                                                                 TAO_ENV_ARG_DECL)
 {
 
   PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant,
-                                 ACE_TRY_ENV);
+    this->poa_->activate_object (servant
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in (),
-                                 ACE_TRY_ENV);
+    this->poa_->id_to_reference (id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return str._retn ();
@@ -449,8 +449,8 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int /*argc*/,
-                                                                                 char ** /*argv*/,
-                                                                                 CORBA::Environment &ACE_TRY_ENV)
+                                                                                 char ** /*argv*/
+                                                                                 TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -467,24 +467,24 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
         return -1;
 
       // activate the stream_endpoint
-      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_,
-                                                                       ACE_TRY_ENV);
+      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_
+                                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",
                                            stream_endpoint_ior.in ()));
 
       // activate the vdev
-      CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_,
-                                                            ACE_TRY_ENV);
+      CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",
                                            vdev_ior.in ()));
 
       // activate the media controller
-      CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_,
-                                                                  ACE_TRY_ENV);
+      CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_
+                                                                  TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ()));
@@ -502,12 +502,12 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
 // Bind to the namingservice
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -515,8 +515,8 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
                           -1);
       //  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -532,7 +532,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
 // register the vdev with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_ptr vdev_obj = CORBA::Object::_nil ();
   ACE_TRY
@@ -552,26 +552,26 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CO
       // make the media controller a property of the vdev
       CORBA::Any media_ctrl_property;
       CORBA::Object_var media_ctrl_obj =
-        this->media_ctrl_->_this (ACE_TRY_ENV);
+        this->media_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in (),
-                                                            ACE_TRY_ENV);
+      media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in ()
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->vdev_->define_property ("Related_MediaCtrl",
-                                    media_ctrl_property,
-                                    ACE_TRY_ENV);
+                                    media_ctrl_property
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      vdev_obj = this->vdev_->_this (ACE_TRY_ENV);
+      vdev_obj = this->vdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->vdev_->_remove_ref (ACE_TRY_ENV);
+      this->vdev_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_TRY_EX (bind)
         {
           // Register the vdev with the naming server.
           this->naming_context_->bind (this->vdev_name_,
-                                       vdev_obj,
-                                       ACE_TRY_ENV);
+                                       vdev_obj
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bind);
         }
       ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
@@ -579,8 +579,8 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CO
           // If the object was already there, replace the older reference
           // with this one
           this->naming_context_->rebind (this->vdev_name_,
-                                         vdev_obj,
-                                         ACE_TRY_ENV);
+                                         vdev_obj
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -609,7 +609,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (tv, ACE_TRY_ENV);
+      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -657,30 +657,30 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
 // register the stream_endpoint with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
   ACE_TRY
     {
-      stream_endpoint_obj = this->stream_endpoint_->_this (ACE_TRY_ENV);
+      stream_endpoint_obj = this->stream_endpoint_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->stream_endpoint_->_remove_ref (ACE_TRY_ENV);
+      this->stream_endpoint_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       //  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
       // Create a name for the video control object
       // subclasses can define their own name for the streamendpoint
       // Register the stream endpoint object with the naming server.
       this->naming_context_->bind (this->stream_endpoint_name_,
-                                   stream_endpoint_obj,
-                                   ACE_TRY_ENV);
+                                   stream_endpoint_obj
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
     {
       // if the name was already there, replace the reference with the new one
       this->naming_context_->rebind (this->stream_endpoint_name_,
-                                     stream_endpoint_obj,
-                                     ACE_TRY_ENV);
+                                     stream_endpoint_obj
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -738,12 +738,12 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
     {
       if (CORBA::is_nil (this->naming_context_.in ()) == 0)
         return 0;
-      this->naming_context_->unbind (this->stream_endpoint_name_,
-                                     ACE_TRY_ENV);
+      this->naming_context_->unbind (this->stream_endpoint_name_
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->naming_context_->unbind (this->vdev_name_,
-                                     ACE_TRY_ENV);
+      this->naming_context_->unbind (this->vdev_name_
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index bc1a20f5b10..f4cb2acefd7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -7,7 +7,7 @@
  *
  *  $Id$
  *
- *  @author Sumedh Mungee <sumedh@cs.wustl.edu> 
+ *  @author Sumedh Mungee <sumedh@cs.wustl.edu>
  *  @author Nagarajan Surendran <naga@cs.wustl.edu>
  */
 //=============================================================================
@@ -42,15 +42,15 @@ protected:
   virtual int activate (void);
 
   /// activates the stream_endpoint with the POA
-  virtual int activate_stream_endpoint (CORBA::Environment &env) = 0;
+  virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0;
 
   /// activates the vdev with the POA
-  virtual int activate_vdev (CORBA::Environment &env);
+  virtual int activate_vdev (TAO_ENV_SINGLE_ARG_DECL);
 
 
 
   /// activates the media controller with the POA
-  virtual int activate_mediactrl (CORBA::Environment &env);
+  virtual int activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Bridge method to create a vdev, a la Acceptor. Applications
   /// can override this
@@ -65,10 +65,10 @@ protected:
   virtual int make_mediactrl (T_MediaCtrl *&media_ctrl);
 
 
-  char* activate_with_poa (PortableServer::Servant servant, CORBA::Environment &env);
-  
+  char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL);
+
   CORBA::ORB_var orb_;
-  
+
   PortableServer::POA_var poa_;
 
 };
@@ -95,12 +95,12 @@ public:
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// an "A" type endpoint
-  virtual int activate_stream_endpoint (CORBA::Environment &env);
+  virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev,
-                        CORBA::Environment &env);
+                        AVStreams::VDev_ptr &vdev
+                        TAO_ENV_ARG_DECL);
 
 };
 
@@ -126,12 +126,12 @@ public:
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// a "B" type endpoint
-  virtual int activate_stream_endpoint (CORBA::Environment &env);
+  virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Called by the MMDevice, when it needs to create a B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                        AVStreams::VDev_ptr &vdev,
-                        CORBA::Environment &env);
+                        AVStreams::VDev_ptr &vdev
+                        TAO_ENV_ARG_DECL);
 };
 
 // ----------------------------------------------------------------------
@@ -139,7 +139,7 @@ public:
 /**
  * @class TAO_AV_Child_Process
  *
- * @brief Helper class for the child process created in 
+ * @brief Helper class for the child process created in
  *        TAO_AV_Endpoint_Process_Strategy
  */
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
@@ -167,23 +167,23 @@ protected:
    * return them to the client
    */
   int activate_objects (int argc,
-                        char **argv,
-                        CORBA::Environment &env);
+                        char **argv
+                        TAO_ENV_ARG_DECL);
 
   ///activate the servant with the poa
-  char* activate_with_poa (PortableServer::Servant servant, CORBA::Environment &env);
+  char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL);
 
   /// Removes the vdev and streamendpoint names from the naming service.
   int unbind_names (void);
 
   /// Binds to the naming service
-  int bind_to_naming_service (CORBA::Environment &env);
+  int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Registers vdev with the naming service
-  int register_vdev (CORBA::Environment &env);
+  int register_vdev (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Registers stream_endpoint with the naming service
-  int register_stream_endpoint (CORBA::Environment &env);
+  int register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Releases the semaphore on which the parent is waiting on
   int release_semaphore ();
@@ -225,7 +225,7 @@ protected:
   char host_[MAXHOSTNAMELEN];
 
   CORBA::ORB_ptr orb_;
-  
+
   PortableServer::POA_ptr poa_;
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index 29934d8b234..e26e6bc7116 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -27,8 +27,8 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
       CORBA::Any flowname_any;
       flowname_any <<= flowname;
       this->define_property ("Flow",
-                             flowname_any,
-                             ACE_TRY_ENV);
+                             flowname_any
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -62,8 +62,8 @@ TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name)
       CORBA::Any flowname_any;
       flowname_any <<= flow_name;
       this->define_property ("Flow",
-                             flowname_any,
-                             ACE_TRY_ENV);
+                             flowname_any
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -80,8 +80,8 @@ AVStreams::FlowProducer_ptr
 TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
-                                                   char *& named_fdev,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+                                                   char *& named_fdev
+                                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -92,8 +92,8 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
   return this->make_producer (the_requester,
                               the_qos,
                               met_qos,
-                              named_fdev,
-                              ACE_TRY_ENV);
+                              named_fdev
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -102,8 +102,8 @@ AVStreams::FlowProducer_ptr
 TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /* the_requester */,
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
-                                                 char *& /* named_fdev */,
-                                                 CORBA::Environment &ACE_TRY_ENV)
+                                                 char *& /* named_fdev */
+                                                 TAO_ENV_ARG_DECL)
 {
   AVStreams::FlowProducer_ptr producer = AVStreams::FlowProducer::_nil ();
   ACE_TRY
@@ -114,7 +114,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
                       T_Producer,
                       0);
       this->producer_list_.insert_tail (producer_i);
-      producer = producer_i->_this (ACE_TRY_ENV);
+      producer = producer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -133,8 +133,8 @@ AVStreams::FlowConsumer_ptr
 TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /* the_requester */,
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
-                                                 char *& /* named_fdev */,
-                                                 CORBA::Environment &ACE_TRY_ENV)
+                                                 char *& /* named_fdev */
+                                                 TAO_ENV_ARG_DECL)
 {
   AVStreams::FlowConsumer_ptr consumer = AVStreams::FlowConsumer::_nil ();
   ACE_TRY
@@ -145,7 +145,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
                       T_Consumer,
                       0);
       this->consumer_list_.insert_tail (consumer_i);
-      consumer = consumer_i->_this (ACE_TRY_ENV);
+      consumer = consumer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -163,8 +163,8 @@ AVStreams::FlowConsumer_ptr
 TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
-                                                   char *& named_fdev,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+                                                   char *& named_fdev
+                                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -174,8 +174,8 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
   return this->make_consumer (the_requester,
                               the_qos,
                               met_qos,
-                              named_fdev,
-                              ACE_TRY_ENV);
+                              named_fdev
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -183,8 +183,8 @@ template <class T_Producer, class T_Consumer>
 AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
                                         AVStreams::QoS & the_qos,
-                                        CORBA::Boolean_out is_met,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Boolean_out is_met
+                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -192,7 +192,6 @@ TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
   ACE_UNUSED_ARG (peer_device);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   return 0;
 }
@@ -202,8 +201,8 @@ template <class T_Producer, class T_Consumer>
 AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
                                               AVStreams::QoS & the_qos,
-                                              CORBA::Boolean_out is_met,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              CORBA::Boolean_out is_met
+                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -211,7 +210,6 @@ TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   return 0;
 }
@@ -219,8 +217,8 @@ TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
 template <class T_Producer, class T_Consumer>
 void
 TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
-                                           const char * /* fdev_name */,
-                                           CORBA::Environment &/*ACE_TRY_ENV*/)
+                                           const char * /* fdev_name */
+                                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index 2277277f4cd..b227851f3e7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -47,8 +47,8 @@ public:
   AVStreams::FlowProducer_ptr create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev,
-                                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                                       char *& named_fdev
+                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -60,15 +60,15 @@ public:
   virtual AVStreams::FlowProducer_ptr make_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev,
-                                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
+                                                       char *& named_fdev
+                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// create a flow consumer object.
   virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev,
-                                                       CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                                       char *& named_fdev
+                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -80,14 +80,14 @@ public:
   virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
-                                                       char *& named_fdev,
-                                                       CORBA::Environment &env = CORBA::Environment::default_environment ());
+                                                       char *& named_fdev
+                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// bind this FDev with another FDev.
   virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device,
                                               AVStreams::QoS & the_qos,
-                                              CORBA::Boolean_out is_met,
-                                              CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                              CORBA::Boolean_out is_met
+                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
@@ -95,17 +95,16 @@ public:
   /// multicast bind is not implemented yet.
   virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer,
                                                     AVStreams::QoS & the_qos,
-                                                    CORBA::Boolean_out is_met,
-                                                    CORBA::Environment &env = CORBA::Environment::default_environment ())
+                                                    CORBA::Boolean_out is_met
+                                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
 
   /// destroys this FDev.
   virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep,
-                        const char * fdev_name,
-                        CORBA::Environment &env =
-                        CORBA::Environment::default_environment ())
+                        const char * fdev_name
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index dcf151a4691..dbeb3e615f0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -20,7 +20,7 @@ static int resv_confirm = 0;
 
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
-               iovec* iov, 
+               iovec* iov,
                ACE_QoS* qos)
 {
   qos_params.callee_data (iov);
@@ -43,98 +43,98 @@ TAO_AV_UDP_QoS_Session_Helper::~TAO_AV_UDP_QoS_Session_Helper (void)
 
 int
 TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec,
-					TAO_AV_UDP_QoS_Flow_Handler *handler)
+                                        TAO_AV_UDP_QoS_Flow_Handler *handler)
 {
   ACE_QoS* ace_qos = 0;
 
   ACE_NEW_RETURN (ace_qos,
-		  ACE_QoS,
-		  -1);
-  
+                  ACE_QoS,
+                  -1);
+
   Fill_ACE_QoS fill_ace_qos;
-  
+
   if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
     {
       if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos,
-						&ace_flow_spec) !=0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Unable to fill simplex sender qos (%N|%l)\n"),
-			  -1);
+                                                &ace_flow_spec) !=0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unable to fill simplex sender qos (%N|%l)\n"),
+                          -1);
       else
-	if (TAO_debug_level > 0)
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Filled up the Sender QoS parameters\n"));
+        if (TAO_debug_level > 0)
+          ACE_DEBUG ((LM_DEBUG,
+                      "Filled up the Sender QoS parameters\n"));
     }
   else if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER)
     {
       if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos,
-						  &ace_flow_spec) !=0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Unable to fill simplex receiver qos (%N|%l)\n"),
-			  -1);
+                                                  &ace_flow_spec) !=0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unable to fill simplex receiver qos (%N|%l)\n"),
+                          -1);
       else
-	if (TAO_debug_level > 0)
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Filled up the Receiver QoS parameters\n"));
+        if (TAO_debug_level > 0)
+          ACE_DEBUG ((LM_DEBUG,
+                      "Filled up the Receiver QoS parameters\n"));
 
     }
-  
+
   ACE_QoS_Manager qos_manager = handler->get_socket ()->qos_manager ();
-  
+
   // Set the QoS for the session. Replaces the ioctl () call that
   // was being made previously.
   if (handler->qos_session ()->qos (handler->get_socket (),
-				    &qos_manager,
-				    *ace_qos) == -1)
+                                    &qos_manager,
+                                    *ace_qos) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Unable to set QoS (%N|%l)\n"),
-		      -1);
+                       "Unable to set QoS (%N|%l)\n"),
+                      -1);
   else
     ACE_DEBUG ((LM_DEBUG,
-		"Setting QOS succeeds\n"));
+                "Setting QOS succeeds\n"));
 
   return 0;
 }
 
 ACE_QoS_Session *
 TAO_AV_UDP_QoS_Session_Helper::open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *handler,
-						 ACE_INET_Addr &addr)
+                                                 ACE_INET_Addr &addr)
 {
   ACE_QoS_Params qos_params;
-  
+
   ACE_QoS* ace_qos = 0;
-  
-  FillQoSParams (qos_params, 
-		 0, 
-		 ace_qos);
-  
-  
+
+  FillQoSParams (qos_params,
+                 0,
+                 ace_qos);
+
+
   // Create a QoS Session Factory.
   ACE_QoS_Session_Factory session_factory;
-  
+
   // Ask the factory to create a QoS session. This could be RAPI or
   // GQoS based on the parameter passed.
-  
+
   //@@YAmuna : Later make this generic for GQoS
   ACE_QoS_Session *qos_session = session_factory.create_session (ACE_QoS_Session_Factory::ACE_RAPI_SESSION);
-  
+
   // Create a destination address for the QoS session. The same
   // address should be used for the subscribe call later. A copy
   // is made below only to distinguish the two usages of the dest
   // address.
   ACE_INET_Addr dest_addr (addr);
-  
+
   // A QoS session is defined by the 3-tuple [DestAddr, DestPort,
   // Protocol]. Initialize the QoS session.
   if (qos_session->open (dest_addr,
-			 IPPROTO_UDP) == -1)
+                         IPPROTO_UDP) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Error in opening the QoS session\n"),
-		      0);
+                       "Error in opening the QoS session\n"),
+                      0);
   else
     ACE_DEBUG ((LM_DEBUG,
-		"QoS session opened successfully\n"));
-  
+                "QoS session opened successfully\n"));
+
   if (handler->flowspec_entry ()->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
     {
       // This is a sender
@@ -151,34 +151,34 @@ TAO_AV_UDP_QoS_Session_Helper::open_qos_session (TAO_AV_UDP_QoS_Flow_Handler *ha
 
 int
 TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_session,
-						     TAO_AV_UDP_QoS_Flow_Handler *handler)
+                                                     TAO_AV_UDP_QoS_Flow_Handler *handler)
 {
   ACE_QoS_Decorator* qos_decorator;
-  
-  // Decorate the above handler with QoS functionality. 
+
+  // Decorate the above handler with QoS functionality.
   ACE_NEW_RETURN (qos_decorator,
-		  ACE_QoS_Decorator (handler,
-				     qos_session,
-				     handler->av_core ()->reactor ()),
+                  ACE_QoS_Decorator (handler,
+                                     qos_session,
+                                     handler->av_core ()->reactor ()),
                   -1);
-  
+
   // Initialize the Decorator.
   if (qos_decorator->init () != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "QoS Decorator init () failed (%N|%l)\n"),
-		      -1);
-  
+                       "QoS Decorator init () failed (%N|%l)\n"),
+                      -1);
+
   // Register the decorated Event Handler with the Reactor.
   int result = handler->av_core ()->reactor ()->register_handler (qos_decorator,
-								  ACE_Event_Handler::QOS_MASK |
-								  ACE_Event_Handler::READ_MASK);
+                                                                  ACE_Event_Handler::QOS_MASK |
+                                                                  ACE_Event_Handler::READ_MASK);
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Error in registering the Decorator with the Reactor (%N|%l)\n"),
-		      -1);
-  
+                       "Error in registering the Decorator with the Reactor (%N|%l)\n"),
+                      -1);
+
   return 0;
-  
+
 }
 
 TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void)
@@ -207,7 +207,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_input (ACE_HANDLE /*fd*/)
 
 int
 TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_params,
-					ACE_Flow_Spec *ace_flow_spec)
+                                        ACE_Flow_Spec *ace_flow_spec)
 {
   for (unsigned int i = 0;
        i < qos_params.length ();
@@ -220,7 +220,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para
           ace_flow_spec->service_type (type);
         }
       else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0)
-        { 
+        {
           CORBA::ULong tok_rate;
           qos_params [i].property_value >>= tok_rate;
           ace_flow_spec->token_rate (tok_rate);
@@ -231,7 +231,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para
           qos_params [i].property_value >>= tok_buck_size;
           ace_flow_spec->token_bucket_size (tok_buck_size);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)   
+      else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)
         {
           CORBA::ULong peak_bw;
           qos_params [i].property_value >>= peak_bw;
@@ -280,7 +280,7 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para
 
 int
 TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec,
-					CosPropertyService::Properties &qos_params)
+                                        CosPropertyService::Properties &qos_params)
 {
   qos_params.length (9);
 
@@ -289,10 +289,10 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec,
 
   qos_params [1].property_name = CORBA::string_dup ("Token_Rate");
   qos_params [1].property_value <<= (CORBA::ULong) ace_flow_spec->token_rate ();
-  
+
   qos_params [2].property_name = CORBA::string_dup ("Token_Bucket_Size");
   qos_params [2].property_value <<= (CORBA::ULong) ace_flow_spec->token_bucket_size ();
-  
+
   qos_params [3].property_name = CORBA::string_dup ("Peak_Bandwidth");
   qos_params [3].property_value <<= (CORBA::ULong) ace_flow_spec->peak_bandwidth ();
 
@@ -301,10 +301,10 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (ACE_Flow_Spec *ace_flow_spec,
 
   qos_params [5].property_name = CORBA::string_dup ("Delay_Variation");
   qos_params [5].property_value <<= (CORBA::ULong) ace_flow_spec->delay_variation ();
-  
+
   qos_params [6].property_name = CORBA::string_dup ("Max_SDU_Size");
   qos_params [6].property_value <<= (CORBA::ULong) ace_flow_spec->max_sdu_size ();
- 
+
   qos_params [7].property_name = CORBA::string_dup ("Minimum_Policed_Size");
   qos_params [7].property_value <<= (CORBA::ULong) ace_flow_spec->minimum_policed_size ();
 
@@ -318,14 +318,14 @@ int
 TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
+                "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
 
   if (this->qos_session_->update_qos () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Error in updating QoS\n"),
+                       "Error in updating QoS\n"),
                       -1);
   else
   {
@@ -349,51 +349,51 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
       if (this->qos_session_->rsvp_event_type () == ACE_QoS_Session::RSVP_RESV_EVENT)
             {
               if( TAO_debug_level > 0 )
-	      {
-	         ACE_DEBUG ((LM_DEBUG,
-		             "(%N,%l) Resv Event Received\n"));
-	      }
-	      if (!CORBA::is_nil (this->negotiator_))
-		{
+              {
+                 ACE_DEBUG ((LM_DEBUG,
+                             "(%N,%l) Resv Event Received\n"));
+              }
+              if (!CORBA::is_nil (this->negotiator_))
+                {
                   if( TAO_debug_level > 0 )
-		  {
-		     ACE_DEBUG ((LM_DEBUG,
-		                 "(%N,%l) Negotiator Specified\n"));
-		  }
-
-		  AVStreams::streamQoS new_qos;
-		  ACE_Flow_Spec *ace_flow_spec =
-		    this->qos_session_->qos ().sending_flowspec ();
-
-		  if (ace_flow_spec != 0)
-		    {
-		      new_qos.length (1);
-		      this->translate (ace_flow_spec,
-				       new_qos [0].QoSParams);
-		    }
-
-		  AVStreams::Negotiator_var remote_negotiator;
-		  this->negotiator_->negotiate (remote_negotiator.in (),
-						new_qos,
-						ACE_TRY_ENV);
-		}
+                  {
+                     ACE_DEBUG ((LM_DEBUG,
+                                 "(%N,%l) Negotiator Specified\n"));
+                  }
+
+                  AVStreams::streamQoS new_qos;
+                  ACE_Flow_Spec *ace_flow_spec =
+                    this->qos_session_->qos ().sending_flowspec ();
+
+                  if (ace_flow_spec != 0)
+                    {
+                      new_qos.length (1);
+                      this->translate (ace_flow_spec,
+                                       new_qos [0].QoSParams);
+                    }
+
+                  AVStreams::Negotiator_var remote_negotiator;
+                  this->negotiator_->negotiate (remote_negotiator.in (),
+                                                new_qos
+                                                TAO_ENV_ARG_PARAMETER);
+                }
             }
     }
   else if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_RECEIVER)
     {
       if (this->qos_session_->rsvp_event_type () == ACE_QoS_Session::RSVP_PATH_EVENT)
-	{
-	  ACE_QoS_Manager qos_manager =
-	    this->get_socket ()->qos_manager ();
-	  
-	  ACE_QoS ace_qos = this->qos_session_->qos ();
-
-	  this->qos_session_->qos (this->get_socket (),
-				   &qos_manager,
-				   ace_qos);
-	}
+        {
+          ACE_QoS_Manager qos_manager =
+            this->get_socket ()->qos_manager ();
+
+          ACE_QoS ace_qos = this->qos_session_->qos ();
+
+          this->qos_session_->qos (this->get_socket (),
+                                   &qos_manager,
+                                   ace_qos);
+        }
     }
-    
+
   return 0;
 }
 
@@ -403,74 +403,74 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos)
   if( TAO_debug_level > 0 )
   {
      ACE_DEBUG ((LM_DEBUG,
-   	         "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::change_qos\n"));
+                 "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::change_qos\n"));
   }
 
   ACE_QoS* ace_qos = 0;
 
   ACE_NEW_RETURN (ace_qos,
-		  ACE_QoS,
-		  -1);
-  
+                  ACE_QoS,
+                  -1);
+
   if (new_qos.QoSParams.length () != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "New QoS Params are not Empty\n"));
+                  "New QoS Params are not Empty\n"));
 
       ACE_Flow_Spec *ace_flow_spec;
-  
+
       ACE_NEW_RETURN (ace_flow_spec,
-		      ACE_Flow_Spec,
-		      -1);
-      
+                      ACE_Flow_Spec,
+                      -1);
+
       this->translate (new_qos.QoSParams,
-		       ace_flow_spec);
-      
-            
+                       ace_flow_spec);
+
+
       Fill_ACE_QoS fill_ace_qos;
 
       if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_SENDER)
-	{
-	  if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos,
-						    ace_flow_spec) !=0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Unable to fill simplex sender qos\n"),
-			      -1);
-	  else
-	    {
-	      if( TAO_debug_level > 0 ) 
-		ACE_DEBUG ((LM_DEBUG,
-			    "(%N,%l) Filled up the Sender QoS parameters\n"));
-	    }
-	}
+        {
+          if (fill_ace_qos.fill_simplex_sender_qos (*ace_qos,
+                                                    ace_flow_spec) !=0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Unable to fill simplex sender qos\n"),
+                              -1);
+          else
+            {
+              if( TAO_debug_level > 0 )
+                ACE_DEBUG ((LM_DEBUG,
+                            "(%N,%l) Filled up the Sender QoS parameters\n"));
+            }
+        }
       else if (this->qos_session_->flags () == ACE_QoS_Session::ACE_QOS_RECEIVER)
-	{
-	  if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos,
-						      ace_flow_spec) !=0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Unable to fill simplex receiver qos\n"),
-			      -1);
-	  else
-	    {
-	      if( TAO_debug_level > 0 )
-		ACE_DEBUG ((LM_DEBUG,
-			    "(%N,%l) Filled up the Receiver QoS parameters\n"));
-	    }
-      
-	}
-  
+        {
+          if (fill_ace_qos.fill_simplex_receiver_qos (*ace_qos,
+                                                      ace_flow_spec) !=0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Unable to fill simplex receiver qos\n"),
+                              -1);
+          else
+            {
+              if( TAO_debug_level > 0 )
+                ACE_DEBUG ((LM_DEBUG,
+                            "(%N,%l) Filled up the Receiver QoS parameters\n"));
+            }
+
+        }
+
       ACE_QoS_Params qos_params;
-      FillQoSParams (qos_params, 
-		     0, 
-		     ace_qos);
+      FillQoSParams (qos_params,
+                     0,
+                     ace_qos);
     }
 
   ACE_QoS_Manager qos_manager =
     this->get_socket ()->qos_manager ();
-  
+
   int result = this->qos_session_->qos (this->get_socket (),
-					&qos_manager,
-					*ace_qos);
+                                        &qos_manager,
+                                        *ace_qos);
   if (result != 0)
     return result;
 
@@ -478,7 +478,7 @@ TAO_AV_UDP_QoS_Flow_Handler::change_qos (AVStreams::QoS new_qos)
 }
 
 int
-TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv, 
+TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
                                                const void *arg)
 {
   return TAO_AV_Flow_Handler::handle_timeout (tv,arg);
@@ -487,41 +487,41 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_timeout (const ACE_Time_Value &tv,
 int
 TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
 {
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address\n"));
+                "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address\n"));
 
-  ACE_INET_Addr *inet_addr = 
+  ACE_INET_Addr *inet_addr =
     ACE_dynamic_cast (ACE_INET_Addr*,address);
 
   this->peer_addr_ = *inet_addr;
 
-  TAO_AV_UDP_QoS_Transport *transport = 
+  TAO_AV_UDP_QoS_Transport *transport =
     ACE_dynamic_cast (TAO_AV_UDP_QoS_Transport*,this->transport_);
-  
+
   if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
     {
 
       TAO_AV_UDP_QoS_Session_Helper helper;
 
       this->qos_session_ = helper.open_qos_session (this,
-						    *inet_addr);
-      
+                                                    *inet_addr);
+
       if (this->qos_session_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "QoS Session Open Failed (%N|%l)\n"),
-			  -1);
-      
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "QoS Session Open Failed (%N|%l)\n"),
+                          -1);
+
       ACE_INET_Addr local_addr;
       this->get_socket ()->get_local_addr (local_addr);
 
       this->qos_session_->source_port (local_addr.get_port_number ());
 
       if (helper.activate_qos_handler (this->qos_session_,
-				       this) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Activating QoS Handler Failed (%N|%l)\n"),
-			  -1);
+                                       this) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Activating QoS Handler Failed (%N|%l)\n"),
+                          -1);
     }
   return transport->set_remote_address (*inet_addr);
 }
@@ -530,10 +530,10 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
 ACE_HANDLE
 TAO_AV_UDP_QoS_Flow_Handler::get_handle (void) const
 {
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n",
-		this->qos_sock_dgram_.get_handle ()));
+                "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::get_handle:%d\n",
+                this->qos_sock_dgram_.get_handle ()));
 
   return this->qos_sock_dgram_.get_handle () ;
 }
@@ -589,8 +589,8 @@ TAO_AV_UDP_QoS_Transport::get_peer_addr (void)
 }
 
 ssize_t
-TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk, 
-				ACE_Time_Value *)
+TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
+                                ACE_Time_Value *)
 {
   // For the most part this was copied from GIOP::send_request and
   // friends.
@@ -617,34 +617,34 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
           // the data into a buffer and call send_n(). In other cases
           // there may be some limits on the size of the iovec, there
           // we should set IOV_MAX to that limit.
-	  
-	  size_t bytes_sent = 0;
+
+          size_t bytes_sent = 0;
 
           if (iovcnt == IOV_MAX)
             {
               if (this->handler_->get_socket ()->send (iov,
-						       1,
-						       bytes_sent,
-						       0,
-						       this->handler_->qos_session ()->dest_addr (),
-						       0,
-						       0) == -1)
-		ACE_ERROR_RETURN ((LM_ERROR,
-				   "Error in dgram_mcast.send () (%N|%l)\n"),
-				  -1);
-	      else
-		if (TAO_debug_level > 0)
-		  ACE_DEBUG ((LM_DEBUG,
-			      "Using ACE_OS::sendto () : Bytes sent : %d",
-			      bytes_sent));
-	      
-	      if (n < 1)
+                                                       1,
+                                                       bytes_sent,
+                                                       0,
+                                                       this->handler_->qos_session ()->dest_addr (),
+                                                       0,
+                                                       0) == -1)
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "Error in dgram_mcast.send () (%N|%l)\n"),
+                                  -1);
+              else
+                if (TAO_debug_level > 0)
+                  ACE_DEBUG ((LM_DEBUG,
+                              "Using ACE_OS::sendto () : Bytes sent : %d",
+                              bytes_sent));
+
+              if (n < 1)
                 return n;
-	      
-	      nbytes += bytes_sent;
-	      iovcnt = 0;
-	    }
-	}
+
+              nbytes += bytes_sent;
+              iovcnt = 0;
+            }
+        }
     }
 
   size_t bytes_sent = 0;
@@ -653,21 +653,21 @@ TAO_AV_UDP_QoS_Transport::send (const ACE_Message_Block *mblk,
   if (iovcnt != 0)
     {
       if (this->handler_->get_socket ()->send (iov,
-					       1,
-					       bytes_sent,
-					       0,
-					       this->handler_->qos_session ()->dest_addr (),
-					       0,
-					       0) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Error in dgram_mcast.send ()\n"),
-			  -1);
+                                               1,
+                                               bytes_sent,
+                                               0,
+                                               this->handler_->qos_session ()->dest_addr (),
+                                               0,
+                                               0) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error in dgram_mcast.send ()\n"),
+                          -1);
       else
         if( TAO_debug_level > 0)
-	  ACE_DEBUG ((LM_DEBUG,
-		      "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d",
-		      bytes_sent));
-      
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d",
+                      bytes_sent));
+
       if (n < 1)
         return n;
 
@@ -684,36 +684,36 @@ TAO_AV_UDP_QoS_Transport::send (const char *buf,
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%N,%l) TAO_AV_UDP_QoS_Transport::send "));
+                "(%N,%l) TAO_AV_UDP_QoS_Transport::send "));
 
   char addr [BUFSIZ];
   this->peer_addr_.addr_to_string (addr,BUFSIZ);
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%N,%l) to %s\n",
-		addr));
+                "(%N,%l) to %s\n",
+                addr));
 
   return this->handler_->get_socket ()->send (buf,
-					      len,
-					      this->handler_->qos_session ()->dest_addr (),
-					      0,
-					      0,
-					      0);
+                                              len,
+                                              this->handler_->qos_session ()->dest_addr (),
+                                              0,
+                                              0,
+                                              0);
 }
 
 ssize_t
 TAO_AV_UDP_QoS_Transport::send (const iovec *iov,
-				int /*iovcnt*/,
-				ACE_Time_Value *)
+                                int /*iovcnt*/,
+                                ACE_Time_Value *)
 {
   size_t bytes_sent = 0;
   if (this->handler_->get_socket ()->send (iov,
-					   1,
-					   bytes_sent,
-					   0,
-					   this->handler_->qos_session ()->dest_addr (),
-					   0,
-					   0) == -1)
+                                           1,
+                                           bytes_sent,
+                                           0,
+                                           this->handler_->qos_session ()->dest_addr (),
+                                           0,
+                                           0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Error in dgram_mcast.send ()\n"),
                       -1);
@@ -722,10 +722,10 @@ TAO_AV_UDP_QoS_Transport::send (const iovec *iov,
     if( TAO_debug_level > 0)
        ACE_DEBUG ((LM_DEBUG,
                    "(%N,%l) Using ACE_OS::sendto () : Bytes sent : %d",
-		   bytes_sent));
+                   bytes_sent));
   }
 
- 
+
   return bytes_sent;
 }
 
@@ -775,20 +775,20 @@ int
 TAO_AV_UDP_QoS_Acceptor::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *handler)
 {
   int result = 0;
-  
+
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, 
-		"(%N,%l) Acceptor Svc Handler QOS ENABLED \n"));
+    ACE_DEBUG ((LM_DEBUG,
+                "(%N,%l) Acceptor Svc Handler QOS ENABLED \n"));
 
   TAO_AV_UDP_QoS_Session_Helper helper;
 
   result = helper.activate_qos_handler (handler->qos_session (),
-					handler);
+                                        handler);
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Error in registering the Decorator with the Reactor\n"),
-		      -1);
-  
+                       "Error in registering the Decorator with the Reactor\n"),
+                      -1);
+
   return result;
 }
 
@@ -801,9 +801,9 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint,
 {
   ACE_UNUSED_ARG (flow_comp);
 
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%N,%l) TAO_AV_UDP_QoS_Acceptor::open "));
+                "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open "));
 
   this->av_core_ = av_core;
   this->endpoint_ = endpoint;
@@ -818,10 +818,10 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint,
   char buf[BUFSIZ];
   inet_addr->addr_to_string (buf,
                              BUFSIZ);
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%N,%l) TAO_AV_UDP_QoS_Acceptor::open: %s",
-		buf));
+                "(%N,%l) TAO_AV_UDP_QoS_Acceptor::open: %s",
+                buf));
 
   int result = this->open_i (inet_addr);
 
@@ -847,7 +847,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
   this->flowname_ = entry->flowname ();
   char buf [BUFSIZ];
   ACE_OS::hostname (buf,
-		    BUFSIZ);
+                    BUFSIZ);
   ACE_CString addr (buf);
   addr += ":8000";
   ACE_INET_Addr *address;
@@ -856,10 +856,10 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
                   -1);
 
   address->addr_to_string (buf,
-			   BUFSIZ);
+                           BUFSIZ);
   ACE_DEBUG ((LM_DEBUG,
-	      "(%N,%l) ADDRESS IS %s\n",
-	      buf));
+              "(%N,%l) ADDRESS IS %s\n",
+              buf));
 
   int result = this->open_i (address);
   if (result < 0)
@@ -871,66 +871,66 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
 int
 TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   int result = 0;
-  
-  //  TAO_AV_Callback *callback = 0;  
+
+  //  TAO_AV_Callback *callback = 0;
   //   this->endpoint_->get_callback (this->flowname_.c_str (),
   //                                  callback);
   ACE_INET_Addr *local_addr;
 
   ACE_NEW_RETURN (local_addr,
-		  ACE_INET_Addr (*inet_addr),
-		  -1);
+                  ACE_INET_Addr (*inet_addr),
+                  -1);
 
   ACE_QoS_Params qos_params;
 
   ACE_QoS* ace_qos = 0;
 
-  FillQoSParams (qos_params, 
-		 0, 
-		 ace_qos);
+  FillQoSParams (qos_params,
+                 0,
+                 ace_qos);
+
 
-      
   TAO_AV_UDP_QoS_Flow_Handler* handler;
   ACE_NEW_RETURN (handler,
-		  TAO_AV_UDP_QoS_Flow_Handler,
-		  -1);
-  
-  
+                  TAO_AV_UDP_QoS_Flow_Handler,
+                  -1);
+
+
   TAO_AV_Flow_Handler *flow_handler = 0;
   flow_handler = handler;
-  
+
   handler->endpoint (this->endpoint_);
   handler->flowspec_entry (this->entry_);
   handler->av_core (this->av_core_);
 
   if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER)
     {
-      
+
       TAO_AV_UDP_QoS_Session_Helper helper;
-      
+
       int result = handler->get_socket ()->open (*inet_addr,
-						 qos_params,
-						 AF_INET,
-						 0,
-						 0,
-						 0,
-						 ACE_OVERLAPPED_SOCKET_FLAG 
-						 | ACE_FLAG_MULTIPOINT_C_LEAF 
-						 | ACE_FLAG_MULTIPOINT_D_LEAF,
-						 1);
-      
+                                                 qos_params,
+                                                 AF_INET,
+                                                 0,
+                                                 0,
+                                                 0,
+                                                 ACE_OVERLAPPED_SOCKET_FLAG
+                                                 | ACE_FLAG_MULTIPOINT_C_LEAF
+                                                 | ACE_FLAG_MULTIPOINT_D_LEAF,
+                                                 1);
+
       if (result < 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
+                          -1);
 
       result = handler->get_socket ()->get_local_addr (*local_addr);
       if (result < 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Error in getting Local Address (%N|%l)\n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error in getting Local Address (%N|%l)\n"),
+                          -1);
 
       // Create a destination address for the QoS session. The same
       // address should be used for the subscribe call later. A copy
@@ -938,89 +938,89 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
       // address.
       ACE_INET_Addr dest_addr;
       dest_addr.set  (local_addr->get_port_number (),
-		      local_addr->get_host_name ());
-      
+                      local_addr->get_host_name ());
+
       char dest_buf [BUFSIZ];
       dest_addr.addr_to_string (dest_buf,
-				BUFSIZ);
+                                BUFSIZ);
 
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "Session Address is %s\n",
-		    dest_buf));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "Session Address is %s\n",
+                    dest_buf));
+
       this->qos_session_ = helper.open_qos_session (handler,
-						    dest_addr);
+                                                    dest_addr);
 
       if (this->qos_session_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "QoS Session Open Failed (%N|%l)\n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "QoS Session Open Failed (%N|%l)\n"),
+                          -1);
 
       handler->qos_session (this->qos_session_);
 
       if (this->activate_svc_handler (handler) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Activate Svc Handler Failed (%N|%l)\n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Activate Svc Handler Failed (%N|%l)\n"),
+                          -1);
 
       AVStreams::QoS qos;
-      int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), 
-								qos);
-      
+      int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (),
+                                                                qos);
+
       if (qos_available == 0)
-	{
-
-	  ACE_Flow_Spec *ace_flow_spec = 0;
-	  ACE_NEW_RETURN (ace_flow_spec,
-			  ACE_Flow_Spec,
-			  -1);
-	  
-	  handler->translate (qos.QoSParams, 
-			      ace_flow_spec);
-
-	  if (helper.set_qos (*ace_flow_spec,
-			      handler) == -1)
-
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Set QoS Failed (%N|%l)\n"),
-			      -1);
-	}
+        {
+
+          ACE_Flow_Spec *ace_flow_spec = 0;
+          ACE_NEW_RETURN (ace_flow_spec,
+                          ACE_Flow_Spec,
+                          -1);
+
+          handler->translate (qos.QoSParams,
+                              ace_flow_spec);
+
+          if (helper.set_qos (*ace_flow_spec,
+                              handler) == -1)
+
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Set QoS Failed (%N|%l)\n"),
+                              -1);
+        }
     }
   else
     {
-      
+
       int result = handler->get_socket ()->open (*inet_addr,
-						 qos_params,
-						 AF_INET,
-						 0,
-						 0,
-						 0,
-						 ACE_OVERLAPPED_SOCKET_FLAG
-						 | ACE_FLAG_MULTIPOINT_C_LEAF
-						 | ACE_FLAG_MULTIPOINT_D_LEAF,
-						 1);
+                                                 qos_params,
+                                                 AF_INET,
+                                                 0,
+                                                 0,
+                                                 0,
+                                                 ACE_OVERLAPPED_SOCKET_FLAG
+                                                 | ACE_FLAG_MULTIPOINT_C_LEAF
+                                                 | ACE_FLAG_MULTIPOINT_D_LEAF,
+                                                 1);
 
       if (result < 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "TAO_AV_QOS_UDP_MCast_Acceptor data socket open failed (%N|%l)\n"),
+                          -1);
     }
-  
+
   TAO_AV_Protocol_Object *object =
     this->flow_protocol_factory_->make_protocol_object (this->entry_,
-							this->endpoint_,
-							flow_handler,
-							flow_handler->transport ());
+                                                        this->endpoint_,
+                                                        flow_handler,
+                                                        flow_handler->transport ());
   flow_handler->protocol_object (object);
-  
+
   AVStreams::Negotiator_ptr negotiator;
-  
+
   ACE_TRY_EX (negotiator)
     {
       CORBA::Any_ptr negotiator_any =
-	this->endpoint_->get_property_value ("Negotiator",
-					     ACE_TRY_ENV);
+        this->endpoint_->get_property_value ("Negotiator"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (negotiator);
 
       *negotiator_any >>= negotiator;
@@ -1029,34 +1029,34 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
   ACE_CATCHANY
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "(%N,%l) Negotiator Not Found \n"));
+                  "(%N,%l) Negotiator Not Found \n"));
     }
   ACE_ENDTRY;
-  
+
   this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler);
   this->entry_->protocol_object (object);
-  
+
   result = handler->get_socket ()->get_local_addr (*local_addr);
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_Dgram_Connector::open: get_local_addr failed\n"),result);
   local_addr->set (local_addr->get_port_number (),
-		   local_addr->get_host_name ());
+                   local_addr->get_host_name ());
 
   if (TAO_debug_level > 0)
     {
       char buf [BUFSIZ];
       local_addr->addr_to_string (buf,
-				  BUFSIZ);
+                                  BUFSIZ);
       ACE_DEBUG ((LM_DEBUG,
-		  "Local Address is %s\n",
-		  buf));
+                  "Local Address is %s\n",
+                  buf));
     }
 
   this->entry_->set_local_addr (local_addr);
   this->entry_->handler (flow_handler);
-  
+
   return 0;
-  
+
 }
 
 int
@@ -1080,11 +1080,11 @@ int
 TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
                                 TAO_AV_Core *av_core,
                                 TAO_AV_Flow_Protocol_Factory *factory)
-  
+
 {
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_AV_UDP_QoS_Connector::open "));
+                "TAO_AV_UDP_QoS_Connector::open "));
 
   this->endpoint_ = endpoint;
   this->av_core_ = av_core;
@@ -1094,7 +1094,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
 
 //  int
 //  TAO_AV_UDP_QoS_Connector::translate (CosPropertyService::Properties &qos_params,
-//  				     ACE_Flow_Spec *ace_flow_spec)
+//                                   ACE_Flow_Spec *ace_flow_spec)
 //  {
 //    for (unsigned int i = 0;
 //         i < qos_params.length ();
@@ -1107,7 +1107,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
 //            ace_flow_spec->service_type (type);
 //          }
 //        else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0)
-//          { 
+//          {
 //            CORBA::ULong tok_rate;
 //            qos_params [i].property_value >>= tok_rate;
 //            ace_flow_spec->token_rate (tok_rate);
@@ -1118,7 +1118,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
 //            qos_params [i].property_value >>= tok_buck_size;
 //            ace_flow_spec->token_bucket_size (tok_buck_size);
 //          }
-//        else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)   
+//        else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)
 //          {
 //            CORBA::ULong peak_bw;
 //            qos_params [i].property_value >>= peak_bw;
@@ -1138,7 +1138,7 @@ TAO_AV_UDP_QoS_Connector::open (TAO_Base_StreamEndPoint *endpoint,
 //          }
 
 //      }
-  
+
 //    return 0;
 //  }
 
@@ -1157,77 +1157,77 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
 
   ACE_INET_Addr *local_addr;
   ACE_NEW_RETURN (local_addr,
-		  ACE_INET_Addr ("0"),
-		  -1);
-  
+                  ACE_INET_Addr ("0"),
+                  -1);
+
 
   TAO_AV_Flow_Handler *flow_handler = 0;
-  
+
   TAO_AV_UDP_QoS_Flow_Handler *handler;
   ACE_NEW_RETURN (handler,
                   TAO_AV_UDP_QoS_Flow_Handler,
                   -1);
-    
+
   flow_handler = handler;
 
   handler->endpoint (this->endpoint_);
   handler->flowspec_entry (this->entry_);
   handler->av_core (this->av_core_);
-  
+
   ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,
                                                entry->address ());
 
   ACE_QoS_Params qos_params;
-  
+
   ACE_QoS* ace_qos = 0;
-  
-  FillQoSParams (qos_params, 
-		 0, 
-		 ace_qos);
-  
+
+  FillQoSParams (qos_params,
+                 0,
+                 ace_qos);
+
   result = handler->get_socket ()->open (*local_addr,
-					 qos_params,
-					 AF_INET,
-					 0,
-					 0,
-					 0,
-					 ACE_OVERLAPPED_SOCKET_FLAG 
-					 | ACE_FLAG_MULTIPOINT_C_LEAF 
-					 | ACE_FLAG_MULTIPOINT_D_LEAF,
-					 1);
+                                         qos_params,
+                                         AF_INET,
+                                         0,
+                                         0,
+                                         0,
+                                         ACE_OVERLAPPED_SOCKET_FLAG
+                                         | ACE_FLAG_MULTIPOINT_C_LEAF
+                                         | ACE_FLAG_MULTIPOINT_D_LEAF,
+                                         1);
 
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Data socket open failed (%N|%l)\n"),
-		      -1);
-  
+                       "Data socket open failed (%N|%l)\n"),
+                      -1);
+
   result = handler->get_socket ()->get_local_addr (*local_addr);
 
-  
+
   ACE_INET_Addr *session_addr = 0;
   if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_CONSUMER)
     {
       ACE_NEW_RETURN (session_addr,
-		      ACE_INET_Addr,
-		      -1);
-      
+                      ACE_INET_Addr,
+                      -1);
+
       session_addr->set (local_addr->get_port_number (),
-			 local_addr->get_host_name ());
-      
+                         local_addr->get_host_name ());
+
     }
-  else 
+  else
     {
       session_addr = inet_addr;
     }
-  
+
   char sess_buf [BUFSIZ];
   session_addr->addr_to_string (sess_buf,
-				BUFSIZ);
+                                BUFSIZ);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"Session Address is %s\n",
-		sess_buf));
+                "Session Address is %s\n",
+                sess_buf));
 
   // Create a destination address for the QoS session. The same
   // address should be used for the subscribe call later. A copy
@@ -1238,54 +1238,54 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
   TAO_AV_UDP_QoS_Session_Helper helper;
 
   this->qos_session_ = helper.open_qos_session (handler,
-						*session_addr);
+                                                *session_addr);
 
   if (this->qos_session_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "QoS Session Open Failed (%N|%l)\n"),
-		      -1);
+                       "QoS Session Open Failed (%N|%l)\n"),
+                      -1);
   else
     ACE_DEBUG ((LM_DEBUG,
                 "QoS session opened successfully\n"));
-  
+
   if (this->entry_->role () == TAO_FlowSpec_Entry::TAO_AV_PRODUCER)
     {
       this->qos_session_->source_port (local_addr->get_port_number ());
     }
 
   handler->qos_session (this->qos_session_);
-  
-  this->qos_manager_ = 
+
+  this->qos_manager_ =
     handler->get_socket ()->qos_manager ();
 
   AVStreams::QoS qos;
 
-  int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (), 
-							    qos);
+  int qos_available = this->endpoint_->qos ().get_flow_qos (this->flowname_.c_str (),
+                                                            qos);
   if (qos_available == 0)
     {
 
       ACE_Flow_Spec* ace_flow_spec;
       ACE_NEW_RETURN (ace_flow_spec,
-		      ACE_Flow_Spec,
-		      -1);
-      
-      handler->translate (qos.QoSParams, 
-			  ace_flow_spec);
-      
+                      ACE_Flow_Spec,
+                      -1);
+
+      handler->translate (qos.QoSParams,
+                          ace_flow_spec);
+
       if (helper.set_qos (*ace_flow_spec,
-			  handler) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Unable to set QoS (%N|%l)\n"),
-			  -1);
+                          handler) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unable to set QoS (%N|%l)\n"),
+                          -1);
       else
       {
         if( TAO_debug_level > 0)
-	    ACE_DEBUG ((LM_DEBUG,
-		    "(%N,%l) Setting QOS succeeds.\n"));
+            ACE_DEBUG ((LM_DEBUG,
+                    "(%N,%l) Setting QOS succeeds.\n"));
       }
     }
-  
+
   TAO_AV_Protocol_Object *object =
     this->flow_protocol_factory_->make_protocol_object (this->entry_,
                                                         this->endpoint_,
@@ -1297,50 +1297,50 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
   ACE_TRY_EX (negotiator)
     {
       CORBA::Any_ptr negotiator_any =
-	this->endpoint_->get_property_value ("Negotiator",
-					     ACE_TRY_ENV);
+        this->endpoint_->get_property_value ("Negotiator"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (negotiator);
-      
+
       *negotiator_any >>= negotiator;
       handler->negotiator (negotiator);
     }
   ACE_CATCHANY
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "Negotiator not found for flow %s\n",
-		  this->entry_->flowname ()));
+                  "Negotiator not found for flow %s\n",
+                  this->entry_->flowname ()));
     }
   ACE_ENDTRY;
-  
+
   flow_handler->protocol_object (object);
 
   this->endpoint_->set_flow_handler (this->flowname_.c_str (),flow_handler);
   this->entry_->protocol_object (object);
-  
+
   result = handler->get_socket ()->get_local_addr (*local_addr);
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Get local addr failed (%N|%l)\n"),
-		      result);
+                       "Get local addr failed (%N|%l)\n"),
+                      result);
 
   local_addr->set (local_addr->get_port_number (),
-		   local_addr->get_host_name ());
+                   local_addr->get_host_name ());
 
   if (TAO_debug_level > 0)
     {
-      char buf[BUFSIZ];  
+      char buf[BUFSIZ];
       local_addr->addr_to_string (buf,
-				  BUFSIZ);
-      
+                                  BUFSIZ);
+
       ACE_DEBUG ((LM_DEBUG,
-		  "Local Address is %s\n",
-		  buf));
+                  "Local Address is %s\n",
+                  buf));
     }
-  
+
   entry->set_local_addr (local_addr);
   entry->handler (flow_handler);
   transport = flow_handler->transport ();
-  
+
   // call activate svc handler.
   return this->activate_svc_handler (handler);
 }
@@ -1351,15 +1351,15 @@ TAO_AV_UDP_QoS_Connector::activate_svc_handler (TAO_AV_UDP_QoS_Flow_Handler *han
   int result = 0;
 
   TAO_AV_UDP_QoS_Session_Helper helper;
-  
+
   result = helper.activate_qos_handler (this->qos_session_,
-					handler);
+                                        handler);
 
   if (result == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "(%N,%l) Error in registering the Decorator with the Reactor\n"),
-		      -1);
-  
+                       "(%N,%l) Error in registering the Decorator with the Reactor\n"),
+                      -1);
+
   return result;
 }
 
@@ -1377,7 +1377,7 @@ TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n"));
+                "TAO_AV_UDP_QoS_Factory::TAO_AV_UDP_QoS_Factory\n"));
 }
 
 TAO_AV_UDP_QoS_Factory::~TAO_AV_UDP_QoS_Factory (void)
@@ -1389,8 +1389,8 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_AV_UDP_QoS_Factory::match_protocol\n"));
-  
+                "TAO_AV_UDP_QoS_Factory::match_protocol\n"));
+
   if (ACE_OS::strcasecmp (protocol_string,"QoS_UDP") == 0)
     return 1;
   return 0;
@@ -1399,9 +1399,9 @@ TAO_AV_UDP_QoS_Factory::match_protocol (const char *protocol_string)
 TAO_AV_Acceptor*
 TAO_AV_UDP_QoS_Factory::make_acceptor (void)
 {
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_AV_UDP_QoS_Factory::make_acceptor "));
+                "TAO_AV_UDP_QoS_Factory::make_acceptor "));
 
   TAO_AV_Acceptor *acceptor = 0;
   ACE_NEW_RETURN (acceptor,
@@ -1413,9 +1413,9 @@ TAO_AV_UDP_QoS_Factory::make_acceptor (void)
 TAO_AV_Connector*
 TAO_AV_UDP_QoS_Factory::make_connector (void)
 {
-  if (TAO_debug_level > 0) 
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_AV_UDP_QoS_Factory::make_connector "));
+                "TAO_AV_UDP_QoS_Factory::make_connector "));
 
   TAO_AV_Connector *connector = 0;
   ACE_NEW_RETURN (connector,
@@ -1439,7 +1439,7 @@ TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n"));
+                "TAO_AV_UDP_QoS_Flow_Factory::TAO_AV_UDP_QoS_Flow_Factory\n"));
 }
 
 TAO_AV_UDP_QoS_Flow_Factory::~TAO_AV_UDP_QoS_Flow_Factory (void)
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index 9d986f321ed..f81818b7a51 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -12,28 +12,28 @@ ACE_RCSID(orbsvcs, Channel_Clients_T, "$Id$")
 #endif /* __ACE_INLINE__ */
 
 template<class TARGET> void
-ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events,
-                                        CORBA::Environment &TAO_IN_ENV)
+ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events
+                                        TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  target_->push (events, TAO_IN_ENV);
+  target_->push (events TAO_ENV_ARG_PARAMETER);
 }
 
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (
-    CORBA::Environment &TAO_IN_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  target_->disconnect_push_consumer (TAO_IN_ENV);
+  target_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class TARGET> void
 ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
-    CORBA::Environment &TAO_IN_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  target_->disconnect_push_supplier (TAO_IN_ENV);
+  target_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* ACE_CHANNEL_CLIENTS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 2c5e0760dbd..7b88fccc846 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -41,14 +41,12 @@ public:
   ACE_PushConsumer_Adapter (TARGET *target);
   // Forwards all calls to <owner>.
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &env =
-                         TAO_default_environment ())
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC (( CORBA::SystemException));
   // Forwards to target_.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &env =
-                                             TAO_default_environment ())
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC (( CORBA::SystemException));
   // Forwards to target_.
 
@@ -73,8 +71,7 @@ public:
   ACE_PushSupplier_Adapter (TARGET *target);
   // Forwards all calls to <owner>.
 
-  virtual void disconnect_push_supplier (CORBA::Environment & env =
-                                             TAO_default_environment ())
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC (( CORBA::SystemException));
   // Forwards to target_.
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 8949a02b550..ea9dc033f6f 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -39,7 +39,7 @@ CC_Lock::~CC_Lock (void)
 }
 
 void
-CC_Lock::lock (CORBA::Environment &)
+CC_Lock::lock (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::lock\n"));
@@ -47,7 +47,7 @@ CC_Lock::lock (CORBA::Environment &)
 }
 
 CORBA::Boolean
-CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
+CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::try_lock. "));
@@ -82,7 +82,7 @@ CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV)
+CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::unlock\n"));
@@ -102,8 +102,8 @@ CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode,
-                      CORBA::Environment &ACE_TRY_ENV)
+CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode
+                      TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::change_mode\n"));
@@ -201,7 +201,7 @@ void CC_LockModeIterator::First (void)
   current_ = CosConcurrencyControl::intention_read;
 }
 
-void CC_LockModeIterator::Next (CORBA::Environment &ACE_TRY_ENV)
+void CC_LockModeIterator::Next (TAO_ENV_SINGLE_ARG_DECL)
 {
   switch (current_)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 8dcc9442005..dbc60939bbc 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -58,18 +58,18 @@ public:
   ~CC_Lock (void);
   // Deletes the lock
 
-  void lock (CORBA::Environment &env);
+  void lock (TAO_ENV_SINGLE_ARG_DECL);
   // Acquires this lock. Blocks until lock is obtained
 
-  CORBA::Boolean try_lock (CORBA::Environment &env);
+  CORBA::Boolean try_lock (TAO_ENV_SINGLE_ARG_DECL);
   // Tries to acquire this lock. If it is not possible to acquire the
   // lock, false is returned
 
-  void unlock (CORBA::Environment &env);
+  void unlock (TAO_ENV_SINGLE_ARG_DECL);
   // Releases this lock.
 
-  void change_mode (CosConcurrencyControl::lock_mode new_mode,
-                   CORBA::Environment &env);
+  void change_mode (CosConcurrencyControl::lock_mode new_mode
+                   TAO_ENV_ARG_DECL);
   // Changes the mode of this lock.
 
   void set_mode (CosConcurrencyControl::lock_mode mode);
@@ -125,7 +125,7 @@ public:
   void First(void);
   // Reset the iterator to the first element
 
-  void Next(CORBA::Environment &_env);
+  void Next(TAO_ENV_SINGLE_ARG_DECL);
   // Advance the iterator to the next element
   // Throws exception if out of range
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 1fd2e3cd945..f3afff015db 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->Init (ACE_TRY_ENV);
+      this->Init (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -42,7 +42,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
 {
   ACE_TRY_NEW_ENV
     {
-      this->Init (ACE_TRY_ENV);
+      this->Init (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -56,7 +56,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
 // Initialization.
 
 void
-CC_LockSet::Init (CORBA::Environment &ACE_TRY_ENV)
+CC_LockSet::Init (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Set the mode of the statically allocated locks
   lock_[CC_IR] = 0;
@@ -92,8 +92,8 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr)
 // Locks the lock in the desired mode. Blocks until success.
 
 void
-CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
-                  CORBA::Environment &ACE_TRY_ENV)
+CC_LockSet::lock (CosConcurrencyControl::lock_mode mode
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n"));
@@ -113,8 +113,8 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
 // Tries to lock. If it is not possible false is returned.
 
 CORBA::Boolean
-CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode,
-                      CORBA::Environment &)
+CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockModeEnum lm = lmconvert (mode);
@@ -154,8 +154,8 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode)
 // Unlock the lock
 
 void
-CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
-                    CORBA::Environment &ACE_TRY_ENV)
+CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -199,8 +199,8 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
 
 void
 CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
-                         CosConcurrencyControl::lock_mode new_mode,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CosConcurrencyControl::lock_mode new_mode
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -213,7 +213,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
     ACE_THROW (CosConcurrencyControl::LockNotHeld());
   else if (this->change_mode_i (lm_held, lm_new)==1)
     {
-      this->unlock (held_mode, ACE_TRY_ENV);
+      this->unlock (held_mode TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (semaphore_.acquire () == -1)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 6264be36c1d..efd63a16c41 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -86,26 +86,26 @@ public:
   // Destructor.
 
   // = CosConcurrencyControl methods
-  virtual void lock (CosConcurrencyControl::lock_mode mode,
-                     CORBA::Environment &env)
+  virtual void lock (CosConcurrencyControl::lock_mode mode
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Acquires this lock. Blocks until lock is obtained
 
-  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode,
-                                   CORBA::Environment &env)
+  virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Tries to acquire this lock. If it is not possible to acquire the
   // lock, false is returned
 
-  virtual void unlock (CosConcurrencyControl::lock_mode mode,
-                       CORBA::Environment &env)
+  virtual void unlock (CosConcurrencyControl::lock_mode mode
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
   // Releases this lock.
 
   virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
-                            CosConcurrencyControl::lock_mode new_mode,
-                            CORBA::Environment &env)
+                            CosConcurrencyControl::lock_mode new_mode
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
   // Changes the mode of this lock.
@@ -119,7 +119,7 @@ private:
   // Converts the CORBA specification's lock mode to the internal
   // representation
 
-  void Init (CORBA::Environment &_env);
+  void Init (TAO_ENV_SINGLE_ARG_DECL);
   // Initiatlizes the lock set array and acquires the initial
   // semaphore.
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index e91e8fbc399..87bcc3c04f6 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -29,7 +29,7 @@ CC_LockSetFactory::~CC_LockSetFactory (void)
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
+CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
@@ -41,25 +41,22 @@ CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
                     CORBA::NO_MEMORY());
   ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
-  return ls->_this (ACE_TRY_ENV);
+  return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which,
-                                   CORBA::Environment &ACE_TRY_ENV)
+CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
 
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
 
-  // @@ I commented out the following statement becuase it doesn't make any
-  //    sense at all.    -- Nanbor
-  //  TAO_IN_ENV.exception (new CORBA::NO_MEMORY ());
   ACE_NEW_THROW_EX (ls,
                     CC_LockSet (which),
                     CORBA::NO_MEMORY());
   ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
-  return ls->_this (ACE_TRY_ENV);
+  return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index ad2e6e6b2a5..538f11e3a63 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -46,12 +46,12 @@ public:
   // Destructor.
 
   virtual CosConcurrencyControl::LockSet_ptr create (
-      CORBA::Environment &env)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosConcurrencyControl::LockSet_ptr create_related (
-      CosConcurrencyControl::LockSet_ptr which,
-      CORBA::Environment &env)
+      CosConcurrencyControl::LockSet_ptr which
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 25ac44f4314..266ea7e4c3c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -29,7 +29,7 @@ TAO_Concurrency_Server::TAO_Concurrency_Server (void)
 // Constructor which takes an ORB and POA.
 
 TAO_Concurrency_Server::TAO_Concurrency_Server (CORBA::ORB_var &orb,
-						PortableServer::POA_var &poa)
+                                                PortableServer::POA_var &poa)
 {
   this->init (orb, poa);
 }
@@ -39,7 +39,7 @@ TAO_Concurrency_Server::TAO_Concurrency_Server (CORBA::ORB_var &orb,
 
 int
 TAO_Concurrency_Server::init (CORBA::ORB_var &orb,
-			      PortableServer::POA_var &poa)
+                              PortableServer::POA_var &poa)
 {
   ACE_TRY_NEW_ENV
     {
@@ -49,24 +49,24 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb,
       //      ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-	PortableServer::string_to_ObjectId ("ConcurrencyService");
+        PortableServer::string_to_ObjectId ("ConcurrencyService");
 
       poa->activate_object_with_id (id.in (),
-                                    &lock_set_factory_,
-                                    ACE_TRY_ENV);
+                                    &lock_set_factory_
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
       CORBA::Object_var obj =
-	poa->id_to_reference (id.in (),
-                              ACE_TRY_ENV);
+        poa->id_to_reference (id.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-	orb->object_to_string (obj.in (),
-			       ACE_TRY_ENV);
+        orb->object_to_string (obj.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index da7dc206cb2..164716520b0 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -32,90 +32,90 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void)
 }
 
 void
-TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event
+                             TAO_ENV_ARG_DECL)
 {
   TAO_CEC_Propagate_Event_Push push_worker (event);
 
-  this->push_admin_.for_each (&push_worker,
-                              ACE_TRY_ENV);
+  this->push_admin_.for_each (&push_worker
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_CEC_Propagate_Event_Pull pull_worker (event);
 
-  this->pull_admin_.for_each (&pull_worker,
-                              ACE_TRY_ENV);
+  this->pull_admin_.for_each (&pull_worker
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier
+                                  TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.connected (supplier, ACE_TRY_ENV);
+  this->push_admin_.connected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier
+                                    TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.reconnected (supplier, ACE_TRY_ENV);
+  this->push_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier
+                                     TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.disconnected (supplier, ACE_TRY_ENV);
+  this->push_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier
+                                  TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.connected (supplier, ACE_TRY_ENV);
+  this->pull_admin_.connected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier
+                                   TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.reconnected (supplier, ACE_TRY_ENV);
+  this->pull_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier
+                                    TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.disconnected (supplier, ACE_TRY_ENV);
+  this->pull_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ConsumerAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->push_admin_.shutdown (ACE_TRY_ENV);
+  this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->pull_admin_.shutdown (ACE_TRY_ENV);
+  this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->push_admin_.obtain (ACE_TRY_ENV);
+  return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_pull_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ConsumerAdmin::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->pull_admin_.obtain (ACE_TRY_ENV);
+  return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ConsumerAdmin::_default_POA (CORBA::Environment&)
+TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -123,19 +123,19 @@ TAO_CEC_ConsumerAdmin::_default_POA (CORBA::Environment&)
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier
+                                    TAO_ENV_ARG_DECL)
 {
-  supplier->push (this->event_, ACE_TRY_ENV);
+  supplier->push (this->event_ TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 void
-TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier
+                                    TAO_ENV_ARG_DECL)
 {
-  supplier->push (this->event_, ACE_TRY_ENV);
+  supplier->push (this->event_ TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 7f7204e24cc..b980088789a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -57,44 +57,44 @@ public:
   virtual ~TAO_CEC_ConsumerAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker,
-                 CORBA::Environment &ACE_TRY_ENV);
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
+                 TAO_ENV_ARG_DECL);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
+                 TAO_ENV_ARG_DECL);
 
   /// Push the event to all the consumers
-  void push (const CORBA::Any &event,
-             CORBA::Environment &ACE_TRY_ENV);
+  void push (const CORBA::Any &event
+             TAO_ENV_ARG_DECL);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_CEC_ProxyPullSupplier*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPullSupplier*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPullSupplier*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPullSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPullSupplier*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPullSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (CORBA::Environment&);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (CORBA::Environment &)
+      obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-      obtain_pull_supplier (CORBA::Environment &)
+      obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The Event Channel we belong to
@@ -118,8 +118,8 @@ class TAO_CEC_Propagate_Event_Push : public TAO_ESF_Worker<TAO_CEC_ProxyPushSupp
 public:
   TAO_CEC_Propagate_Event_Push (const CORBA::Any& event);
 
-  void work (TAO_CEC_ProxyPushSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
+  void work (TAO_CEC_ProxyPushSupplier *supplier
+             TAO_ENV_ARG_DECL);
 
 private:
   /// The event
@@ -133,8 +133,8 @@ class TAO_CEC_Propagate_Event_Pull : public TAO_ESF_Worker<TAO_CEC_ProxyPullSupp
 public:
   TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event);
 
-  void work (TAO_CEC_ProxyPullSupplier *supplier,
-             CORBA::Environment &ACE_TRY_ENV);
+  void work (TAO_CEC_ProxyPullSupplier *supplier
+             TAO_ENV_ARG_DECL);
 
 private:
   /// The event
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
index ea68daf0d87..8db0065dc5b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
@@ -2,18 +2,18 @@
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
+              TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.for_each (worker, ACE_TRY_ENV);
+  this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
+              TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.for_each (worker, ACE_TRY_ENV);
+  this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 3be084955b5..4bf1072dd1d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -29,21 +29,21 @@ TAO_CEC_ConsumerControl::shutdown (void)
 }
 
 void
-TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *,
-                                             CORBA::Environment &)
+TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *
+                                             TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *,
-                                             CORBA::Environment &)
+TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *
+                                             TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *,
-                                           CORBA::SystemException &,
-                                           CORBA::Environment &)
+                                           CORBA::SystemException &
+                                           TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index 2fd875e855f..9b84bca123e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -58,21 +58,21 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy,
-                                   CORBA::Environment &);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
 
   /**
    * Invoked by helper classes when they detect that a consumer no
    * longer exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy,
-                                   CORBA::Environment &);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &,
-                                 CORBA::Environment &);
+                                 CORBA::SystemException &
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index de7dd113807..7c343706f36 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -31,16 +31,16 @@ TAO_CEC_Reactive_Dispatching::shutdown (void)
 
 void
 TAO_CEC_Reactive_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
-                                    const CORBA::Any& event,
-                                    CORBA::Environment& ACE_TRY_ENV)
+                                    const CORBA::Any& event
+                                    TAO_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (event, ACE_TRY_ENV);
+  proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_Reactive_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                           CORBA::Any& event,
-                                           CORBA::Environment& ACE_TRY_ENV)
+                                           CORBA::Any& event
+                                           TAO_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (event, ACE_TRY_ENV);
+  proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 9b33ea50605..9c6873bb59c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -53,11 +53,11 @@ public:
 
   /// The consumer represented by <proxy> should receive <event>.
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     const CORBA::Any &event,
-                     CORBA::Environment &env = TAO_default_environment ()) = 0;
+                     const CORBA::Any &event
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                            CORBA::Any &event,
-                            CORBA::Environment &env = TAO_default_environment ()) = 0;
+                            CORBA::Any &event
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 };
 
 // ****************************************************************
@@ -81,11 +81,11 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     const CORBA::Any &event,
-                     CORBA::Environment &env = TAO_default_environment ());
+                     const CORBA::Any &event
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
-                            CORBA::Any &event,
-                            CORBA::Environment &env = TAO_default_environment ());
+                            CORBA::Any &event
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 9f8324e6d51..a2fd07cb36e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -33,7 +33,7 @@ TAO_CEC_Dispatching_Task::svc (void)
               continue;
             }
 
-          int result = command->execute (ACE_TRY_ENV);
+          int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Message_Block::release (mb);
@@ -53,8 +53,8 @@ TAO_CEC_Dispatching_Task::svc (void)
 
 void
 TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
-                                CORBA::Any& event,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Any& event
+                                TAO_ENV_ARG_DECL)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -82,7 +82,7 @@ TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void)
 // ****************************************************************
 
 int
-TAO_CEC_Shutdown_Task_Command::execute (CORBA::Environment&)
+TAO_CEC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return -1;
 }
@@ -95,9 +95,9 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void)
 }
 
 int
-TAO_CEC_Push_Command::execute (CORBA::Environment& ACE_TRY_ENV)
+TAO_CEC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->proxy_->push_to_consumer (this->event_, ACE_TRY_ENV);
+  this->proxy_->push_to_consumer (this->event_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 05ea97d26c0..85e81f2a5c8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -41,8 +41,8 @@ public:
   virtual int svc (void);
 
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
-                     CORBA::Any& event,
-                     CORBA::Environment &env);
+                     CORBA::Any& event
+                     TAO_ENV_ARG_DECL);
 
 private:
   /// An per-task allocator
@@ -68,7 +68,7 @@ public:
   virtual ~TAO_CEC_Dispatch_Command (void);
 
   /// Command callback
-  virtual int execute (CORBA::Environment&) = 0;
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
 };
 
 // ****************************************************************
@@ -80,7 +80,7 @@ public:
   TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (CORBA::Environment&);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 };
 
 // ****************************************************************
@@ -98,7 +98,7 @@ public:
   virtual ~TAO_CEC_Push_Command (void);
 
   /// Command callback
-  virtual int execute (CORBA::Environment&);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index d229644fa99..825280e394f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -117,11 +117,11 @@ public:
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (CORBA::Environment &env = TAO_default_environment ());
+  virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (CORBA::Environment &env = TAO_default_environment ());
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching (void) const;
@@ -182,33 +182,33 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPushConsumer*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_CEC_ProxyPullConsumer*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPullConsumer*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_CEC_ProxyPushConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPushConsumer*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPushConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPullConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPullConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_CEC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPushSupplier*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_CEC_ProxyPullSupplier*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPullSupplier*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPullSupplier*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_CEC_ProxyPushSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPushSupplier*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPushSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPullSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPullSupplier*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPullSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
@@ -232,17 +232,17 @@ public:
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (env);
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (CORBA::Environment& env)
+      for_consumers (TAO_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this (env);
   virtual CosEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (CORBA::Environment& env)
+      for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Commit suicide.
-  virtual void destroy (CORBA::Environment &env)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index c912a460477..5a4f7dedcbe 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -38,16 +38,16 @@ TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void)
 int
 TAO_CEC_Event_Loader::init (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       this->orb_=
-        CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        this->create_object (this->orb_.in (), argc, argv, ACE_TRY_ENV);
+        this->create_object (this->orb_.in (), argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -62,8 +62,8 @@ TAO_CEC_Event_Loader::init (int argc, char *argv[])
 
 CORBA::Object_ptr
 TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
-                                     int argc, char *argv[],
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     int argc, char *argv[]
+                                     TAO_ENV_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -125,15 +125,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // POA initialization and activation ...
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -151,17 +151,17 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                                  this->factory_,
                                                  this->terminate_flag_);
 
-      this->ec_impl_->activate (ACE_TRY_ENV);
+      this->ec_impl_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        this->ec_impl_->_this (ACE_TRY_ENV);
+        this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file != 0)
         {
           CORBA::String_var ior =
-            orb->object_to_string (event_channel.in (), ACE_TRY_ENV);
+            orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           FILE *file = ACE_OS::fopen (ior_file, "w");
           ACE_OS::fprintf (file, "%s\n", ior.in ());
@@ -175,13 +175,13 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
       if (this->bind_to_naming_service_)
         {
           CORBA::Object_var obj =
-            orb->resolve_initial_references ("NameService",
-                                             ACE_TRY_ENV);
+            orb->resolve_initial_references ("NameService"
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->naming_context_ =
-            CosNaming::NamingContext::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
+            CosNaming::NamingContext::_narrow (obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->channel_name_.length (1);
@@ -190,15 +190,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
           if (use_rebind)
             {
               this->naming_context_->rebind (this->channel_name_,
-                                      event_channel.in (),
-                                      ACE_TRY_ENV);
+                                      event_channel.in ()
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               this->naming_context_->bind (this->channel_name_,
-                                    event_channel.in (),
-                                    ACE_TRY_ENV);
+                                    event_channel.in ()
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -219,30 +219,30 @@ TAO_CEC_Event_Loader::fini (void)
   //   + Since it was activated with _this() you have to do the
   //   canonical:
   //     get_object_id
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Release the resources of the Event Channel
-      this->ec_impl_->destroy (ACE_TRY_ENV);
+      this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivate the EC
       PortableServer::POA_var poa =
-        this->ec_impl_->_default_POA (ACE_TRY_ENV);
+        this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this->ec_impl_, ACE_TRY_ENV);
+        poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Unbind the Naming Service
       if (this->bind_to_naming_service_)
         {
-          this->naming_context_->unbind (this->channel_name_,
-                                         ACE_TRY_ENV);
+          this->naming_context_->unbind (this->channel_name_
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index d2197cf9a15..af490dc459f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -48,9 +48,8 @@ public:
    * @name Derived from TAO_Object_Loader
    */
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                   int argc, char *argv[],
-                                   CORBA::Environment
-                                   &ACE_TRY_ENV)
+                                   int argc, char *argv[]
+                                   TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 6a96e0dbcad..6cbad8bdcd8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -62,21 +62,21 @@ TAO_CEC_MT_Dispatching::shutdown (void)
 
 void
 TAO_CEC_MT_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
-                              const CORBA::Any& event,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              const CORBA::Any& event
+                              TAO_ENV_ARG_DECL)
 {
   CORBA::Any event_copy = event;
-  this->push_nocopy (proxy, event_copy, ACE_TRY_ENV);
+  this->push_nocopy (proxy, event_copy TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_MT_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                                     CORBA::Any& event,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Any& event
+                                     TAO_ENV_ARG_DECL)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, event, ACE_TRY_ENV);
+  this->task_.push (proxy, event TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 4e82f04f18a..22b00e1c42e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -47,11 +47,11 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier* proxy,
-                     const CORBA::Any & event,
-                     CORBA::Environment& env);
+                     const CORBA::Any & event
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
-                            CORBA::Any& event,
-                            CORBA::Environment& env);
+                            CORBA::Any& event
+                            TAO_ENV_ARG_DECL);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 07472f4c717..49022892370 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -32,13 +32,13 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullConsumer_var result;
   ACE_TRY
     {
-      result = this->_this (ACE_TRY_ENV);
+      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -50,18 +50,18 @@ TAO_CEC_ProxyPullConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -81,8 +81,8 @@ TAO_CEC_ProxyPullConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Any*
 TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
-    CORBA::Boolean_out has_event,
-    CORBA::Environment& ACE_TRY_ENV)
+    CORBA::Boolean_out has_event
+    TAO_ENV_ARG_DECL)
 {
   has_event = 0;
   CosEventComm::PullSupplier_var supplier;
@@ -106,7 +106,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
   CORBA::Any_var any;
   ACE_TRY
     {
-      any = supplier->try_pull (has_event, ACE_TRY_ENV);
+      any = supplier->try_pull (has_event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
@@ -114,7 +114,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
       TAO_CEC_SupplierControl *control =
         this->event_channel_->supplier_control ();
 
-      control->supplier_not_exist (this, ACE_TRY_ENV);
+      control->supplier_not_exist (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -123,8 +123,8 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
         this->event_channel_->supplier_control ();
 
       control->system_exception (this,
-                                 sysex,
-                                 ACE_TRY_ENV);
+                                 sysex
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -137,7 +137,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
 
 CORBA::Any*
 TAO_CEC_ProxyPullConsumer::pull_from_supplier (
-    CORBA::Environment& ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
 {
   CosEventComm::PullSupplier_var supplier;
   {
@@ -160,7 +160,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
   CORBA::Any_var any;
   ACE_TRY
     {
-      any = supplier->pull (ACE_TRY_ENV);
+      any = supplier->pull (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -174,8 +174,8 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
 
 CORBA::Boolean
 TAO_CEC_ProxyPullConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Boolean_out disconnected
+      TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -191,14 +191,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->supplier_->_non_existent (ACE_TRY_ENV);
+  return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosEventComm::PullSupplier_var supplier;
 
@@ -212,7 +212,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
     supplier = this->supplier_._retn ();
   }
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -220,7 +220,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      supplier->disconnect_pull_supplier (ACE_TRY_ENV);
+      supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -262,8 +262,8 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
-      CosEventComm::PullSupplier_ptr pull_supplier,
-      CORBA::Environment &ACE_TRY_ENV)
+      CosEventComm::PullSupplier_ptr pull_supplier
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -298,7 +298,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->disconnected (this, ACE_TRY_ENV);
+          this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -311,12 +311,12 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this, ACE_TRY_ENV);
+  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullSupplier_var supplier;
@@ -337,14 +337,14 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
+  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
       ACE_TRY
         {
-          supplier->disconnect_pull_supplier (ACE_TRY_ENV);
+          supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -357,19 +357,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullConsumer::_default_POA (CORBA::Environment&)
+TAO_CEC_ProxyPullConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_add_ref (CORBA::Environment &)
+TAO_CEC_ProxyPullConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_remove_ref (CORBA::Environment &)
+TAO_CEC_ProxyPullConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 900457b0854..10c22bd458e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -53,10 +53,10 @@ public:
   virtual ~TAO_CEC_ProxyPullConsumer (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no supplier is connected...
@@ -67,20 +67,20 @@ public:
   CosEventComm::PullSupplier_ptr supplier (void) const;
 
   /// Pulls from the supplier, verifies that it is connected.
-  CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event,
-                                      CORBA::Environment &env);
-  CORBA::Any* pull_from_supplier (CORBA::Environment &env);
+  CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event
+                                      TAO_ENV_ARG_DECL);
+  CORBA::Any* pull_from_supplier (TAO_ENV_SINGLE_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected,
-                                        CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
+                                        TAO_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (CORBA::Environment&);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -88,19 +88,17 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPullConsumer methods...
   virtual void connect_pull_supplier (
-                CosEventComm::PullSupplier_ptr pull_supplier,
-                CORBA::Environment &)
+                CosEventComm::PullSupplier_ptr pull_supplier
+                TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_pull_consumer (CORBA::Environment &)
+  virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 31f687d9ed8..7f0c235a487 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -31,13 +31,13 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_ProxyPullSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullSupplier_var result;
   ACE_TRY
     {
-      result = this->_this (ACE_TRY_ENV);
+      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -49,18 +49,18 @@ TAO_CEC_ProxyPullSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -74,7 +74,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -90,7 +90,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
     consumer = this->consumer_._retn ();
   }
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -98,7 +98,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      consumer->disconnect_pull_consumer (ACE_TRY_ENV);
+      consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -111,8 +111,8 @@ TAO_CEC_ProxyPullSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Boolean
 TAO_CEC_ProxyPullSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Boolean_out disconnected
+      TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -132,15 +132,15 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->consumer_->_non_existent (ACE_TRY_ENV);
+  return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event,
-                                 CORBA::Environment &)
+TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event
+                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (this->is_connected () == 0)
     return;
@@ -154,7 +154,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event,
 }
 
 CORBA::Any *
-TAO_CEC_ProxyPullSupplier::pull (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullSupplier::pull (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventComm::Disconnected))
 {
@@ -175,8 +175,8 @@ TAO_CEC_ProxyPullSupplier::pull (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any *
-TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event
+                                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   has_event = 0;
@@ -231,8 +231,8 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
-      CosEventComm::PullConsumer_ptr pull_consumer,
-      CORBA::Environment &ACE_TRY_ENV)
+      CosEventComm::PullConsumer_ptr pull_consumer
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -264,7 +264,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this, ACE_TRY_ENV);
+          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
         return;
@@ -276,12 +276,12 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this, ACE_TRY_ENV);
+  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullConsumer_var consumer;
@@ -302,7 +302,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
+  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -312,7 +312,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
     {
       ACE_TRY
         {
-          consumer->disconnect_pull_consumer (ACE_TRY_ENV);
+          consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -327,19 +327,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullSupplier::_default_POA (CORBA::Environment&)
+TAO_CEC_ProxyPullSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_add_ref (CORBA::Environment &)
+TAO_CEC_ProxyPullSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_remove_ref (CORBA::Environment &)
+TAO_CEC_ProxyPullSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 5526ee449a7..a602d56a722 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -56,10 +56,10 @@ public:
   virtual ~TAO_CEC_ProxyPullSupplier (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no consumer is connected...
@@ -74,32 +74,32 @@ public:
   CosEventComm::PullConsumer_ptr consumer (void) const;
 
   /// The event channel is shutting down
-  virtual void shutdown (CORBA::Environment &env);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected,
-                                        CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
+                                        TAO_ENV_ARG_DECL);
 
   /// Push an event into the queue.
-  void push (const CORBA::Any &event,
-             CORBA::Environment &ACE_TRY_ENV);
+  void push (const CORBA::Any &event
+             TAO_ENV_ARG_DECL);
 
   // = The CosEventChannelAdmin::ProxyPullSupplier methods...
   virtual void connect_pull_consumer (
-                CosEventComm::PullConsumer_ptr pull_consumer,
-                CORBA::Environment &)
+                CosEventComm::PullConsumer_ptr pull_consumer
+                TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual CORBA::Any * pull (CORBA::Environment &)
+  virtual CORBA::Any * pull (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event,
-                                 CORBA::Environment &)
+  virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event
+                                 TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (CORBA::Environment &)
+  virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -107,9 +107,9 @@ public:
   CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV);
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index 326175dc817..fde22699136 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -32,13 +32,13 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var result;
   ACE_TRY
     {
-      result = this->_this (ACE_TRY_ENV);
+      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -50,18 +50,18 @@ TAO_CEC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_CEC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -76,8 +76,8 @@ TAO_CEC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Boolean_out disconnected
+      TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -97,14 +97,14 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->supplier_->_non_existent (ACE_TRY_ENV);
+  return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosEventComm::PushSupplier_var supplier;
 
@@ -119,7 +119,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
     this->connected_ = 0;
   }
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -127,7 +127,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      supplier->disconnect_push_supplier (ACE_TRY_ENV);
+      supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -170,8 +170,8 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPushConsumer::connect_push_supplier (
-      CosEventComm::PushSupplier_ptr push_supplier,
-      CORBA::Environment &ACE_TRY_ENV)
+      CosEventComm::PushSupplier_ptr push_supplier
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -202,7 +202,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->disconnected (this, ACE_TRY_ENV);
+          this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -216,12 +216,12 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this, ACE_TRY_ENV);
+  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -231,14 +231,14 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event,
   if (!ace_mon.locked ())
     return;
 
-  this->event_channel_->consumer_admin ()->push (event,
-                                                 ACE_TRY_ENV);
+  this->event_channel_->consumer_admin ()->push (event
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
@@ -259,7 +259,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
+  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -269,7 +269,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
     {
       ACE_TRY
         {
-          supplier->disconnect_push_supplier (ACE_TRY_ENV);
+          supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -282,19 +282,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushConsumer::_default_POA (CORBA::Environment&)
+TAO_CEC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_add_ref (CORBA::Environment &)
+TAO_CEC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_remove_ref (CORBA::Environment &)
+TAO_CEC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 8881c55b3bf..433c5f71dee 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -53,10 +53,10 @@ public:
   virtual ~TAO_CEC_ProxyPushConsumer (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no supplier is connected...
@@ -71,11 +71,11 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected,
-                                        CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
+                                        TAO_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (CORBA::Environment&);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -83,22 +83,20 @@ public:
 
   // = The CosEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
-                CosEventComm::PushSupplier_ptr push_supplier,
-                CORBA::Environment &)
+                CosEventComm::PushSupplier_ptr push_supplier
+                TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual void push (const CORBA::Any& event,
-                     CORBA::Environment &)
+  virtual void push (const CORBA::Any& event
+                     TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index d0d710ed04c..e6b129f6bb3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -32,13 +32,13 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var result;
   ACE_TRY
     {
-      result = this->_this (ACE_TRY_ENV);
+      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -50,18 +50,18 @@ TAO_CEC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -75,7 +75,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -91,7 +91,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
     consumer = this->consumer_._retn ();
   }
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -99,7 +99,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      consumer->disconnect_push_consumer (ACE_TRY_ENV);
+      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -113,8 +113,8 @@ TAO_CEC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
 typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSupplier> Destroy_Guard;
 
 void
-TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
+                                 TAO_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -133,16 +133,16 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event,
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push (this,
-                                                  event,
-                                                  ACE_TRY_ENV);
+                                                  event
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   }
 }
 
 void
-TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
+                                        TAO_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -161,8 +161,8 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event,
 
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push_nocopy (this,
-                                                         event,
-                                                         ACE_TRY_ENV);
+                                                         event
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   }
@@ -199,8 +199,8 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void)
 
 void
 TAO_CEC_ProxyPushSupplier::connect_push_consumer (
-      CosEventComm::PushConsumer_ptr push_consumer,
-      CORBA::Environment &ACE_TRY_ENV)
+      CosEventComm::PushConsumer_ptr push_consumer
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError))
@@ -236,7 +236,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this, ACE_TRY_ENV);
+          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
         return;
@@ -247,12 +247,12 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this, ACE_TRY_ENV);
+  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushConsumer_var consumer;
@@ -273,14 +273,14 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
+  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
       ACE_TRY
         {
-          consumer->disconnect_push_consumer (ACE_TRY_ENV);
+          consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -295,8 +295,8 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 }
 
 void
-TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event,
-                                             CORBA::Environment& ACE_TRY_ENV)
+TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
+                                             TAO_ENV_ARG_DECL)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -315,7 +315,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event,
 
   ACE_TRY
     {
-      consumer->push (event, ACE_TRY_ENV);
+      consumer->push (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -323,7 +323,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event,
       TAO_CEC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this, ACE_TRY_ENV);
+      control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -332,8 +332,8 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event,
         this->event_channel_->consumer_control ();
 
       control->system_exception (this,
-                                 sysex,
-                                 ACE_TRY_ENV);
+                                 sysex
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -345,8 +345,8 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event,
 
 void
 TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
-    const CORBA::Any& event,
-    CORBA::Environment& ACE_TRY_ENV)
+    const CORBA::Any& event
+    TAO_ENV_ARG_DECL)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -360,7 +360,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
 
   ACE_TRY
     {
-      consumer->push (event, ACE_TRY_ENV);
+      consumer->push (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -368,7 +368,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
       TAO_CEC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this, ACE_TRY_ENV);
+      control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -377,8 +377,8 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
         this->event_channel_->consumer_control ();
 
       control->system_exception (this,
-                                 sysex,
-                                 ACE_TRY_ENV);
+                                 sysex
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -390,8 +390,8 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
 
 CORBA::Boolean
 TAO_CEC_ProxyPushSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Boolean_out disconnected
+      TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -407,26 +407,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->consumer_->_non_existent (ACE_TRY_ENV);
+  return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushSupplier::_default_POA (CORBA::Environment&)
+TAO_CEC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_add_ref (CORBA::Environment &)
+TAO_CEC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_remove_ref (CORBA::Environment &)
+TAO_CEC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index 01ab4386186..a3bcddab675 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -54,10 +54,10 @@ public:
   virtual ~TAO_CEC_ProxyPushSupplier (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV)
+  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no consumer is connected...
@@ -72,36 +72,36 @@ public:
   CosEventComm::PushConsumer_ptr consumer (void) const;
 
   /// The event channel is shutting down
-  virtual void shutdown (CORBA::Environment &env);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Internal methods to push an event to each consumer.
-  virtual void push (const CORBA::Any &event,
-                     CORBA::Environment &ACE_TRY_ENV);
-  virtual void push_nocopy (CORBA::Any &event,
-                            CORBA::Environment &ACE_TRY_ENV);
+  virtual void push (const CORBA::Any &event
+                     TAO_ENV_ARG_DECL);
+  virtual void push_nocopy (CORBA::Any &event
+                            TAO_ENV_ARG_DECL);
 
   /// Pushes to the consumer, verifies that it is connected.
-  void push_to_consumer (const CORBA::Any &event,
-                         CORBA::Environment &env);
-  void reactive_push_to_consumer (const CORBA::Any &event,
-                                  CORBA::Environment &env);
+  void push_to_consumer (const CORBA::Any &event
+                         TAO_ENV_ARG_DECL);
+  void reactive_push_to_consumer (const CORBA::Any &event
+                                  TAO_ENV_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected,
-                                        CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
+                                        TAO_ENV_ARG_DECL);
 
   // = The CosEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
-                CosEventComm::PushConsumer_ptr push_consumer,
-                CORBA::Environment &)
+                CosEventComm::PushConsumer_ptr push_consumer
+                TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -109,9 +109,9 @@ public:
   CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV);
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index 0195f7f83f1..1b49e6ccb4c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -50,12 +50,12 @@ public:
 
 #if 0
   /// Some strategies may want to keep track of connected consumers.
-  virtual void connected (TAO_CEC_ProxyPullConsumer *,
-                          CORBA::Environment &) = 0;
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer *,
-                            CORBA::Environment &) = 0;
-  virtual void diconnected (TAO_CEC_ProxyPullConsumer *,
-                            CORBA::Environment &) = 0;
+  virtual void connected (TAO_CEC_ProxyPullConsumer *
+                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer *
+                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void diconnected (TAO_CEC_ProxyPullConsumer *
+                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
 #endif /* 0 */
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 7c708b23781..538bda35e5f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -34,16 +34,16 @@ TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void)
 
 void
 TAO_CEC_Reactive_ConsumerControl::query_consumers (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_CEC_Ping_Push_Consumer push_worker (this);
-  this->event_channel_->consumer_admin ()->for_each (&push_worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->consumer_admin ()->for_each (&push_worker
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_CEC_Ping_Pull_Consumer pull_worker (this);
-  this->event_channel_->consumer_admin ()->for_each (&pull_worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->consumer_admin ()->for_each (&pull_worker
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -58,27 +58,27 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types,
-                                                     ACE_TRY_ENV);
+        this->policy_current_->get_policy_overrides (types
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the consumers...
-      this->query_consumers (ACE_TRY_ENV);
+      this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::SET_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -104,13 +104,13 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (tmp.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -124,8 +124,8 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any,
-               ACE_TRY_ENV);
+               any
+               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -147,12 +147,12 @@ TAO_CEC_Reactive_ConsumerControl::shutdown (void)
 
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_CEC_ProxyPushSupplier *proxy,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_CEC_ProxyPushSupplier *proxy
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -166,12 +166,12 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
 
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_CEC_ProxyPullSupplier *proxy,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_CEC_ProxyPullSupplier *proxy
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_pull_supplier (ACE_TRY_ENV);
+      proxy->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -186,8 +186,8 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
 void
 TAO_CEC_Reactive_ConsumerControl::system_exception (
       TAO_CEC_ProxyPushSupplier *proxy,
-      CORBA::SystemException & /* exception */,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::SystemException & /* exception */
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -201,7 +201,7 @@ TAO_CEC_Reactive_ConsumerControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -231,25 +231,25 @@ TAO_CEC_ConsumerControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected,
-                                         ACE_TRY_ENV);
+        supplier->consumer_non_existent (disconnected
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+          this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -263,7 +263,7 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier,
       //     && exception->minor () == 0x54410085)
       //   return;
 
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -276,25 +276,25 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier,
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected,
-                                         ACE_TRY_ENV);
+        supplier->consumer_non_existent (disconnected
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+          this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -308,7 +308,7 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier,
       //     && exception->minor () == 0x54410085)
       //   return;
 
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index a58c5858b39..c6ab0973fdd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -85,18 +85,18 @@ public:
   // = Documented in TAO_CEC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy,
-                                   CORBA::Environment &);
-  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy,
-                                   CORBA::Environment &);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &,
-                                 CORBA::Environment &);
+                                 CORBA::SystemException &
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (CORBA::Environment &ACE_TRY_ENV);
+  void query_consumers (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -128,8 +128,8 @@ class TAO_CEC_Ping_Push_Consumer : public TAO_ESF_Worker<TAO_CEC_ProxyPushSuppli
 public:
   TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control);
 
-  virtual void work (TAO_CEC_ProxyPushSupplier *supplier,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_CEC_ProxyPushSupplier *supplier
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_CEC_ConsumerControl *control_;
@@ -142,8 +142,8 @@ class TAO_CEC_Ping_Pull_Consumer : public TAO_ESF_Worker<TAO_CEC_ProxyPullSuppli
 public:
   TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullSupplier *supplier,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_CEC_ProxyPullSupplier *supplier
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_CEC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index f10cf9a7d67..34530e04dbd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -39,30 +39,30 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types,
-                                                     ACE_TRY_ENV);
+        this->policy_current_->get_policy_overrides (types
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (),
                                  this->event_channel_->supplier_control ());
 
-      this->event_channel_->supplier_admin ()->for_each (&worker,
-                                                         ACE_TRY_ENV);
+      this->event_channel_->supplier_admin ()->for_each (&worker
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::SET_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -88,13 +88,13 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (tmp.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -108,8 +108,8 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any,
-               ACE_TRY_ENV);
+               any
+               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -146,16 +146,16 @@ TAO_CEC_Pulling_Strategy_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
+                          TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean has_event = 0;
   CORBA::Any_var any;
 
   ACE_TRY
     {
-      any = consumer->try_pull_from_supplier (has_event,
-                                              ACE_TRY_ENV);
+      any = consumer->try_pull_from_supplier (has_event
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -167,7 +167,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer,
 
   if (has_event)
     {
-      this->consumer_admin_->push (any.in (), ACE_TRY_ENV);
+      this->consumer_admin_->push (any.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index a7bd8a30360..e72af9018fd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -111,8 +111,8 @@ public:
   TAO_CEC_Pull_Event (TAO_CEC_ConsumerAdmin *consumer_admin,
                       TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullConsumer *consumer,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_CEC_ProxyPullConsumer *consumer
+                     TAO_ENV_ARG_DECL);
 
 private:
   /// Used to propagate the events.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 39e0e87b307..75651b761dc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -35,16 +35,16 @@ TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void)
 
 void
 TAO_CEC_Reactive_SupplierControl::query_suppliers (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_CEC_Ping_Push_Supplier push_worker (this);
-  this->event_channel_->supplier_admin ()->for_each (&push_worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->supplier_admin ()->for_each (&push_worker
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_CEC_Ping_Pull_Supplier pull_worker (this);
-  this->event_channel_->supplier_admin ()->for_each (&pull_worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->supplier_admin ()->for_each (&pull_worker
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -59,27 +59,27 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types,
-                                                     ACE_TRY_ENV);
+        this->policy_current_->get_policy_overrides (types
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the suppliers...
-      this->query_suppliers (ACE_TRY_ENV);
+      this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::SET_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -105,13 +105,13 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (tmp.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -125,8 +125,8 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any,
-               ACE_TRY_ENV);
+               any
+               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -148,12 +148,12 @@ TAO_CEC_Reactive_SupplierControl::shutdown (void)
 
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_ProxyPushConsumer *proxy,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_CEC_ProxyPushConsumer *proxy
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -165,12 +165,12 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
 
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_CEC_ProxyPullConsumer *proxy,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_CEC_ProxyPullConsumer *proxy
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_pull_consumer (ACE_TRY_ENV);
+      proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -183,8 +183,8 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
 void
 TAO_CEC_Reactive_SupplierControl::system_exception (
       TAO_CEC_ProxyPullConsumer *proxy,
-      CORBA::SystemException & /* exception */,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::SystemException & /* exception */
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -198,7 +198,7 @@ TAO_CEC_Reactive_SupplierControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_pull_consumer (ACE_TRY_ENV);
+      proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -228,25 +228,25 @@ TAO_CEC_SupplierControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected,
-                                         ACE_TRY_ENV);
+        consumer->supplier_non_existent (disconnected
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+          this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -261,7 +261,7 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer,
       //   return;
 
       // Anything else is serious, including timeouts...
-      this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -274,25 +274,25 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer,
 // ****************************************************************
 
 void
-TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected,
-                                         ACE_TRY_ENV);
+        consumer->supplier_non_existent (disconnected
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+          this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -307,7 +307,7 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer,
       //   return;
 
       // Anything else is serious, including timeouts...
-      this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index d137126f35e..278d23130d8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -85,18 +85,18 @@ public:
   // = Documented in TAO_CEC_SupplierControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy,
-                                   CORBA::Environment &);
-  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy,
-                                   CORBA::Environment &);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
-                                 CORBA::SystemException &,
-                                 CORBA::Environment &);
+                                 CORBA::SystemException &
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  void query_suppliers (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -128,8 +128,8 @@ class TAO_CEC_Ping_Push_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPushConsum
 public:
   TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPushConsumer *consumer,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_CEC_ProxyPushConsumer *consumer
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_CEC_SupplierControl *control_;
@@ -142,8 +142,8 @@ class TAO_CEC_Ping_Pull_Supplier : public TAO_ESF_Worker<TAO_CEC_ProxyPullConsum
 public:
   TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control);
 
-  virtual void work (TAO_CEC_ProxyPullConsumer *consumer,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_CEC_ProxyPullConsumer *consumer
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_CEC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index b126941d78d..7ec53139c38 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -32,75 +32,75 @@ TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void)
 }
 
 PortableServer::POA_ptr
-TAO_CEC_SupplierAdmin::_default_POA (CORBA::Environment&)
+TAO_CEC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer,
-                                  CORBA::Environment & ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer
+                                  TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.connected (consumer, ACE_TRY_ENV);
+  this->push_admin_.connected (consumer TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer
+                                    TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.reconnected (consumer, ACE_TRY_ENV);
+  this->push_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer
+                                     TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.disconnected (consumer, ACE_TRY_ENV);
+  this->push_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer
+                                  TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.connected (consumer, ACE_TRY_ENV);
+  this->pull_admin_.connected (consumer TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer
+                                    TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.reconnected (consumer, ACE_TRY_ENV);
+  this->pull_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer
+                                     TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.disconnected (consumer, ACE_TRY_ENV);
+  this->pull_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_SupplierAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->push_admin_.shutdown (ACE_TRY_ENV);
+  this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->pull_admin_.shutdown (ACE_TRY_ENV);
+  this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->push_admin_.obtain (ACE_TRY_ENV);
+  return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_pull_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_SupplierAdmin::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->pull_admin_.obtain (ACE_TRY_ENV);
+  return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 901215bbb08..5dbc4252c95 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -57,41 +57,41 @@ public:
   virtual ~TAO_CEC_SupplierAdmin (void);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
+                 TAO_ENV_ARG_DECL);
 
   /// For each elements call <worker->work()>.
-  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
+                 TAO_ENV_ARG_DECL);
 
   /// Keep track of connected consumers.
-  virtual void connected (TAO_CEC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPushConsumer*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_CEC_ProxyPullConsumer*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_CEC_ProxyPullConsumer*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_CEC_ProxyPullConsumer*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_CEC_ProxyPushConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPushConsumer*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPushConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_CEC_ProxyPullConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_CEC_ProxyPullConsumer*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_CEC_ProxyPullConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (CORBA::Environment&);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (CORBA::Environment &)
+      obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-      obtain_pull_consumer (CORBA::Environment &)
+      obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
index 23eb6fc7a67..43b2cfbab3d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
@@ -2,16 +2,16 @@
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
+              TAO_ENV_ARG_DECL)
 {
-  this->push_admin_.for_each (worker, ACE_TRY_ENV);
+  this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
-    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
+              TAO_ENV_ARG_DECL)
 {
-  this->pull_admin_.for_each (worker, ACE_TRY_ENV);
+  this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index c3953e03ebb..c0856651a75 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -29,21 +29,21 @@ TAO_CEC_SupplierControl::shutdown (void)
 }
 
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *,
-                                             CORBA::Environment &)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *
+                                             TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *,
-                                             CORBA::Environment &)
+TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *
+                                             TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *,
-                                           CORBA::SystemException &,
-                                           CORBA::Environment &)
+                                           CORBA::SystemException &
+                                           TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index c655ddb5ea7..6e92fbcda70 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -62,21 +62,21 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy,
-                                   CORBA::Environment &);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
 
   /**
    * Invoked by helper classes when they detect that a supplier does
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy,
-                                   CORBA::Environment &);
+  virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
-                                 CORBA::SystemException &,
-                                 CORBA::Environment &);
+                                 CORBA::SystemException &
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index 64558ca1c3f..011fe07d0ea 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -28,8 +28,8 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    for_each (TAO_ESF_Worker<PROXY> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<PROXY> *worker
+              TAO_ENV_ARG_DECL)
 {
   // @@ Use an allocator for this memory...
   PROXY **proxies = 0;
@@ -58,7 +58,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
-          worker->work (*j, ACE_TRY_ENV);
+          worker->work (*j TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           (*j)->_decr_refcnt ();
         }
@@ -80,43 +80,43 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    connected (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
+    connected (PROXY *proxy
+               TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy, ACE_TRY_ENV);
+  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
+    reconnected (PROXY *proxy
+                 TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy, ACE_TRY_ENV);
+  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
+    disconnected (PROXY *proxy
+                  TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy, ACE_TRY_ENV);
+  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
+    shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (ACE_TRY_ENV);
+  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* TAO_ESF_COPY_ON_READ_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 5286ea0adc2..5f1b3e1e100 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -27,7 +27,7 @@ template<class Target> class TAO_ESF_Worker;
  *
  * @brief Implement the Copy_On_Read protocol
  *
- * 
+ *
  * The class is parametric on the kind of collection and locking
  * mechanism used.
  */
@@ -40,15 +40,15 @@ public:
   TAO_ESF_Copy_On_Read (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy_Collection methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV);
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV);
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
+                         TAO_ENV_ARG_DECL);
+  virtual void connected (PROXY *proxy
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (PROXY *proxy
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (PROXY *proxy
+                             TAO_ENV_ARG_DECL);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index d3425ef7485..1ecba5d20e3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -65,8 +65,8 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_ESF_Worker<PROXY> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<PROXY> *worker
+              TAO_ENV_ARG_DECL)
 {
   Read_Guard ace_mon (this->mutex_,
                       this->collection_);
@@ -74,15 +74,15 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   ITERATOR end = ace_mon.collection->collection.end ();
   for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
     {
-      worker->work (*i, ACE_TRY_ENV);
+      worker->work (*i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    connected (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
+    connected (PROXY *proxy
+               TAO_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -91,13 +91,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.connected (proxy, ACE_TRY_ENV);
+  ace_mon.copy->collection.connected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
+    reconnected (PROXY *proxy
+                 TAO_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -106,13 +106,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.reconnected (proxy, ACE_TRY_ENV);
+  ace_mon.copy->collection.reconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
+    disconnected (PROXY *proxy
+                  TAO_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -120,12 +120,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.disconnected (proxy, ACE_TRY_ENV);
+  ace_mon.copy->collection.disconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
+    shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // We need to perform a copy to follow the protocol.
   Write_Guard ace_mon (this->mutex_,
@@ -134,7 +134,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.shutdown (ACE_TRY_ENV);
+  ace_mon.copy->collection.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index b45e26cbcf3..8e646428cb0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -125,15 +125,15 @@ public:
   ~TAO_ESF_Copy_On_Write (void);
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV);
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV);
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
+                         TAO_ENV_ARG_DECL);
+  virtual void connected (PROXY *proxy
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (PROXY *proxy
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (PROXY *proxy
+                             TAO_ENV_ARG_DECL);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index c4318efde35..564e6d08805 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -45,15 +45,15 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    for_each (TAO_ESF_Worker<PROXY> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<PROXY> *worker
+              TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (Busy_Lock, ace_mon, this->lock_);
 
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work (*i, ACE_TRY_ENV);
+      worker->work (*i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
   }
@@ -107,8 +107,8 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
+    connected (PROXY *proxy
+               TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -118,7 +118,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can add the object immediately
-      this->connected_i (proxy, ACE_TRY_ENV);
+      this->connected_i (proxy TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -134,8 +134,8 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
+    reconnected (PROXY *proxy
+                 TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -145,7 +145,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can reconnect the object immediately
-      this->reconnected_i (proxy, ACE_TRY_ENV);
+      this->reconnected_i (proxy TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -161,8 +161,8 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
+    disconnected (PROXY *proxy
+                  TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -171,7 +171,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can remove the object immediately
-      this->disconnected_i (proxy, ACE_TRY_ENV);
+      this->disconnected_i (proxy TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -187,7 +187,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
+    shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -196,7 +196,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can shutdown the object immediately
-      this->shutdown_i (ACE_TRY_ENV);
+      this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index c7d89b0eaf8..7c28ba64540 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -92,13 +92,13 @@ public:
   int idle (void);
   int execute_delayed_operations (void);
 
-  void connected_i (PROXY *proxy,
-                    CORBA::Environment &ACE_TRY_ENV);
-  void reconnected_i (PROXY *proxy,
-                    CORBA::Environment &ACE_TRY_ENV);
-  void disconnected_i (PROXY *proxy,
-                     CORBA::Environment &ACE_TRY_ENV);
-  void shutdown_i (CORBA::Environment &ACE_TRY_ENV);
+  void connected_i (PROXY *proxy
+                    TAO_ENV_ARG_DECL);
+  void reconnected_i (PROXY *proxy
+                    TAO_ENV_ARG_DECL);
+  void disconnected_i (PROXY *proxy
+                     TAO_ENV_ARG_DECL);
+  void shutdown_i (TAO_ENV_SINGLE_ARG_DECL);
 
   typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
   typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
@@ -106,15 +106,15 @@ public:
   typedef TAO_ESF_Shutdown_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE> > Shutdown_Command;
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV);
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV);
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
+                         TAO_ENV_ARG_DECL);
+  virtual void connected (PROXY *proxy
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (PROXY *proxy
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (PROXY *proxy
+                             TAO_ENV_ARG_DECL);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
index b6511ed1a28..964625575f9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
@@ -2,31 +2,31 @@
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    connected_i (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
+    connected_i (PROXY *proxy
+               TAO_ENV_ARG_DECL)
 {
-  this->collection_.connected (proxy, ACE_TRY_ENV);
+  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    reconnected_i (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
+    reconnected_i (PROXY *proxy
+                 TAO_ENV_ARG_DECL)
 {
-  this->collection_.reconnected (proxy, ACE_TRY_ENV);
+  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    disconnected_i (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
+    disconnected_i (PROXY *proxy
+                  TAO_ENV_ARG_DECL)
 {
-  this->collection_.disconnected (proxy, ACE_TRY_ENV);
+  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown_i (CORBA::Environment &ACE_TRY_ENV)
+    shutdown_i (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->collection_.shutdown (ACE_TRY_ENV);
+  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index 9c4bc9459b0..2fc47be1f6c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -30,15 +30,15 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
 
 template<class PROXY, class C, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
-    for_each (TAO_ESF_Worker<PROXY> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<PROXY> *worker
+              TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work ((*i), ACE_TRY_ENV);
+      worker->work ((*i) TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index 475565a37e0..db5b6b2563a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -32,15 +32,15 @@ public:
   TAO_ESF_Immediate_Changes (const COLLECTION &collection);
 
   // = The TAO_ESF_Proxy methods
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV);
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV);
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
+                         TAO_ENV_ARG_DECL);
+  virtual void connected (PROXY *proxy
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (PROXY *proxy
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (PROXY *proxy
+                             TAO_ENV_ARG_DECL);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
index 3bb97da043b..21bf4981b67 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
@@ -2,41 +2,41 @@
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    connected (PROXY *proxy,
-               CORBA::Environment &ACE_TRY_ENV)
+    connected (PROXY *proxy
+               TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy, ACE_TRY_ENV);
+  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
+    reconnected (PROXY *proxy
+                 TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy, ACE_TRY_ENV);
+  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
+    disconnected (PROXY *proxy
+                  TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy, ACE_TRY_ENV);
+  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
+    shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (ACE_TRY_ENV);
+  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 56bbf4cb21d..21123fd2cd9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -28,35 +28,35 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_connected (PEER *peer,
-                    CORBA::Environment &ACE_TRY_ENV)
+    peer_connected (PEER *peer
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker, ACE_TRY_ENV);
+  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_reconnected (PEER *peer,
-                      CORBA::Environment &ACE_TRY_ENV)
+    peer_reconnected (PEER *peer
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker, ACE_TRY_ENV);
+  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
-    peer_disconnected (PEER *peer,
-                       CORBA::Environment &ACE_TRY_ENV)
+    peer_disconnected (PEER *peer
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker, ACE_TRY_ENV);
+  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_ESF_PEER_ADMIN_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 39481c7def0..256e342e17a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -38,17 +38,17 @@
  * the PROXY interface must implement:
  *
  * @verbatim
- * void connected (PEER *peer, CORBA::Environment&) throw ();
- * void reconnected (PEER *peer, CORBA::Environment&) throw ();
- * void disconnected (PEER *peer, CORBA::Environment&) throw ();
+ * void connected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void reconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void disconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
  * @endverbatim
  *
  * Similarly, the PEER interface must implement:
  *
  * @verbatim
- * void connected (PROXY *proxy, CORBA::Environment&) throw ();
- * void reconnected (PROXY *proxy, CORBA::Environment&) throw ();
- * void disconnected (PROXY *proxy, CORBA::Environment&) throw ();
+ * void connected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void reconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void disconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
@@ -66,8 +66,8 @@ public:
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void peer_connected (PEER *peer,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void peer_connected (PEER *peer
+                               TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -76,8 +76,8 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void peer_reconnected (PEER *peer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+  virtual void peer_reconnected (PEER *peer
+                                 TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -85,8 +85,8 @@ public:
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void peer_disconnected (PEER *peer,
-                                  CORBA::Environment &ACE_TRY_ENV)
+  virtual void peer_disconnected (PEER *peer
+                                  TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index cd5c8ca1e8c..81f2ea5d27a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -12,39 +12,39 @@
 ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$")
 
 template<class P, class R> void
-TAO_ESF_Peer_Connected<P,R>::work (P *proxy,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_ESF_Peer_Connected<P,R>::work (P *proxy
+                                   TAO_ENV_ARG_DECL)
 {
-  proxy->connected (this->peer_, ACE_TRY_ENV);
+  proxy->connected (this->peer_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->connected (proxy, ACE_TRY_ENV);
+  this->peer_->connected (proxy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
 
 template<class P, class R> void
-TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
+                                     TAO_ENV_ARG_DECL)
 {
-  proxy->reconnected (this->peer_, ACE_TRY_ENV);
+  proxy->reconnected (this->peer_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->reconnected (proxy, ACE_TRY_ENV);
+  this->peer_->reconnected (proxy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
 // ****************************************************************
 
 template<class P, class R> void
-TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
+                                      TAO_ENV_ARG_DECL)
 {
-  proxy->disconnected (this->peer_, ACE_TRY_ENV);
+  proxy->disconnected (this->peer_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->disconnected (proxy, ACE_TRY_ENV);
+  this->peer_->disconnected (proxy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
index 503f9ba2439..e69984da721 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -32,8 +32,8 @@ class TAO_ESF_Peer_Connected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Connected (PEER *peer);
 
-  void work (PROXY *proxy,
-             CORBA::Environment &ACE_TRY_ENV);
+  void work (PROXY *proxy
+             TAO_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
@@ -55,8 +55,8 @@ class TAO_ESF_Peer_Reconnected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Reconnected (PEER *peer);
 
-  void work (PROXY *proxy,
-             CORBA::Environment &ACE_TRY_ENV);
+  void work (PROXY *proxy
+             TAO_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
@@ -78,8 +78,8 @@ class TAO_ESF_Peer_Disconnected : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Peer_Disconnected (PEER *peer);
 
-  void work (PROXY *proxy,
-             CORBA::Environment &ACE_TRY_ENV);
+  void work (PROXY *proxy
+             TAO_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index b96c8769d00..062b06869aa 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -30,7 +30,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    obtain (CORBA::Environment &ACE_TRY_ENV)
+    obtain (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PROXY* proxy;
@@ -39,10 +39,10 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
   PortableServer::ServantBase_var holder = proxy;
 
   ACE_TYPENAME PROXY::_var_type result =
-    proxy->activate (ACE_TRY_ENV);
+    proxy->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (INTERFACE::_nil ());
 
-  this->collection_->connected (proxy, ACE_TRY_ENV);
+  this->collection_->connected (proxy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (INTERFACE::_nil ());
 
   return result._retn ();
@@ -50,46 +50,46 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    shutdown (CORBA::Environment &ACE_TRY_ENV)
+    shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
-  this->collection_->for_each (&worker, ACE_TRY_ENV);
+  this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER);
   ACE_CHECK; // Cannot happen, just following the discipline.
 
-  this->collection_->shutdown (ACE_TRY_ENV);
+  this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    connected (PROXY *,
-               CORBA::Environment &)
+    connected (PROXY *
+               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    reconnected (PROXY *proxy,
-                 CORBA::Environment &ACE_TRY_ENV)
+    reconnected (PROXY *proxy
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->reconnected (proxy, ACE_TRY_ENV);
+  this->collection_->reconnected (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    disconnected (PROXY *proxy,
-                  CORBA::Environment &ACE_TRY_ENV)
+    disconnected (PROXY *proxy
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  proxy->deactivate (ACE_TRY_ENV);
+  proxy->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK; // Cannot happen, just following the discipline.
 
   ACE_TRY
     {
-      this->collection_->disconnected (proxy, ACE_TRY_ENV);
+      this->collection_->disconnected (proxy TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index 05308f22fbd..a76275f083b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -53,7 +53,7 @@
  * // The T_var for the IDL interface implemented by the PROXY.
  *
  * PROXY::_ptr_type
- * PROXY::activate (CORBA::Environment &) throw ();
+ * PROXY::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
  * // activate the proxy and return the object reference
  * @endverbatim
  *
@@ -69,8 +69,8 @@ public:
   virtual ~TAO_ESF_Proxy_Admin (void);
 
   /// Iterate over its internal collection.
-  void for_each (TAO_ESF_Worker<PROXY> *worker,
-                 CORBA::Environment &ACE_TRY_ENV)
+  void for_each (TAO_ESF_Worker<PROXY> *worker
+                 TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @TODO We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but
@@ -80,7 +80,7 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (CORBA::Environment &)
+      obtain (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -88,7 +88,7 @@ public:
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -96,8 +96,8 @@ public:
    * has invoked the connect_xxx_yyy() method.
    * The default implementation is a no-op.
    */
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV)
+  virtual void connected (PROXY *proxy
+                          TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -106,8 +106,8 @@ public:
    * The default implementation delegates on the collection
    * <reconnected> method
    */
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV)
+  virtual void reconnected (PROXY *proxy
+                            TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -115,8 +115,8 @@ public:
    * removes the object from the collection and deactivates the
    * proxy.
    */
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnected (PROXY *proxy
+                             TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
index fbb3c9fe06f..be00cdad82e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
@@ -2,9 +2,9 @@
 
 template<class EC,class P,class I> ACE_INLINE void
 TAO_ESF_Proxy_Admin<EC,P,I>::
-    for_each (TAO_ESF_Worker<P> *worker,
-              CORBA::Environment &ACE_TRY_ENV)
+    for_each (TAO_ESF_Worker<P> *worker
+              TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->for_each (worker, ACE_TRY_ENV);
+  this->collection_->for_each (worker TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index a7e61a655bf..b04cbe9f3b7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -128,13 +128,13 @@ public:
    * member of the collection.
    * This encapsulates
    */
-  virtual void for_each (TAO_ESF_Worker<PROXY> *worker,
-                         CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void for_each (TAO_ESF_Worker<PROXY> *worker
+                         TAO_ENV_ARG_DECL) = 0;
 
   /// Insert a new element into the collection.  The collection assumes
   /// ownership of the element.
-  virtual void connected (PROXY *proxy,
-                          CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void connected (PROXY *proxy
+                          TAO_ENV_ARG_DECL) = 0;
 
   /**
    * Insert an element into the collection.  No errors can be raised
@@ -143,15 +143,15 @@ public:
    * <proxy->_decr_refcnt()> if the element is already present in the
    * collection.
    */
-  virtual void reconnected (PROXY *proxy,
-                            CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void reconnected (PROXY *proxy
+                            TAO_ENV_ARG_DECL) = 0;
 
   /// Remove an element from the collection.
-  virtual void disconnected (PROXY *proxy,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void disconnected (PROXY *proxy
+                             TAO_ENV_ARG_DECL) = 0;
 
   /// The EC is shutting down, must release all the elements.
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index f1244c91cca..e871ce15a7d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -18,8 +18,8 @@ TAO_ESF_Proxy_List<PROXY>::
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy,
-                                      CORBA::Environment &)
+TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
+                                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -39,8 +39,8 @@ TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy,
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy,
-                                        CORBA::Environment &)
+TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -64,8 +64,8 @@ TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy,
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy,
-                                         CORBA::Environment &)
+TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.remove (proxy);
   if (r != 0)
@@ -78,7 +78,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy,
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (CORBA::Environment &)
+TAO_ESF_Proxy_List<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index f32185095cc..85d6d3f9914 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -49,20 +49,20 @@ public:
   size_t size (void) const;
 
   /// Insert a new element to the collection
-  void connected (PROXY *,
-                  CORBA::Environment &);
+  void connected (PROXY *
+                  TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Insert a new element that could be there already.
-  void reconnected (PROXY *,
-                    CORBA::Environment &);
+  void reconnected (PROXY *
+                    TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Remove an element from the collection
-  void disconnected (PROXY *,
-                     CORBA::Environment &);
+  void disconnected (PROXY *
+                     TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (CORBA::Environment &);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index eac949f1ebb..002cc934635 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -18,8 +18,8 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy,
-                                         CORBA::Environment &)
+TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.bind (proxy, 1);
   if (r == 0)
@@ -39,8 +39,8 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy,
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy,
-                                           CORBA::Environment &)
+TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
+                                           TAO_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.rebind (proxy, 1);
   if (r == 0)
@@ -62,8 +62,8 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy,
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy,
-                                            CORBA::Environment &)
+TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
+                                            TAO_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.unbind (proxy);
   if (r != 0)
@@ -76,7 +76,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy,
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (CORBA::Environment &)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index 7e24374b339..c957b46209a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -73,19 +73,19 @@ public:
   size_t size (void) const;
 
   /// Insert a new element to the collection
-  void connected (PROXY *,
-                  CORBA::Environment &);
+  void connected (PROXY *
+                  TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Insert a new element that could be there already.
-  void reconnected (PROXY *,
-                    CORBA::Environment &);
+  void reconnected (PROXY *
+                    TAO_ENV_ARG_DECL_NOT_USED);
   /// Remove an element from the collection
-  void disconnected (PROXY *,
-                     CORBA::Environment &);
+  void disconnected (PROXY *
+                     TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (CORBA::Environment &);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 628710224a9..21627fef89f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -12,12 +12,12 @@
 ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$")
 
 template<class PROXY> void
-TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
+                                     TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->shutdown (ACE_TRY_ENV);
+      proxy->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index e43728c04f0..69b3de4dc73 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -26,8 +26,8 @@ class TAO_ESF_Shutdown_Proxy : public TAO_ESF_Worker<PROXY>
 public:
   TAO_ESF_Shutdown_Proxy (void);
 
-  void work (PROXY *proxy,
-             CORBA::Environment &ACE_TRY_ENV);
+  void work (PROXY *proxy
+             TAO_ENV_ARG_DECL);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index 06e766a48e6..c555be82e53 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -34,8 +34,8 @@ public:
   virtual ~TAO_ESF_Worker (void);
 
   /// Callback interface.
-  virtual void work (Object *object,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void work (Object *object
+                     TAO_ENV_ARG_DECL) = 0;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index b8e26dd86c6..da922c1aaf3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -150,11 +150,11 @@ int
 ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request,
                                          u_long &command_action)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Forward the request.
-      up_->push (request, ACE_TRY_ENV);
+      up_->push (request TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -238,10 +238,10 @@ ACE_ES_Priority_Dispatching::initialize_queues (void)
 }
 
 void
-ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
-                                        CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer
+                                        TAO_ENV_ARG_DECL)
 {
-  down_->connected (consumer, ACE_TRY_ENV);
+  down_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This code does dynamic allocation of channel dispatch threads.
@@ -253,7 +253,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
   // We have to tell the lower portions of the channel about the
   // consumer first.  This is so that any changes to the consumer's
   // qos will take effect when we get the dispatch priority.
-  down_->connected (consumer, ACE_TRY_ENV);
+  down_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecScheduler::OS_Priority priority =
@@ -335,8 +335,8 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer)
 // @@ This method could have a bypass optimization.
 // <request> has been dynamically allocated by the filtering module.
 void
-ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                                   CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request
+                                   TAO_ENV_ARG_DECL)
 {
   ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE);
 
@@ -352,15 +352,15 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
         (request->rt_info (),
          thread_priority,
          subpriority,
-         preemption_priority,
-         ACE_TRY_ENV);
+         preemption_priority
+          TAO_ENV_ARG_PARAMETER);
 #else
       ACE_Scheduler_Factory::server ()->priority
         (request->rt_info (),
          thread_priority,
          subpriority,
-         preemption_priority,
-         ACE_TRY_ENV);
+         preemption_priority
+          TAO_ENV_ARG_PARAMETER);
 #endif
       ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED);
       ACE_CHECK;
@@ -620,7 +620,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                          "ACE_ES_Dispatch_Queue::open_queue"), -1);
     case 0:
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
+        TAO_ENV_DECLARE_NEW_ENV;
         ACE_TRY
           {// @@ TODO: Handle exceptions...
 #if 1
@@ -634,8 +634,8 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                ORBSVCS_Time::zero (),
                1,
-               RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               RtecScheduler::OPERATION
+                TAO_ENV_ARG_PARAMETER);
 #else
             ACE_Scheduler_Factory::server()->set (rt_info_,
                                                   RtecScheduler::VERY_HIGH_CRITICALITY,
@@ -646,8 +646,8 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                                                   RtecScheduler::VERY_LOW_IMPORTANCE,
                                                   ORBSVCS_Time::zero (),
                                                   1,
-                                                  RtecScheduler::OPERATION,
-                                                  ACE_TRY_ENV);
+                                                  RtecScheduler::OPERATION
+                                                   TAO_ENV_ARG_PARAMETER);
 #endif
             ACE_TRY_CHECK;
           }
@@ -686,8 +686,8 @@ ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel)
 }
 
 void
-ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &)
+ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request
+                              TAO_ENV_ARG_DECL_NOT_USED)
 {
   // If it's a request to forward an event, it needs a reference to us
   // to call dispatch_event.
@@ -728,11 +728,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
   // Store the priority of the task currently running.
   channel_->rtu_manager ()->priority (request->priority ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Forward the request.
-      up_->push (request, ACE_TRY_ENV);
+      up_->push (request TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -759,11 +759,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
 }
 
 void
-ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request
+                              TAO_ENV_ARG_DECL)
 {
   // First enqueue the message in the proper queue.
-  ACE_ES_Priority_Dispatching::push (request, ACE_TRY_ENV);
+  ACE_ES_Priority_Dispatching::push (request TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If the current event is higher priority (lower value) than the
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index b83756c24da..62b61a57e75 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -62,12 +62,12 @@ public:
                      ACE_ES_Correlation_Module *down);
   // Link to adjacent modules.
 
-  virtual void connected (ACE_Push_Consumer_Proxy *consumer,
-                          CORBA::Environment &);
+  virtual void connected (ACE_Push_Consumer_Proxy *consumer
+                          TAO_ENV_ARG_DECL_NOT_USED);
   // Forward down_.
 
-  virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                              CORBA::Environment &);
+  virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer
+                              TAO_ENV_ARG_DECL_NOT_USED);
   // Forward down_.
 
   virtual void disconnected (ACE_Push_Consumer_Proxy *consumer);
@@ -77,8 +77,8 @@ public:
   // void connected (ACE_Push_Supplier_Proxy *supplier);
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
-  virtual void push (ACE_ES_Dispatch_Request *request,
-                     CORBA::Environment &) = 0;
+  virtual void push (ACE_ES_Dispatch_Request *request
+                     TAO_ENV_ARG_DECL_NOT_USED) = 0;
   // Forward up_.
 
   virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
@@ -384,8 +384,8 @@ public:
   ~ACE_ES_Priority_Dispatching (void);
   // Delete queues.
 
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-                  CORBA::Environment &);
+  void connected (ACE_Push_Consumer_Proxy *consumer
+                  TAO_ENV_ARG_DECL_NOT_USED);
   // Allocate any needed dispatching resources for this consumers
   // priority.
 
@@ -396,8 +396,8 @@ public:
   // void connected (ACE_Push_Supplier_Proxy *supplier);
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
-  virtual void push (ACE_ES_Dispatch_Request *request,
-                     CORBA::Environment &);
+  virtual void push (ACE_ES_Dispatch_Request *request
+                     TAO_ENV_ARG_DECL_NOT_USED);
   // Enqueues the request on the appropriate Dispatch Queue.
 
   virtual void activate (int threads_per_queue);
@@ -469,8 +469,8 @@ public:
   // Acquires the proper qos structure and passes <channel> onto to
   // the dispatching base constructor.
 
-  virtual void push (ACE_ES_Dispatch_Request *request,
-                     CORBA::Environment &);
+  virtual void push (ACE_ES_Dispatch_Request *request
+                     TAO_ENV_ARG_DECL_NOT_USED);
   // Forward up_.
 };
 
@@ -493,8 +493,8 @@ public:
   // needs to be dequeued.  Implements an RTU-like delayed preemption
   // policy.
 
-  virtual void push (ACE_ES_Dispatch_Request *request,
-                     CORBA::Environment &);
+  virtual void push (ACE_ES_Dispatch_Request *request
+                     TAO_ENV_ARG_DECL_NOT_USED);
   // Calls ACE_ES_Priority_Dispatching::push and then checks if
   // preemption is necessary.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
index fd86083a7f0..cc6c5d64243 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
@@ -19,7 +19,7 @@ ACE_ES_Dispatch_Request::~ACE_ES_Dispatch_Request (void)
 
 ACE_INLINE
 ACE_ES_Dispatch_Request::
-ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
+ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
                          RtecScheduler::handle_t rt_info)
   : priority_ (0),
     rt_info_ (rt_info),
@@ -48,8 +48,8 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
 #if 0
 ACE_INLINE
 ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-						  ACE_ES_Event_Container *event,
-						  RtecScheduler::handle_t rt_info) :
+                                                  ACE_ES_Event_Container *event,
+                                                  RtecScheduler::handle_t rt_info) :
   priority_ (0),
   rt_info_ (rt_info),
   dispatching_module_ (0),
@@ -78,7 +78,7 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
   RtecEventComm::Event tmp;
   tmp.header.creation_time = time;
   tmp.header.type = ACE_ES_EVENT_TIMEOUT;
-  TAO_EC_Event_Set* set = 
+  TAO_EC_Event_Set* set =
     TAO_EC_Event_Set::_create (tmp);
   this->single_event_ = TAO_EC_Event (set, set->length ());
 
@@ -87,8 +87,8 @@ ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
 
 ACE_INLINE void
 ACE_ES_Dispatch_Request::set (ACE_ES_Dispatching_Base *dispatching_module,
-			      RtecScheduler::OS_Priority preemption_priority,
-			      RtecScheduler::Preemption_Subpriority_t sub_priority)
+                              RtecScheduler::OS_Priority preemption_priority,
+                              RtecScheduler::Preemption_Subpriority_t sub_priority)
 {
   dispatching_module_ = dispatching_module;
   priority_ = preemption_priority;
@@ -147,21 +147,21 @@ ACE_ES_Dispatching_Base::ACE_ES_Dispatching_Base (ACE_EventChannel *channel)
 
 ACE_INLINE void
 ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up,
-			       ACE_ES_Correlation_Module *down)
+                               ACE_ES_Correlation_Module *down)
 {
   up_ = up;
   down_ = down;
   // 1 == 2.
 }
 
-ACE_INLINE void 
-ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer,
-				    CORBA::Environment &_env)
+ACE_INLINE void
+ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer
+                                    TAO_ENV_ARG_DECL)
 {
-  down_->connected (consumer, _env);
+  down_->connected (consumer TAO_ENV_ARG_PARAMETER);
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer)
 {
   // Do nothing.
@@ -169,10 +169,10 @@ ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer)
 }
 
 ACE_INLINE void
-ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-					CORBA::Environment &_env)
+ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer
+                                        TAO_ENV_ARG_DECL)
 {
-  down_->disconnecting (consumer, _env);
+  down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
@@ -186,7 +186,7 @@ ACE_ES_Dispatching_Base::dispatch_queue_closed (ACE_ES_Dispatch_Queue *q)
 #if defined (ACE_WIN32)
 ACE_INLINE
 ACE_ES_ReactorEx_NS::ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh,
-					  TAO_EC_Timer_Module* tm)
+                                          TAO_EC_Timer_Module* tm)
   : ACE_Notification_Strategy (eh, ACE_Event_Handler::NULL_MASK),
     timer_module_ (tm)
 {
@@ -196,28 +196,28 @@ ACE_INLINE int
 ACE_ES_ReactorEx_NS::open (void)
 {
   return this->timer_module_->register_handler (0,
-						eh_,
-						event_.handle ());
+                                                eh_,
+                                                event_.handle ());
 }
 
 ACE_INLINE void
 ACE_ES_ReactorEx_NS::shutdown (void)
 {
 // @@ TODO: Fix this.
-//  this->timer_module_->remove_handler (0, 
-//				       eh_,
-//				       ACE_Event_Handler::DONT_CALL);
+//  this->timer_module_->remove_handler (0,
+//                                     eh_,
+//                                     ACE_Event_Handler::DONT_CALL);
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_ES_ReactorEx_NS::notify (void)
 {
   return this->event_.signal ();
 }
 
-ACE_INLINE int 
+ACE_INLINE int
 ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *,
-			     ACE_Reactor_Mask)
+                             ACE_Reactor_Mask)
 {
   return this->event_.signal ();
 }
@@ -226,9 +226,9 @@ ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *,
 // This class is only necessary on non-win32 platforms.
 ACE_INLINE
 ACE_ES_Reactor_NS::ACE_ES_Reactor_NS (ACE_Event_Handler *eh,
-				      TAO_EC_Timer_Module *tm)
+                                      TAO_EC_Timer_Module *tm)
   : ACE_Reactor_Notification_Strategy (tm->reactor (0),
-				       eh, ACE_Event_Handler::READ_MASK)
+                                       eh, ACE_Event_Handler::READ_MASK)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 91fe077246f..7efa43f67b9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -58,13 +58,13 @@ TAO_EC_And_Filter::size (void) const
 
 int
 TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
-                           TAO_EC_QOS_Info& qos_info,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           TAO_EC_QOS_Info& qos_info
+                           TAO_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter (event, qos_info, ACE_TRY_ENV);
+      int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n == 0)
         return 0;
@@ -73,7 +73,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -82,13 +82,13 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                  TAO_EC_QOS_Info& qos_info,
-                                  CORBA::Environment& ACE_TRY_ENV)
+                                  TAO_EC_QOS_Info& qos_info
+                                  TAO_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info, ACE_TRY_ENV);
+      int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n == 0)
         return 0;
@@ -97,7 +97,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -106,15 +106,15 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_And_Filter::push (const RtecEventComm::EventSet&,
-                         TAO_EC_QOS_Info&,
-                         CORBA::Environment&)
+                         TAO_EC_QOS_Info&
+                         TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                TAO_EC_QOS_Info& ,
-                                CORBA::Environment&)
+                                TAO_EC_QOS_Info&
+                                TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -164,8 +164,8 @@ TAO_EC_And_Filter::can_match (
 int
 TAO_EC_And_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info&,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info&
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index 9457729412e..cd510858f4e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -50,23 +50,23 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
   typedef unsigned int Word;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index fc1ad7f3432..5725d9bf671 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -24,8 +24,8 @@ TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Basic_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos,
-    CORBA::Environment&) const
+    RtecEventChannelAdmin::ConsumerQOS& qos
+    TAO_ENV_ARG_DECL_NOT_USED) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
@@ -74,7 +74,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
     {
       pos++; // Consume the designator
       CORBA::ULong n = this->count_children (qos, pos);
-      
+
       TAO_EC_Filter** children;
       ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
       CORBA::ULong i = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 36f12e666de..38d4c5fb386 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -46,8 +46,8 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos,
-                        CORBA::Environment &env) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos
+                        TAO_ENV_ARG_DECL) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index 581d285bb88..c958f40e5e5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -44,8 +44,8 @@ TAO_EC_Bitmask_Filter::size (void) const
 
 int
 TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                TAO_EC_QOS_Info& qos_info
+                                TAO_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -54,13 +54,13 @@ TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter (event, qos_info, ACE_TRY_ENV);
+  return this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -69,25 +69,25 @@ TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
+  return this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info &qos_info,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             TAO_EC_QOS_Info &qos_info
+                             TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info &qos_info,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    TAO_EC_QOS_Info &qos_info
+                                    TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -116,8 +116,8 @@ TAO_EC_Bitmask_Filter::can_match (
 int
 TAO_EC_Bitmask_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info &
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index d61d5423a5f..69984a309ef 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -67,23 +67,23 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index c4e7e348065..bc5b04a77c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -82,15 +82,15 @@ TAO_EC_Conjunction_Filter::size (void) const
 
 int
 TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (this->current_child_ = this->begin ();
        this->current_child_ != end;
        ++this->current_child_)
     {
-      int n = (*this->current_child_)->filter (event, qos_info, ACE_TRY_ENV);
+      int n = (*this->current_child_)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -100,15 +100,15 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info,
-                                          CORBA::Environment& ACE_TRY_ENV)
+                                          TAO_EC_QOS_Info& qos_info
+                                          TAO_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info, ACE_TRY_ENV);
+      int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -118,8 +118,8 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 TAO_EC_QOS_Info& qos_info
+                                 TAO_ENV_ARG_DECL)
 {
   CORBA::Long pos = this->current_child_ - this->begin ();
   int w = pos / bits_per_word;
@@ -135,15 +135,15 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
       this->event_[l + i] = event[i];
     }
   if (this->all_received () && this->parent () != 0)
-    this->parent ()->push_nocopy (this->event_, qos_info, ACE_TRY_ENV);
+    this->parent ()->push_nocopy (this->event_, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                        TAO_EC_QOS_Info& qos_info,
-                                        CORBA::Environment& ACE_TRY_ENV)
+                                        TAO_EC_QOS_Info& qos_info
+                                        TAO_ENV_ARG_DECL)
 {
-  this->push (event, qos_info, ACE_TRY_ENV);
+  this->push (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -202,8 +202,8 @@ TAO_EC_Conjunction_Filter::can_match (
 int
 TAO_EC_Conjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info&,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info&
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index cd0f95e0f28..bf49e8a52e3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -52,23 +52,23 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
   typedef unsigned int Word;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 757c3b65672..654bb82e8e8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -29,15 +29,15 @@ TAO_EC_ConsumerControl::shutdown (void)
 }
 
 void
-TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *,
-                                            CORBA::Environment &)
+TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *
+                                            TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *,
-                                          CORBA::SystemException &,
-                                          CORBA::Environment &)
+                                          CORBA::SystemException &
+                                          TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index d3283c498a4..1af9cbbfe63 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -55,13 +55,13 @@ public:
    * has been destroyed.  The strategy has to (at the very least),
    * reclaim all the resources attached to that object.
    */
-  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy,
-                                   CORBA::Environment &);
+  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &,
-                                 CORBA::Environment &);
+                                 CORBA::SystemException &
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index 588908c50f5..dce14cd6423 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -58,15 +58,15 @@ TAO_EC_Disjunction_Filter::size (void) const
 
 int
 TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info, ACE_TRY_ENV);
+      int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -76,15 +76,15 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info, ACE_TRY_ENV);
+      int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -94,20 +94,20 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 TAO_EC_QOS_Info& qos_info
+                                 TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 TAO_EC_QOS_Info& qos_info
+                                 TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -156,8 +156,8 @@ TAO_EC_Disjunction_Filter::can_match (
 int
 TAO_EC_Disjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info &
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index b5391bd9283..02e2752af51 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -51,23 +51,23 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index 95c8ad48f15..b1195799e0e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -33,18 +33,18 @@ void
 TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info&,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info&
+                                   TAO_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (consumer, event, ACE_TRY_ENV);
+  proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info&,
-                                          CORBA::Environment& ACE_TRY_ENV)
+                                          TAO_EC_QOS_Info&
+                                          TAO_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (consumer, event, ACE_TRY_ENV);
+  proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 69c41ac6137..9ed29c5a12d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -63,13 +63,13 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info,
-                     CORBA::Environment &env = TAO_default_environment ()) = 0;
+                     TAO_EC_QOS_Info &qos_info
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info,
-                            CORBA::Environment &env = TAO_default_environment ()) = 0;
+                            TAO_EC_QOS_Info &qos_info
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 };
 
 // ****************************************************************
@@ -95,13 +95,13 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info &qos_info,
-                     CORBA::Environment &env = TAO_default_environment ());
+                     TAO_EC_QOS_Info &qos_info
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info,
-                            CORBA::Environment &env = TAO_default_environment ());
+                            TAO_EC_QOS_Info &qos_info
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 9ca2612815c..79303ce3ebb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -42,7 +42,7 @@ TAO_EC_Dispatching_Task::svc (void)
               continue;
             }
 
-          int result = command->execute (ACE_TRY_ENV);
+          int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Message_Block::release (mb);
@@ -63,8 +63,8 @@ TAO_EC_Dispatching_Task::svc (void)
 void
 TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
                                RtecEventComm::PushConsumer_ptr consumer,
-                               RtecEventComm::EventSet& event,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               RtecEventComm::EventSet& event
+                               TAO_ENV_ARG_DECL)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -93,7 +93,7 @@ TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void)
 // ****************************************************************
 
 int
-TAO_EC_Shutdown_Task_Command::execute (CORBA::Environment&)
+TAO_EC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return -1;
 }
@@ -106,11 +106,11 @@ TAO_EC_Push_Command::~TAO_EC_Push_Command (void)
 }
 
 int
-TAO_EC_Push_Command::execute (CORBA::Environment& ACE_TRY_ENV)
+TAO_EC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->push_to_consumer (this->consumer_.in (),
-                                  this->event_,
-                                  ACE_TRY_ENV);
+                                  this->event_
+                                   TAO_ENV_ARG_PARAMETER);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 5d2c9510957..dd2cd77fc51 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -58,8 +58,8 @@ public:
 
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
-                     RtecEventComm::EventSet& event,
-                     CORBA::Environment &env);
+                     RtecEventComm::EventSet& event
+                     TAO_ENV_ARG_DECL);
 
 private:
   /// An per-task allocator
@@ -88,7 +88,7 @@ public:
   virtual ~TAO_EC_Dispatch_Command (void);
 
   /// Command callback
-  virtual int execute (CORBA::Environment&) = 0;
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
 };
 
 // ****************************************************************
@@ -100,7 +100,7 @@ public:
   TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (CORBA::Environment&);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 };
 
 // ****************************************************************
@@ -119,7 +119,7 @@ public:
   virtual ~TAO_EC_Push_Command (void);
 
   /// Command callback
-  virtual int execute (CORBA::Environment&);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index 2ba48a02dca..94e1737e919 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -101,7 +101,7 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void)
 }
 
 void
-TAO_EC_Event_Channel::activate (CORBA::Environment&)
+TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->dispatching_->activate ();
   this->timeout_generator_->activate ();
@@ -110,7 +110,7 @@ TAO_EC_Event_Channel::activate (CORBA::Environment&)
 }
 
 void
-TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->dispatching_->shutdown ();
   this->timeout_generator_->shutdown ();
@@ -118,144 +118,144 @@ TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV)
   this->consumer_control_->shutdown ();
 
   PortableServer::POA_var consumer_poa =
-    this->consumer_admin_->_default_POA (ACE_TRY_ENV);
+    this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this->consumer_admin_, ACE_TRY_ENV);
+    consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV);
+  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var supplier_poa =
-    this->supplier_admin_->_default_POA (ACE_TRY_ENV);
+    this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this->supplier_admin_, ACE_TRY_ENV);
+    supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV);
+  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_admin_->shutdown (ACE_TRY_ENV);
+  this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_admin_->shutdown (ACE_TRY_ENV);
+  this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 void
-TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer
+                                 TAO_ENV_ARG_DECL)
 {
-  this->consumer_admin_->peer_connected (consumer, ACE_TRY_ENV);
+  this->consumer_admin_->peer_connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier_admin_->connected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (consumer, ACE_TRY_ENV);
+  this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer
+                                   TAO_ENV_ARG_DECL)
 {
-  this->consumer_admin_->peer_reconnected (consumer, ACE_TRY_ENV);
+  this->consumer_admin_->peer_reconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (consumer, ACE_TRY_ENV);
+  this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer
+                                    TAO_ENV_ARG_DECL)
 {
-  this->consumer_admin_->peer_disconnected (consumer, ACE_TRY_ENV);
+  this->consumer_admin_->peer_disconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->disconnected (consumer, ACE_TRY_ENV);
+  this->observer_strategy_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier
+                                 TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->peer_connected (supplier, ACE_TRY_ENV);
+  this->supplier_admin_->peer_connected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_admin_->connected (supplier, ACE_TRY_ENV);
+  this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (supplier, ACE_TRY_ENV);
+  this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier
+                                   TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->peer_reconnected (supplier, ACE_TRY_ENV);
+  this->supplier_admin_->peer_reconnected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_admin_->reconnected (supplier, ACE_TRY_ENV);
+  this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (supplier, ACE_TRY_ENV);
+  this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier
+                                    TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->peer_disconnected (supplier, ACE_TRY_ENV);
+  this->supplier_admin_->peer_disconnected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_admin_->disconnected (supplier, ACE_TRY_ENV);
+  this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->disconnected (supplier, ACE_TRY_ENV);
+  this->observer_strategy_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EC_Event_Channel::for_consumers (CORBA::Environment& ACE_TRY_ENV)
+TAO_EC_Event_Channel::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->consumer_admin_->_this (ACE_TRY_ENV);
+  return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_EC_Event_Channel::for_suppliers (CORBA::Environment& ACE_TRY_ENV)
+TAO_EC_Event_Channel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->supplier_admin_->_this (ACE_TRY_ENV);
+  return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_EC_Event_Channel::destroy (CORBA::Environment &TAO_TRY_ENV)
+TAO_EC_Event_Channel::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->shutdown (TAO_TRY_ENV);
+  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Event_Channel::append_observer (
-       RtecEventChannelAdmin::Observer_ptr observer,
-       CORBA::Environment &ACE_IN_ENV)
+       RtecEventChannelAdmin::Observer_ptr observer
+       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->observer_strategy_->append_observer (observer, ACE_IN_ENV);
+  return this->observer_strategy_->append_observer (observer TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Event_Channel::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle,
-       CORBA::Environment &ACE_IN_ENV)
+       RtecEventChannelAdmin::Observer_Handle handle
+       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->observer_strategy_->remove_observer (handle, ACE_IN_ENV);
+  this->observer_strategy_->remove_observer (handle TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index fcfa8648742..e731eb6fb4e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -120,11 +120,11 @@ public:
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (CORBA::Environment &env = TAO_default_environment ());
+  virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (CORBA::Environment &env = TAO_default_environment ());
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Access the dispatching module....
   TAO_EC_Dispatching* dispatching (void) const;
@@ -187,21 +187,21 @@ public:
 
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_EC_ProxyPushConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier*,
-                            CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_EC_ProxyPushSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier*
+                            TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
@@ -226,31 +226,31 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   /// The default implementation is:
-  ///    this->consumer_admin ()->_this (env);
+  ///    this->consumer_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (CORBA::Environment& env)
+      for_consumers (TAO_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The default implementation is:
-  ///    this->supplier_admin ()->_this (env);
+  ///    this->supplier_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (CORBA::Environment& env)
+      for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Commit suicide.
-  virtual void destroy (CORBA::Environment &env)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
+      append_observer (RtecEventChannelAdmin::Observer_ptr
+                       TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                       CORBA::Environment &env)
+      remove_observer (RtecEventChannelAdmin::Observer_Handle
+                       TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index b8b1b852034..f2e738b5b2b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -37,8 +37,8 @@ TAO_EC_Filter::size (void) const
 }
 
 void
-TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&
+                             TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -48,44 +48,44 @@ TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&,
 
 int
 TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push (event, qos_info, ACE_TRY_ENV);
+  this->push (event, qos_info TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return 1;
 }
 
 int
 TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push_nocopy (event, qos_info, ACE_TRY_ENV);
+  this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return 1;
 }
 
 void
 TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event,
-                          TAO_EC_QOS_Info& qos_info,
-                          CORBA::Environment& ACE_TRY_ENV)
+                          TAO_EC_QOS_Info& qos_info
+                          TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 TAO_EC_QOS_Info& qos_info
+                                 TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -112,8 +112,8 @@ TAO_EC_Null_Filter::can_match (const RtecEventComm::EventHeader&) const
 int
 TAO_EC_Null_Filter::add_dependencies (
       const RtecEventComm::EventHeader &,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info &
+      TAO_ENV_ARG_DECL_NOT_USED)
 
 {
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index 206ec8cd122..a9d6c03e718 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -85,11 +85,11 @@ public:
    * not const then filter can take ownership of the event.
    */
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env) = 0;
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL) = 0;
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env) = 0;
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL) = 0;
 
   /**
    * This is called by the children when they accept an event and
@@ -98,11 +98,11 @@ public:
    * not const then filter can take ownership of the event.
    */
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env) = 0;
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL) = 0;
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env) = 0;
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL) = 0;
 
   /// Clear any saved state, must reset and assume no events have been
   /// received.
@@ -133,8 +133,8 @@ public:
    * fairly soon.
    */
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info& qos_info,
-                                CORBA::Environment &ACE_TRY_ENV) = 0;
+                                const TAO_EC_QOS_Info& qos_info
+                                TAO_ENV_ARG_DECL) = 0;
 
   /**
    * Obtain the QOS information for this filter, the default
@@ -142,8 +142,8 @@ public:
    * support scheduling information implement this method.
    * Returns 0 on success and -1 on failure
    */
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
 
 private:
   /// The parent...
@@ -174,23 +174,23 @@ public:
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index dfcc830e1d7..fdb29f3ccbb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -22,8 +22,8 @@ TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Null_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *,
-    RtecEventChannelAdmin::ConsumerQOS&,
-    CORBA::Environment&) const
+    RtecEventChannelAdmin::ConsumerQOS&
+    TAO_ENV_ARG_DECL_NOT_USED) const
 {
   return new TAO_EC_Null_Filter;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index eb494ecccae..7a81a583244 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -46,8 +46,8 @@ public:
   /// returned.
   virtual TAO_EC_Filter*
       build (TAO_EC_ProxyPushSupplier *supplier,
-             RtecEventChannelAdmin::ConsumerQOS& qos,
-             CORBA::Environment &ACE_TRY_ENV) const = 0;
+             RtecEventChannelAdmin::ConsumerQOS& qos
+             TAO_ENV_ARG_DECL) const = 0;
 
 };
 
@@ -71,8 +71,8 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos,
-                        CORBA::Environment &ACE_TRY_ENV) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos
+                        TAO_ENV_ARG_DECL) const;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 2987beec5f5..87f78dfc03f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -69,18 +69,18 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void)
 
 void
 TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
-                           RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           RtecEventChannelAdmin::EventChannel_ptr lcl_ec
+                           TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->init_i (rmt_ec, lcl_ec, ACE_TRY_ENV);
+  this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
-                             RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
-                             CORBA::Environment &)
+                             RtecEventChannelAdmin::EventChannel_ptr lcl_ec
+                             TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (!CORBA::is_nil (this->rmt_ec_.in ()))
     return;
@@ -92,16 +92,16 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
 }
 
 void
-TAO_EC_Gateway_IIOP::close (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Gateway_IIOP::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->close_i (ACE_TRY_ENV);
+  this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
 void
-TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
 
@@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
             continue;
           ACE_TRY
             {
-              consumer->disconnect_push_consumer (ACE_TRY_ENV);
+              consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -132,7 +132,7 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
 
   if (!CORBA::is_nil (this->default_consumer_proxy_.in ()))
     {
-      this->default_consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+      this->default_consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->default_consumer_proxy_ =
@@ -141,7 +141,7 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
 
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+      this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->supplier_proxy_ =
@@ -151,8 +151,8 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_EC_Gateway_IIOP::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos,
-    CORBA::Environment& ACE_TRY_ENV)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (c_qos.dependencies.length () <= 1)
@@ -167,15 +167,15 @@ TAO_EC_Gateway_IIOP::update_consumer (
       return;
     }
 
-  this->update_consumer_i (c_qos, ACE_TRY_ENV);
+  this->update_consumer_i (c_qos TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Gateway_IIOP::update_consumer_i (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos,
-    CORBA::Environment& ACE_TRY_ENV)
+    const RtecEventChannelAdmin::ConsumerQOS& c_qos
+    TAO_ENV_ARG_DECL)
 {
-  this->close_i (ACE_TRY_ENV);
+  this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->lcl_ec_.in ())
@@ -186,7 +186,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->lcl_ec_->for_suppliers (ACE_TRY_ENV);
+    this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Change the RT_Info in the consumer QoS.
@@ -222,7 +222,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
           //ACE_DEBUG ((LM_DEBUG,
           //            "ECG (%t)    binding source %d\n",
           //            sid));
-          proxy = supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+          proxy = supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->consumer_proxy_map_.bind (sid, proxy);
         }
@@ -237,7 +237,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
       // Obtain a reference to our supplier personality...
       RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (ACE_TRY_ENV);
+        this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // For each subscription by source build the set of publications
@@ -280,8 +280,8 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
           // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Supplier "));
           // ACE_SupplierQOS_Factory::debug (pub);
           (*j).int_id_->connect_push_supplier (supplier_ref.in (),
-                                               pub,
-                                               ACE_TRY_ENV);
+                                               pub
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -316,59 +316,59 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
       // Obtain a reference to our supplier personality...
       RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (ACE_TRY_ENV);
+        this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Obtain the consumer....
       this->default_consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       pub.publications.length (c);
       // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier "));
       // ACE_SupplierQOS_Factory::debug (pub);
       this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (),
-                                                            pub,
-                                                            ACE_TRY_ENV);
+                                                            pub
+                                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
 
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->rmt_ec_->for_consumers (ACE_TRY_ENV);
+    this->rmt_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_is_active_ = 1;
   RtecEventComm::PushConsumer_var consumer_ref =
-    this->consumer_._this (ACE_TRY_ENV);
+    this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer "));
   // ACE_ConsumerQOS_Factory::debug (sub);
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
-                                                sub,
-                                                ACE_TRY_ENV);
+                                                sub
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 void
 TAO_EC_Gateway_IIOP::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS&,
-    CORBA::Environment&)
+    const RtecEventChannelAdmin::SupplierQOS&
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing...
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_consumer (CORBA::Environment &)
+TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //             "ECG (%t): Supplier-consumer received "
@@ -376,7 +376,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (CORBA::Environment &)
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_supplier (CORBA::Environment &)
+TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //            "ECG (%t): Supplier received "
@@ -384,8 +384,8 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (CORBA::Environment &)
 }
 
 void
-TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events,
-                           CORBA::Environment & ACE_TRY_ENV)
+TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
+                           TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n"));
 
@@ -429,7 +429,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events,
       out[0].header.ttl--;
 
       // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n"));
-      proxy->push (out, ACE_TRY_ENV);
+      proxy->push (out TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -441,7 +441,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events,
     if (this->busy_count_ == 0 && this->update_posted_ != 0)
       {
         this->update_posted_ = 0;
-        this->update_consumer_i (this->c_qos_, ACE_TRY_ENV);
+        this->update_consumer_i (this->c_qos_ TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -449,22 +449,22 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events,
 }
 
 int
-TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
-  this->close_i (ACE_TRY_ENV);
+  this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->supplier_is_active_)
     {
       PortableServer::POA_var poa =
-        this->supplier_._default_POA (ACE_TRY_ENV);
+        this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->supplier_, ACE_TRY_ENV);
+        poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       this->supplier_is_active_ = 0;
     }
@@ -472,12 +472,12 @@ TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& ACE_TRY_ENV)
   if (this->consumer_is_active_)
     {
       PortableServer::POA_var poa =
-        this->consumer_._default_POA (ACE_TRY_ENV);
+        this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->consumer_, ACE_TRY_ENV);
+        poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       this->consumer_is_active_ = 0;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 25f04944d38..35f630050e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -49,7 +49,7 @@ public:
 
   /// The gateway must disconnect from all the relevant event channels,
   /// or any other communication media (such as multicast groups).
-  virtual void close (CORBA::Environment &env = TAO_default_environment ()) = 0;
+  virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Obtain and modify the observer handle.
   void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
@@ -99,43 +99,43 @@ public:
   /// To do its job this class requires to know the local and remote
   /// ECs it will connect to,
   void init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
-             RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
-             CORBA::Environment &ACE_TRY_ENV);
+             RtecEventChannelAdmin::EventChannel_ptr lcl_ec
+             TAO_ENV_ARG_DECL);
 
   /// The channel is disconnecting.
-  void disconnect_push_supplier (CORBA::Environment & = TAO_default_environment ());
+  void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// The channel is disconnecting.
-  void disconnect_push_consumer (CORBA::Environment & = TAO_default_environment ());
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// This is the Consumer side behavior, it pushes the events to the
   /// local event channel.
-  void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment & = TAO_default_environment ());
+  void push (const RtecEventComm::EventSet &events
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect and shutdown the gateway
-  int shutdown (CORBA::Environment & = TAO_default_environment ());
+  int shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // The following methods are documented in the base class.
-  virtual void close (CORBA::Environment &env = TAO_default_environment ());
-  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                                CORBA::Environment &env = TAO_default_environment ())
+  virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-                                CORBA::Environment &env = TAO_default_environment ())
+  virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void close_i (CORBA::Environment &);
+  void close_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
-  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                          CORBA::Environment& env);
+  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub
+                          TAO_ENV_ARG_DECL);
 
 protected:
   /// Do the real work in init()
   void init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
-               RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
-               CORBA::Environment &ACE_TRY_ENV);
+               RtecEventChannelAdmin::EventChannel_ptr lcl_ec
+               TAO_ENV_ARG_DECL);
 
 protected:
   /// Lock to synchronize internal changes
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 1704b9adf26..a4baa6b4b42 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -20,12 +20,12 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                            RtecScheduler::Scheduler_ptr rmt_sched,
                            RtecScheduler::Scheduler_ptr lcl_sched,
                            const char* lcl_name,
-                           const char* rmt_name,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           const char* rmt_name
+                           TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->init_i (rmt_ec, lcl_ec, ACE_TRY_ENV);
+  this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Should we throw a system exception here?
@@ -36,7 +36,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
     ACE_THROW (CORBA::BAD_PARAM ());
 
   this->rmt_info_ =
-    rmt_sched->create (rmt_name, ACE_TRY_ENV);
+    rmt_sched->create (rmt_name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ TODO Many things are hard-coded in the RT_Info here.
@@ -53,12 +53,12 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   0,
-                  RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
+                  RtecScheduler::OPERATION
+                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->lcl_info_ =
-    lcl_sched->create (lcl_name, ACE_TRY_ENV);
+    lcl_sched->create (lcl_name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   tv = ACE_Time_Value (0, 500);
@@ -70,7 +70,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   1,
-                  RtecScheduler::REMOTE_DEPENDANT,
-                  ACE_TRY_ENV);
+                  RtecScheduler::REMOTE_DEPENDANT
+                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 61c300147fa..d93e98634de 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -47,8 +47,8 @@ public:
              RtecScheduler::Scheduler_ptr rmt_sched,
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
-             const char* rmt_name,
-             CORBA::Environment &env = TAO_default_environment ());
+             const char* rmt_name
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 #include "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
index 9c740466376..1769c940240 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -29,8 +29,8 @@ TAO_ECG_UDP_Sender::get_local_addr (ACE_INET_Addr& addr)
 void
 TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                           RtecUDPAdmin::AddrServer_ptr addr_server,
-                          TAO_ECG_UDP_Out_Endpoint* endpoint,
-                          CORBA::Environment &)
+                          TAO_ECG_UDP_Out_Endpoint* endpoint
+                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->lcl_ec_ =
     RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec);
@@ -52,23 +52,23 @@ TAO_ECG_UDP_Sender::mtu (CORBA::ULong new_mtu)
 }
 
 void
-TAO_ECG_UDP_Sender::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_UDP_Sender::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->close (ACE_TRY_ENV);
+  this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
 }
 
 void
-TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub
+                          TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n"));
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     return;
 
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
-    this->close (ACE_TRY_ENV);
+    this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (sub.dependencies.length () == 0)
@@ -78,51 +78,51 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub,
   //ACE_SupplierQOS_Factory::debug (pub);
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->lcl_ec_->for_consumers (ACE_TRY_ENV);
+    this->lcl_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var consumer_ref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer "));
   //ACE_ConsumerQOS_Factory::debug (sub);
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
-                                                sub,
-                                                ACE_TRY_ENV);
+                                                sub
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Sender::close (CORBA::Environment &ACE_TRY_ENV)
+TAO_ECG_UDP_Sender::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Sender::disconnect_push_consumer (CORBA::Environment &)
+TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -131,8 +131,8 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (CORBA::Environment &)
 }
 
 void
-TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
-                          CORBA::Environment & ACE_TRY_ENV)
+TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n"));
@@ -170,7 +170,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
 
       // Grab the right mcast group for this event...
       RtecUDPAdmin::UDP_Addr udp_addr;
-      this->addr_server_->get_addr (header, udp_addr, ACE_TRY_ENV);
+      this->addr_server_->get_addr (header, udp_addr TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Start building the message
@@ -235,8 +235,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                    fragment_id,
                                    fragment_count,
                                    iov,
-                                   iovcnt,
-                                   ACE_TRY_ENV);
+                                   iovcnt
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
               fragment_id++;
               fragment_offset += max_fragment_payload;
@@ -263,8 +263,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                    fragment_id,
                                    fragment_count,
                                    iov,
-                                   iovcnt,
-                                   ACE_TRY_ENV);
+                                   iovcnt
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
               fragment_id++;
               fragment_offset += max_fragment_payload;
@@ -284,8 +284,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                    fragment_id,
                                    fragment_count,
                                    iov,
-                                   iovcnt,
-                                   ACE_TRY_ENV);
+                                   iovcnt
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
               fragment_id++;
               fragment_offset += fragment_size;
@@ -308,8 +308,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                fragment_id,
                                fragment_count,
                                iov,
-                               iovcnt,
-                               ACE_TRY_ENV);
+                               iovcnt
+                                TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           fragment_id++;
           fragment_offset += fragment_size;
@@ -333,8 +333,8 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                    CORBA::ULong fragment_id,
                                    CORBA::ULong fragment_count,
                                    iovec iov[],
-                                   int iovcnt,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   int iovcnt
+                                   TAO_ENV_ARG_DECL)
 {
   CORBA::ULong header[TAO_ECG_UDP_Sender::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
@@ -622,8 +622,8 @@ TAO_ECG_UDP_Request_Entry::fragment_buffer (CORBA::ULong fragment_offset)
 }
 
 void
-TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event,
-                                   CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event
+                                   TAO_ENV_ARG_DECL)
 {
   TAO_InputCDR cdr (&this->payload_,
                     ACE_static_cast(int,this->byte_order_));
@@ -659,8 +659,8 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                             RtecUDPAdmin::AddrServer_ptr addr_server,
                             ACE_Reactor *reactor,
                             const ACE_Time_Value &expire_interval,
-                            int max_timeout,
-                            CORBA::Environment &)
+                            int max_timeout
+                            TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->ignore_from_ = ignore_from;
 
@@ -683,14 +683,14 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
 }
 
 void
-TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub
+                            TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     return;
 
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
-    this->close (ACE_TRY_ENV);
+    this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (pub.publications.length () == 0)
@@ -698,51 +698,51 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub,
 
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->lcl_ec_->for_suppliers (ACE_TRY_ENV);
+    this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var supplier_ref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Receiver (%t) Gateway/Supplier "));
   // ACE_SupplierQOS_Factory::debug (pub);
 
   this->consumer_proxy_->connect_push_supplier (supplier_ref.in (),
-                                                pub,
-                                                ACE_TRY_ENV);
+                                                pub
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Receiver::close (CORBA::Environment &ACE_TRY_ENV)
+TAO_ECG_UDP_Receiver::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Receiver::disconnect_push_supplier (CORBA::Environment &)
+TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -751,9 +751,9 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (CORBA::Environment &)
 }
 
 void
-TAO_ECG_UDP_Receiver::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_UDP_Receiver::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->close (ACE_TRY_ENV);
+  this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
@@ -937,14 +937,14 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       RtecEventComm::EventSet event;
-      entry->int_id_->decode (event, ACE_TRY_ENV);
+      entry->int_id_->decode (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->consumer_proxy_->push (event, ACE_TRY_ENV);
+      this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //      ACE_DEBUG ((LM_DEBUG,
@@ -964,10 +964,10 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
 
 void
 TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
-                                RtecUDPAdmin::UDP_Addr_out addr,
-                                CORBA::Environment& env)
+                                RtecUDPAdmin::UDP_Addr_out addr
+                                TAO_ENV_ARG_DECL)
 {
-  this->addr_server_->get_addr (header, addr, env);
+  this->addr_server_->get_addr (header, addr TAO_ENV_ARG_PARAMETER);
 }
 
 int
@@ -1065,39 +1065,39 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
 }
 
 int
-TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
+                        TAO_ENV_ARG_DECL)
 {
   this->ec_ = RtecEventChannelAdmin::EventChannel::_duplicate (ec);
   RtecEventChannelAdmin::Observer_var obs =
-    this->observer_._this (ACE_TRY_ENV);
+    this->observer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->handle_ = this->ec_->append_observer (obs.in (), ACE_TRY_ENV);
+  this->handle_ = this->ec_->append_observer (obs.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-TAO_ECG_Mcast_EH::close (CORBA::Environment& ACE_TRY_ENV)
+TAO_ECG_Mcast_EH::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->handle_ == 0)
     return 0;
 
   RtecEventChannelAdmin::Observer_Handle h = this->handle_;
   this->handle_ = 0;
-  this->ec_->remove_observer (h, ACE_TRY_ENV);
+  this->ec_->remove_observer (h TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   {
     PortableServer::POA_var poa =
-      this->observer_._default_POA (ACE_TRY_ENV);
+      this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (&this->observer_, ACE_TRY_ENV);
+      poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
+    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
   }
 
@@ -1138,8 +1138,8 @@ TAO_ECG_Mcast_EH::unsubscribe (const ACE_INET_Addr &mcast_addr)
 
 void
 TAO_ECG_Mcast_EH::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& sub,
-    CORBA::Environment& ACE_TRY_ENV)
+    const RtecEventChannelAdmin::ConsumerQOS& sub
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG,
@@ -1167,7 +1167,7 @@ TAO_ECG_Mcast_EH::update_consumer (
       must_register = 1;
       RtecUDPAdmin::UDP_Addr addr;
 
-      this->receiver_->get_addr (header, addr, ACE_TRY_ENV);
+      this->receiver_->get_addr (header, addr TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_INET_Addr inet_addr (addr.port, addr.ipaddr);
@@ -1188,8 +1188,8 @@ TAO_ECG_Mcast_EH::update_consumer (
 }
 
 void
-TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS&,
-                                   CORBA::Environment&)
+TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS&
+                                   TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
@@ -1204,20 +1204,20 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh)
 
 void
 TAO_ECG_Mcast_EH::Observer::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& sub,
-    CORBA::Environment& ACE_TRY_ENV)
+    const RtecEventChannelAdmin::ConsumerQOS& sub
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->eh_->update_consumer (sub, ACE_TRY_ENV);
+  this->eh_->update_consumer (sub TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ECG_Mcast_EH::Observer::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS& pub,
-    CORBA::Environment& ACE_TRY_ENV)
+    const RtecEventChannelAdmin::SupplierQOS& pub
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->eh_->update_supplier (pub, ACE_TRY_ENV);
+  this->eh_->update_supplier (pub TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index 3631b5e24ad..73159a636e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -135,8 +135,8 @@ public:
    */
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              RtecUDPAdmin::AddrServer_ptr addr_server,
-             TAO_ECG_UDP_Out_Endpoint *endpoint,
-             CORBA::Environment &env = TAO_default_environment ());
+             TAO_ECG_UDP_Out_Endpoint *endpoint
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * The sender may need to fragment the message, otherwise the
@@ -149,21 +149,20 @@ public:
 
   /// Disconnect and shutdown the sender, no further connections will
   /// work unless init() is called again.
-  void shutdown (CORBA::Environment & = TAO_default_environment ());
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Connect (or reconnect) to the EC with the given subscriptions.
-  void open (RtecEventChannelAdmin::ConsumerQOS &sub,
-             CORBA::Environment &env = TAO_default_environment ());
+  void open (RtecEventChannelAdmin::ConsumerQOS &sub
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect from the EC, but reconnection is still possible.
-  void close (CORBA::Environment &env = TAO_default_environment ());
+  void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// The PushConsumer methods.
-  virtual void disconnect_push_consumer (CORBA::Environment & =
-                                             TAO_default_environment ())
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment & = TAO_default_environment ())
+  virtual void push (const RtecEventComm::EventSet &events
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -183,8 +182,8 @@ private:
                       CORBA::ULong fragment_id,
                       CORBA::ULong fragment_count,
                       iovec iov[],
-                      int iovcnt,
-                      CORBA::Environment &env = TAO_default_environment ());
+                      int iovcnt
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Count the number of fragments that will be required to send the
@@ -348,8 +347,8 @@ public:
   char* fragment_buffer (CORBA::ULong fragment_offset);
 
   /// Decode the events, the message must be complete.
-  void decode (RtecEventComm::EventSet& event,
-               CORBA::Environment &env = TAO_default_environment ());
+  void decode (RtecEventComm::EventSet& event
+               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Increment the timeout counter...
   void inc_timeout (void);
@@ -446,18 +445,18 @@ public:
              RtecUDPAdmin::AddrServer_ptr addr_server,
              ACE_Reactor *reactor,
              const ACE_Time_Value &expire_interval,
-             int max_timeout,
-             CORBA::Environment &env = TAO_default_environment ());
+             int max_timeout
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect and shutdown the gateway, no further connectsions
-  void shutdown (CORBA::Environment & = TAO_default_environment ());
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Connect to the EC using the given publications lists.
-  void open (RtecEventChannelAdmin::SupplierQOS& pub,
-             CORBA::Environment &env = TAO_default_environment ());
+  void open (RtecEventChannelAdmin::SupplierQOS& pub
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect to the EC.
-  virtual void close (CORBA::Environment &env = TAO_default_environment ());
+  virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * The Event_Handlers call this method when data is available at the
@@ -472,14 +471,13 @@ public:
                       const void* act);
 
   // The PushSupplier method.
-  virtual void disconnect_push_supplier (CORBA::Environment & =
-                                             TAO_default_environment ())
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Call the RtecUDPAdmin::AddrServer
   void get_addr (const RtecEventComm::EventHeader& header,
-                 RtecUDPAdmin::UDP_Addr_out addr,
-                 CORBA::Environment &env = TAO_default_environment ());
+                 RtecUDPAdmin::UDP_Addr_out addr
+                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 private:
   /// The remote and the local EC, so we can reconnect when the list changes.
@@ -589,15 +587,15 @@ public:
    * types and mcast groups) and the class registers itself with the
    * reactor.
    */
-  int open (RtecEventChannelAdmin::EventChannel_ptr ec,
-            CORBA::Environment &env = TAO_default_environment ());
+  int open (RtecEventChannelAdmin::EventChannel_ptr ec
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Remove ourselves from the event channel, unsubscribe from the
    * multicast groups, close the sockets and unsubscribe from the
    * reactor.
    */
-  int close (CORBA::Environment &env = TAO_default_environment ());
+  int close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Obtain the dgram, this is one of those "controlled violations of
@@ -611,11 +609,11 @@ public:
   virtual ACE_HANDLE get_handle (void) const;
 
   /// The Observer methods
-  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                        CORBA::Environment &env = TAO_default_environment ())
+  void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub,
-                        CORBA::Environment &env = TAO_default_environment ())
+  void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -637,14 +635,12 @@ public:
 
     // The Observer methods
     virtual void update_consumer (
-        const RtecEventChannelAdmin::ConsumerQOS& sub,
-        CORBA::Environment &env =
-            TAO_default_environment ())
+        const RtecEventChannelAdmin::ConsumerQOS& sub
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
     virtual void update_supplier (
-        const RtecEventChannelAdmin::SupplierQOS& pub,
-        CORBA::Environment &env =
-            TAO_default_environment ())
+        const RtecEventChannelAdmin::SupplierQOS& pub
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index abeeba51cf9..9106c478843 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -67,23 +67,23 @@ void
 TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& ACE_TRY_ENV)
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info, ACE_TRY_ENV);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     RtecEventComm::PushConsumer_ptr consumer,
                                     RtecEventComm::EventSet& event,
-                                    TAO_EC_QOS_Info&,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    TAO_EC_QOS_Info&
+                                    TAO_ENV_ARG_DECL)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, consumer, event, ACE_TRY_ENV);
+  this->task_.push (proxy, consumer, event TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 44ea2f5fa4a..97165aecb7b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -51,13 +51,13 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 32266bdd914..627c32801f0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -44,8 +44,8 @@ TAO_EC_Masked_Type_Filter::size (void) const
 
 int
 TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -56,7 +56,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -64,8 +64,8 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info,
-                                          CORBA::Environment& ACE_TRY_ENV)
+                                          TAO_EC_QOS_Info& qos_info
+                                          TAO_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -76,7 +76,7 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -84,15 +84,15 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &,
-                                 TAO_EC_QOS_Info &,
-                                 CORBA::Environment &)
+                                 TAO_EC_QOS_Info &
+                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &,
-                                        TAO_EC_QOS_Info &,
-                                        CORBA::Environment &)
+                                        TAO_EC_QOS_Info &
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -121,8 +121,8 @@ TAO_EC_Masked_Type_Filter::can_match (
 int
 TAO_EC_Masked_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info &
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 4caa321b9f6..6a2b6d12317 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -52,23 +52,23 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index 0caf0726a61..bed3ab7655b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -40,15 +40,15 @@ TAO_EC_Negation_Filter::size (void) const
 
 int
 TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                TAO_EC_QOS_Info& qos_info
+                                TAO_ENV_ARG_DECL)
 {
   int n =
-    this->child_->filter (event, qos_info, ACE_TRY_ENV);
+    this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -56,15 +56,15 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   int n =
-    this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
+    this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -72,15 +72,15 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&,
-                                 TAO_EC_QOS_Info&,
-                                 CORBA::Environment&)
+                                 TAO_EC_QOS_Info&
+                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                        TAO_EC_QOS_Info&,
-                                        CORBA::Environment&)
+                                        TAO_EC_QOS_Info&
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -106,8 +106,8 @@ TAO_EC_Negation_Filter::can_match (
 int
 TAO_EC_Negation_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info &
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index 219ea998789..caee63f3b70 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -50,23 +50,23 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index df75136d3b9..10260d6fbc0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -12,8 +12,8 @@ ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
 void
 TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
-      TAO_EC_ProxyPushConsumer *,
-      CORBA::Environment &)
+      TAO_EC_ProxyPushConsumer *
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -21,7 +21,7 @@ void
 TAO_EC_Null_Scheduling::init_event_qos (
     const RtecEventComm::EventHeader&,
     TAO_EC_ProxyPushConsumer *,
-    TAO_EC_QOS_Info&,
-    CORBA::Environment &)
+    TAO_EC_QOS_Info&
+    TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index bd1448395e7..b5ee1c9b97a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -40,16 +40,16 @@ public:
   /// Add all the dependencies between <supplier> and <consumer>
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV);
+      TAO_EC_ProxyPushConsumer *consumer
+      TAO_ENV_ARG_DECL);
 
   /// Initializes <qos_info> based on the QoS information for
   /// <consumer> and the event header.
   virtual void init_event_qos (
       const RtecEventComm::EventHeader& header,
       TAO_EC_ProxyPushConsumer *consumer,
-      TAO_EC_QOS_Info& qos_info,
-      CORBA::Environment &ACE_TRY_ENV);
+      TAO_EC_QOS_Info& qos_info
+      TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 31c23c4a409..6ea6950d196 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -24,8 +24,8 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Null_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr,
-       CORBA::Environment &ACE_TRY_ENV)
+       RtecEventChannelAdmin::Observer_ptr
+       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -38,8 +38,8 @@ TAO_EC_Null_ObserverStrategy::append_observer (
 
 void
 TAO_EC_Null_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle,
-       CORBA::Environment &ACE_TRY_ENV)
+       RtecEventChannelAdmin::Observer_Handle
+       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -49,26 +49,26 @@ TAO_EC_Null_ObserverStrategy::remove_observer (
 }
 
 void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*,
-                                         CORBA::Environment &)
+TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*,
-                                            CORBA::Environment &)
+TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*
+                                            TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*,
-                                         CORBA::Environment &)
+TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*,
-                                            CORBA::Environment &)
+TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*
+                                            TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -82,8 +82,8 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void)
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Basic_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr obs,
-       CORBA::Environment &ACE_TRY_ENV)
+       RtecEventChannelAdmin::Observer_ptr obs
+       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -106,15 +106,15 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
   }
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos, ACE_TRY_ENV);
+  this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  obs->update_consumer (c_qos, ACE_TRY_ENV);
+  obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos, ACE_TRY_ENV);
+  this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  obs->update_supplier (s_qos, ACE_TRY_ENV);
+  obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->handle_generator_;
@@ -123,8 +123,8 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
 
 void
 TAO_EC_Basic_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle,
-       CORBA::Environment &ACE_TRY_ENV)
+       RtecEventChannelAdmin::Observer_Handle handle
+       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -141,14 +141,14 @@ TAO_EC_Basic_ObserverStrategy::remove_observer (
 
 void
 TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushConsumer *consumer,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_EC_ProxyPushConsumer *consumer
+    TAO_ENV_ARG_DECL)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos, ACE_TRY_ENV);
+  this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -176,21 +176,21 @@ TAO_EC_Basic_ObserverStrategy::connected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_supplier (s_qos, ACE_TRY_ENV);
+      copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushConsumer* consumer,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_EC_ProxyPushConsumer* consumer
+    TAO_ENV_ARG_DECL)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos, ACE_TRY_ENV);
+  this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -218,21 +218,21 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_supplier (s_qos, ACE_TRY_ENV);
+      copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushSupplier* supplier,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_EC_ProxyPushSupplier* supplier
+    TAO_ENV_ARG_DECL)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos, ACE_TRY_ENV);
+  this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -260,21 +260,21 @@ TAO_EC_Basic_ObserverStrategy::connected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_consumer (c_qos, ACE_TRY_ENV);
+      copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushSupplier* supplier,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_EC_ProxyPushSupplier* supplier
+    TAO_ENV_ARG_DECL)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos, ACE_TRY_ENV);
+  this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -302,20 +302,20 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_consumer (c_qos, ACE_TRY_ENV);
+      copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::ConsumerQOS &qos,
-      CORBA::Environment &ACE_TRY_ENV)
+      RtecEventChannelAdmin::ConsumerQOS &qos
+      TAO_ENV_ARG_DECL)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Supplier_Headers worker (headers);
-  this->event_channel_->consumer_admin ()->for_each (&worker, ACE_TRY_ENV);
+  this->event_channel_->consumer_admin ()->for_each (&worker TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
@@ -336,14 +336,14 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::SupplierQOS &qos,
-      CORBA::Environment &ACE_TRY_ENV)
+      RtecEventChannelAdmin::SupplierQOS &qos
+      TAO_ENV_ARG_DECL)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Consumer_Headers worker (headers);
-  this->event_channel_->supplier_admin ()->for_each (&worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->supplier_admin ()->for_each (&worker
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   qos.publications.length (headers.current_size ());
@@ -358,8 +358,8 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 // ****************************************************************
 
 void
-TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier,
-                                          CORBA::Environment &)
+TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier
+                                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   const RtecEventChannelAdmin::ConsumerQOS& sub =
     supplier->subscriptions ();
@@ -380,8 +380,8 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier,
 // ****************************************************************
 
 void
-TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer,
-                                          CORBA::Environment &)
+TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer
+                                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   const RtecEventChannelAdmin::SupplierQOS& pub =
     consumer->publications ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index fed699df0aa..1949b1047e9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -54,16 +54,16 @@ public:
 
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
+      append_observer (RtecEventChannelAdmin::Observer_ptr
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
     = 0;
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle,
-                        CORBA::Environment &env)
+                        RtecEventChannelAdmin::Observer_Handle
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -72,17 +72,17 @@ public:
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&) = 0;
+  virtual void connected (TAO_EC_ProxyPushConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED) = 0;
 };
 
 // ****************************************************************
@@ -103,27 +103,27 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
+      append_observer (RtecEventChannelAdmin::Observer_ptr
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle,
-                        CORBA::Environment &env)
+                        RtecEventChannelAdmin::Observer_Handle
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_EC_ProxyPushConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 };
 
 // ****************************************************************
@@ -155,27 +155,27 @@ public:
 
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
+      append_observer (RtecEventChannelAdmin::Observer_ptr
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle,
-                        CORBA::Environment &env)
+                        RtecEventChannelAdmin::Observer_Handle
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
+  virtual void connected (TAO_EC_ProxyPushConsumer*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer*
+                             TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void connected (TAO_EC_ProxyPushSupplier*
+                          TAO_ENV_ARG_DECL_NOT_USED);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier*
+                             TAO_ENV_ARG_DECL_NOT_USED);
 
 
   struct Observer_Entry
@@ -222,10 +222,10 @@ public:
 
 protected:
   /// Helper functions to compute the consumer and supplier QOS.
-  void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos,
-                 CORBA::Environment &env);
-  void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos,
-                 CORBA::Environment &env);
+  void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos
+                 TAO_ENV_ARG_DECL);
+  void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos
+                 TAO_ENV_ARG_DECL);
 
 protected:
   /// The event channel.
@@ -250,8 +250,8 @@ public:
   /// Constructor
   TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
@@ -265,8 +265,8 @@ public:
   /// Constructor
   TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
-  virtual void work (TAO_EC_ProxyPushConsumer *consumer,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_EC_ProxyPushConsumer *consumer
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 0104d861d3f..05db009ac83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -60,7 +60,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
 
   ACE_TRY_NEW_ENV
     {
-      this->shutdown (ACE_TRY_ENV);
+      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -71,8 +71,8 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
 }
 
 void
-TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
+                                       TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -98,7 +98,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier,
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
           ACE_DEBUG ((LM_DEBUG, "  matched\n"));
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
-          this->collection_->connected (supplier, ACE_TRY_ENV);
+          this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           return;
         }
@@ -109,8 +109,8 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier,
 }
 
 void
-TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                         CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
+                                         TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -131,30 +131,30 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier,
       if (supplier->can_match (event.header))
         {
           //          ACE_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
-          this->collection_->connected (supplier, ACE_TRY_ENV);
+          this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           return;
         }
     }
-  this->collection_->disconnected (supplier, ACE_TRY_ENV);
+  this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier
+                                          TAO_ENV_ARG_DECL)
 {
-  this->collection_->disconnected (supplier, ACE_TRY_ENV);
+  this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_Per_Supplier_Filter::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Per_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->collection_->shutdown (ACE_TRY_ENV);
+  this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event
+                                     TAO_ENV_ARG_DECL)
 {
   TAO_EC_Scheduling_Strategy* scheduling_strategy =
     this->event_channel_->scheduling_strategy ();
@@ -178,8 +178,8 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
 
         scheduling_strategy->init_event_qos (e.header,
                                              this->consumer_,
-                                             event_info,
-                                             ACE_TRY_ENV);
+                                             event_info
+                                              TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
 
@@ -190,7 +190,7 @@ TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
       // until push() returns.
 
       TAO_EC_Filter_Worker worker (single_event, event_info);
-      this->collection_->for_each (&worker, ACE_TRY_ENV);
+      this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 8bde52ff087..efa599a3dc4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -50,15 +50,15 @@ public:
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier,
-                            CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
-  virtual void shutdown (CORBA::Environment &env);
-  virtual void push (const RtecEventComm::EventSet& event,
-                     CORBA::Environment &);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
+                             TAO_ENV_ARG_DECL);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void push (const RtecEventComm::EventSet& event
+                     TAO_ENV_ARG_DECL_NOT_USED);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index d5b48b16610..4a4296b9e19 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -24,8 +24,8 @@ TAO_EC_Prefix_Filter_Builder::~TAO_EC_Prefix_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Prefix_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos,
-    CORBA::Environment&) const
+    RtecEventChannelAdmin::ConsumerQOS& qos
+    TAO_ENV_ARG_DECL_NOT_USED) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index 02989dcc872..9622fb15350 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -45,8 +45,8 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos,
-                        CORBA::Environment &env) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos
+                        TAO_ENV_ARG_DECL) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 8d685ccc521..6f31edc67ae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -40,7 +40,7 @@ TAO_EC_Priority_Dispatching::activate (void)
      ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   for (int i = 0; i < this->ntasks_; ++i)
     {
       ACE_TRY
@@ -51,7 +51,7 @@ TAO_EC_Priority_Dispatching::activate (void)
           ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period);
 
           RtecScheduler::handle_t rt_info =
-            this->scheduler_->create (buf, ACE_TRY_ENV);
+            this->scheduler_->create (buf TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->scheduler_->set (rt_info,
@@ -63,8 +63,8 @@ TAO_EC_Priority_Dispatching::activate (void)
                                  RtecScheduler::VERY_LOW_IMPORTANCE,
                                  0, // quantum
                                  1, // threads
-                                 RtecScheduler::OPERATION,
-                                 ACE_TRY_ENV);
+                                 RtecScheduler::OPERATION
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -112,19 +112,19 @@ void
 TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info, ACE_TRY_ENV);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          TAO_EC_QOS_Info& qos_info
+                                          TAO_ENV_ARG_DECL)
 {
   if (this->tasks_ == 0)
     this->activate ();
@@ -137,5 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     }
 
 
-  this->tasks_[i]->push (proxy, consumer, event, ACE_TRY_ENV);
+  this->tasks_[i]->push (proxy, consumer, event TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 313e5ec3b35..f8b78ed2c78 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -59,13 +59,13 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index e53975daa2c..047a20fa5c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -18,8 +18,8 @@ TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void)
 void
 TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_EC_ProxyPushConsumer *consumer
+      TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n",
               supplier, consumer));
@@ -38,12 +38,12 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
       this->scheduler_->priority (qos_info.rt_info,
                                   os_priority,
                                   p_subpriority,
-                                  p_priority,
-                                  ACE_TRY_ENV);
+                                  p_priority
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       qos_info.preemption_priority = p_priority;
 
-      supplier->add_dependencies (header, qos_info, ACE_TRY_ENV);
+      supplier->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -52,8 +52,8 @@ void
 TAO_EC_Priority_Scheduling::init_event_qos (
     const RtecEventComm::EventHeader &header,
     TAO_EC_ProxyPushConsumer *consumer,
-    TAO_EC_QOS_Info &qos_info,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_EC_QOS_Info &qos_info
+    TAO_ENV_ARG_DECL)
 {
   const RtecEventChannelAdmin::SupplierQOS& qos =
     consumer->publications ();
@@ -73,8 +73,8 @@ TAO_EC_Priority_Scheduling::init_event_qos (
       this->scheduler_->priority (qos_info.rt_info,
                                   os_priority,
                                   p_subpriority,
-                                  p_priority,
-                                  ACE_TRY_ENV);
+                                  p_priority
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       qos_info.preemption_priority = p_priority;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index 72c6cdb9095..4a3acc9369d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -45,16 +45,16 @@ public:
   /// Add all the dependencies between <supplier> and <consumer>
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV);
+      TAO_EC_ProxyPushConsumer *consumer
+      TAO_ENV_ARG_DECL);
 
   /// Initializes <qos_info> based on the QoS information for
   /// <consumer> and the event header.
   virtual void init_event_qos (
       const RtecEventComm::EventHeader& header,
       TAO_EC_ProxyPushConsumer *consumer,
-      TAO_EC_QOS_Info& qos_info,
-      CORBA::Environment &ACE_TRY_ENV);
+      TAO_EC_QOS_Info& qos_info
+      TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling
@@ -63,7 +63,7 @@ private:
                               (const TAO_EC_Priority_Scheduling&))
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (CORBA::Environment& env);
+  void init_rt_info (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index b3907480515..d8ab620c32b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -38,8 +38,8 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
 
 CORBA::Boolean
 TAO_EC_ProxyPushConsumer::supplier_non_existent (
-      CORBA::Boolean_out disconnected,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Boolean_out disconnected
+      TAO_ENV_ARG_DECL)
 {
   CORBA::Object_var supplier;
   {
@@ -62,15 +62,15 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return supplier->_non_existent (ACE_TRY_ENV);
+  return supplier->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier
+                                     TAO_ENV_ARG_DECL)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -79,12 +79,12 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier,
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->connected (supplier, ACE_TRY_ENV);
+  ace_mon.filter->connected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier
+                                       TAO_ENV_ARG_DECL)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -93,12 +93,12 @@ TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier,
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->reconnected (supplier, ACE_TRY_ENV);
+  ace_mon.filter->reconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier
+                                        TAO_ENV_ARG_DECL)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -107,29 +107,29 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier,
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->disconnected (supplier, ACE_TRY_ENV);
+  ace_mon.filter->disconnected (supplier TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*,
-                                     CORBA::Environment &)
+TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*,
-                                       CORBA::Environment &)
+TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*
+                                       TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*,
-                                        CORBA::Environment &)
+TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventComm::PushSupplier_var supplier;
 
@@ -144,14 +144,14 @@ TAO_EC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
     if (this->filter_ != 0)
       {
-        this->filter_->shutdown (ACE_TRY_ENV);
+        this->filter_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
         this->cleanup_i ();
       }
   }
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -159,7 +159,7 @@ TAO_EC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      supplier->disconnect_push_supplier (ACE_TRY_ENV);
+      supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -186,14 +186,14 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_EC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var result;
   ACE_TRY
     {
       result =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -205,17 +205,17 @@ TAO_EC_ProxyPushConsumer::activate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_EC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -253,8 +253,8 @@ TAO_EC_ProxyPushConsumer::_decr_refcnt (void)
 void
 TAO_EC_ProxyPushConsumer::connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
-      const RtecEventChannelAdmin::SupplierQOS& qos,
-      CORBA::Environment &ACE_TRY_ENV)
+      const RtecEventChannelAdmin::SupplierQOS& qos
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -285,7 +285,7 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this, ACE_TRY_ENV);
+          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -311,12 +311,12 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this, ACE_TRY_ENV);
+  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -328,13 +328,13 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
 
   // No need to keep the lock, the filter_ class is supposed to be
   // thread safe....
-  ace_mon.filter->push (event, ACE_TRY_ENV);
+  ace_mon.filter->push (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushSupplier_var supplier;
@@ -356,7 +356,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
+  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -368,7 +368,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
     {
       ACE_TRY
         {
-          supplier->disconnect_push_supplier (ACE_TRY_ENV);
+          supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -381,19 +381,19 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
 }
 
 PortableServer::POA_ptr
-TAO_EC_ProxyPushConsumer::_default_POA (CORBA::Environment&)
+TAO_EC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_ProxyPushConsumer::_add_ref (CORBA::Environment &)
+TAO_EC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_ProxyPushConsumer::_remove_ref (CORBA::Environment &)
+TAO_EC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 20a4f41e712..902912a2183 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -62,10 +62,10 @@ public:
   virtual ~TAO_EC_ProxyPushConsumer (void);
 
   /// Activate in the POA
-  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Return 0 if no supplier is connected...
   CORBA::Boolean is_connected (void) const;
@@ -82,29 +82,29 @@ public:
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected,
-                                        CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
+                                        TAO_ENV_ARG_DECL);
 
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier,
-                            CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
+                             TAO_ENV_ARG_DECL);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
-  virtual void connected (TAO_EC_ProxyPushConsumer* consumer,
-                          CORBA::Environment &env);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer,
-                            CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer,
-                             CORBA::Environment &env);
+  virtual void connected (TAO_EC_ProxyPushConsumer* consumer
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer
+                             TAO_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (CORBA::Environment&);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// The QoS (subscription) used to connect to the EC, assumes the
   /// locks are held, use with care!
@@ -117,22 +117,20 @@ public:
   // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
-                const RtecEventChannelAdmin::SupplierQOS& qos,
-                CORBA::Environment &)
+                const RtecEventChannelAdmin::SupplierQOS& qos
+                TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected));
-  virtual void push (const RtecEventComm::EventSet& event,
-                     CORBA::Environment &)
+  virtual void push (const RtecEventComm::EventSet& event
+                     TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index e01f8476005..6ceb4cf2028 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -38,55 +38,55 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer
+                                     TAO_ENV_ARG_DECL)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
-                                      consumer,
-                                      ACE_TRY_ENV);
+                                      consumer
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer
+                                       TAO_ENV_ARG_DECL)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
-                                      consumer,
-                                      ACE_TRY_ENV);
+                                      consumer
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*,
-                                        CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*,
-                                     CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*,
-                                     CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*,
-                                        CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -106,7 +106,7 @@ TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
       this->cleanup_i ();
   }
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -114,7 +114,7 @@ TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      consumer->disconnect_push_consumer (ACE_TRY_ENV);
+      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -138,14 +138,14 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var result;
   ACE_TRY
     {
       result =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -157,17 +157,17 @@ TAO_EC_ProxyPushSupplier::activate (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (())
+TAO_EC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (())
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -205,8 +205,8 @@ TAO_EC_ProxyPushSupplier::_decr_refcnt (void)
 void
 TAO_EC_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
-      const RtecEventChannelAdmin::ConsumerQOS& qos,
-      CORBA::Environment &ACE_TRY_ENV)
+      const RtecEventChannelAdmin::ConsumerQOS& qos
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError))
@@ -235,8 +235,8 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
         this->qos_ = qos;
         this->child_ =
           this->event_channel_->filter_builder ()->build (this,
-                                                          this->qos_,
-                                                          ACE_TRY_ENV);
+                                                          this->qos_
+                                                           TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         this->adopt_child (this->child_);
@@ -250,7 +250,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this, ACE_TRY_ENV);
+          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -271,20 +271,20 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
     this->child_ =
       this->event_channel_->filter_builder ()->build (this,
-                                                      this->qos_,
-                                                      ACE_TRY_ENV);
+                                                      this->qos_
+                                                       TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     this->adopt_child (this->child_);
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this, ACE_TRY_ENV);
+  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushConsumer_var consumer;
@@ -305,7 +305,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
+  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!connected)
@@ -317,7 +317,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
     {
       ACE_TRY
         {
-          consumer->disconnect_push_consumer (ACE_TRY_ENV);
+          consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -332,7 +332,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
 }
 
 void
-TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
@@ -345,7 +345,7 @@ TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_EC_ProxyPushSupplier::resume_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::resume_connection (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
@@ -361,8 +361,8 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel,TAO_EC_ProxyPushSuppli
 
 int
 TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
-                                  TAO_EC_QOS_Info& qos_info,
-                                  CORBA::Environment& ACE_TRY_ENV)
+                                  TAO_EC_QOS_Info& qos_info
+                                  TAO_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -379,7 +379,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
       return 0;
 
     result =
-      this->child_->filter (event, qos_info, ACE_TRY_ENV);
+      this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
   }
   return result;
@@ -387,8 +387,8 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
-                                         TAO_EC_QOS_Info& qos_info,
-                                         CORBA::Environment& ACE_TRY_ENV)
+                                         TAO_EC_QOS_Info& qos_info
+                                         TAO_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -405,7 +405,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
       return 0;
 
     result =
-      this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
+      this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
   }
   return result;
@@ -413,8 +413,8 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
-                                TAO_EC_QOS_Info& qos_info,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                TAO_EC_QOS_Info& qos_info
+                                TAO_ENV_ARG_DECL)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -449,8 +449,8 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
     this->event_channel_->dispatching ()->push (this,
                                                 consumer.in (),
                                                 event,
-                                                qos_info,
-                                                ACE_TRY_ENV);
+                                                qos_info
+                                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -460,8 +460,8 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
 
 void
 TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
-                                       TAO_EC_QOS_Info& qos_info,
-                                       CORBA::Environment& ACE_TRY_ENV)
+                                       TAO_EC_QOS_Info& qos_info
+                                       TAO_ENV_ARG_DECL)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -495,8 +495,8 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
     this->event_channel_->dispatching ()->push_nocopy (this,
                                                        consumer.in (),
                                                        event,
-                                                       qos_info,
-                                                       ACE_TRY_ENV);
+                                                       qos_info
+                                                        TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -507,8 +507,8 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_ProxyPushSupplier::push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event,
-    CORBA::Environment& ACE_TRY_ENV)
+    const RtecEventComm::EventSet& event
+    TAO_ENV_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (
@@ -525,7 +525,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
 
   ACE_TRY
     {
-      consumer->push (event, ACE_TRY_ENV);
+      consumer->push (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -542,7 +542,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
           TAO_EC_ConsumerControl *control =
             this->event_channel_->consumer_control ();
 
-          control->consumer_not_exist (this, ACE_TRY_ENV);
+          control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -561,8 +561,8 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
             this->event_channel_->consumer_control ();
 
           control->system_exception (this,
-                                     sysex,
-                                     ACE_TRY_ENV);
+                                     sysex
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -576,12 +576,12 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
 void
 TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
-    const RtecEventComm::EventSet& event,
-    CORBA::Environment& ACE_TRY_ENV)
+    const RtecEventComm::EventSet& event
+    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      consumer->push (event, ACE_TRY_ENV);
+      consumer->push (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -589,7 +589,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
       TAO_EC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this, ACE_TRY_ENV);
+      control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -598,8 +598,8 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
         this->event_channel_->consumer_control ();
 
       control->system_exception (this,
-                                 sysex,
-                                 ACE_TRY_ENV);
+                                 sysex
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_CATCHANY
@@ -611,8 +611,8 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
 
 CORBA::Boolean
 TAO_EC_ProxyPushSupplier::consumer_non_existent (
-      CORBA::Boolean_out disconnected,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::Boolean_out disconnected
+      TAO_ENV_ARG_DECL)
 {
   CORBA::Object_var consumer;
   {
@@ -632,7 +632,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return consumer->_non_existent (ACE_TRY_ENV);
+  return consumer->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -669,8 +669,8 @@ TAO_EC_ProxyPushSupplier::can_match (
 int
 TAO_EC_ProxyPushSupplier::add_dependencies (
       const RtecEventComm::EventHeader &header,
-      const TAO_EC_QOS_Info &qos_info,
-      CORBA::Environment &ACE_TRY_ENV)
+      const TAO_EC_QOS_Info &qos_info
+      TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
           ACE_Lock, ace_mon, *this->lock_,
@@ -678,24 +678,24 @@ TAO_EC_ProxyPushSupplier::add_dependencies (
   ACE_CHECK_RETURN (0);
 
   return this->child_->add_dependencies (header,
-                                         qos_info,
-                                         ACE_TRY_ENV);
+                                         qos_info
+                                          TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_EC_ProxyPushSupplier::_default_POA (CORBA::Environment&)
+TAO_EC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_ProxyPushSupplier::_add_ref (CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_ProxyPushSupplier::_remove_ref (CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index f8cb972796f..7a74c6c5c83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -62,10 +62,10 @@ public:
   virtual ~TAO_EC_ProxyPushSupplier (void);
 
   /// Activate in the POA
-  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_SPEC (());
+  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (());
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected (void) const;
@@ -84,55 +84,55 @@ public:
 
   /// Concrete implementations can use this methods to keep track of
   /// the suppliers that publish its events.
-  virtual void connected (TAO_EC_ProxyPushConsumer *consumer,
-                          CORBA::Environment &env);
-  virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer,
-                            CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer,
-                            CORBA::Environment &env);
+  virtual void connected (TAO_EC_ProxyPushConsumer *consumer
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer
+                            TAO_ENV_ARG_DECL);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier,
-                          CORBA::Environment &env);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier,
-                            CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                             CORBA::Environment &env);
+  virtual void connected (TAO_EC_ProxyPushSupplier *supplier
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
+                             TAO_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (CORBA::Environment &env);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Pushes to the consumer, verifies that it is connected and that it
   /// is not suspended.
   void push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet &event,
-                         CORBA::Environment &env);
+                         const RtecEventComm::EventSet &event
+                         TAO_ENV_ARG_DECL);
   void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
-                                  const RtecEventComm::EventSet &event,
-                                  CORBA::Environment &env);
+                                  const RtecEventComm::EventSet &event
+                                  TAO_ENV_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
    * it is disconnected then it returns true and sets the
    * <disconnected> flag.
    */
-  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected,
-                                        CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
+                                        TAO_ENV_ARG_DECL);
 
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
-                const RtecEventChannelAdmin::ConsumerQOS &qos,
-                CORBA::Environment &)
+                const RtecEventChannelAdmin::ConsumerQOS &qos
+                TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (CORBA::Environment &)
+  virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (CORBA::Environment &)
+  virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -141,28 +141,28 @@ public:
 
   // = The TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet &event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment &env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info &qos_info,
-                             CORBA::Environment &env);
+                             TAO_EC_QOS_Info &qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment &env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet &event,
-                            TAO_EC_QOS_Info &qos_info,
-                            CORBA::Environment &env);
+                            TAO_EC_QOS_Info &qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader &header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader &header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV);
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index 588190fd033..7620c20acae 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -36,11 +36,11 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void)
 
 void
 TAO_EC_Reactive_ConsumerControl::query_consumers (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Ping_Consumer worker (this);
-  this->event_channel_->consumer_admin ()->for_each (&worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->consumer_admin ()->for_each (&worker
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -55,27 +55,27 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout (
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types,
-                                                     ACE_TRY_ENV);
+        this->policy_current_->get_policy_overrides (types
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the consumers...
-      this->query_consumers (ACE_TRY_ENV);
+      this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::SET_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -101,13 +101,13 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (tmp.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -121,8 +121,8 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any,
-               ACE_TRY_ENV);
+               any
+                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -144,14 +144,14 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void)
 
 void
 TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
-      TAO_EC_ProxyPushSupplier *proxy,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_EC_ProxyPushSupplier *proxy
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Consumer %x does not exists\n", long(proxy)));
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -166,8 +166,8 @@ TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
 void
 TAO_EC_Reactive_ConsumerControl::system_exception (
       TAO_EC_ProxyPushSupplier *proxy,
-      CORBA::SystemException & /* exception */,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::SystemException & /* exception */
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -181,7 +181,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -211,25 +211,25 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
+                            TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        supplier->consumer_non_existent (disconnected,
-                                         ACE_TRY_ENV);
+        supplier->consumer_non_existent (disconnected
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+          this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -237,7 +237,7 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier,
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->consumer_not_exist (supplier, ACE_TRY_ENV);
+      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index 4211195af02..eddff6b86c9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -80,16 +80,16 @@ public:
   // = Documented in TAO_EC_ConsumerControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy,
-                                   CORBA::Environment &);
+  virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
-                                 CORBA::SystemException &,
-                                 CORBA::Environment &);
+                                 CORBA::SystemException &
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (CORBA::Environment &ACE_TRY_ENV);
+  void query_consumers (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -121,8 +121,8 @@ class TAO_EC_Ping_Consumer : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 public:
   TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_EC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index b32177cfa8f..85c83d61ef6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -36,11 +36,11 @@ TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void)
 
 void
 TAO_EC_Reactive_SupplierControl::query_suppliers (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Ping_Supplier worker (this);
-  this->event_channel_->supplier_admin ()->for_each (&worker,
-                                                     ACE_TRY_ENV);
+  this->event_channel_->supplier_admin ()->for_each (&worker
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -55,27 +55,27 @@ TAO_EC_Reactive_SupplierControl::handle_timeout (
       // the iteration...
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
-        this->policy_current_->get_policy_overrides (types,
-                                                     ACE_TRY_ENV);
+        this->policy_current_->get_policy_overrides (types
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the suppliers...
-      this->query_suppliers (ACE_TRY_ENV);
+      this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
-                                                   CORBA::SET_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::SET_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -101,13 +101,13 @@ TAO_EC_Reactive_SupplierControl::activate (void)
     {
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
-        CORBA::PolicyCurrent::_narrow (tmp.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (tmp.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -121,8 +121,8 @@ TAO_EC_Reactive_SupplierControl::activate (void)
       this->policy_list_[0] =
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-               any,
-               ACE_TRY_ENV);
+               any
+                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -144,14 +144,14 @@ TAO_EC_Reactive_SupplierControl::shutdown (void)
 
 void
 TAO_EC_Reactive_SupplierControl::supplier_not_exist (
-      TAO_EC_ProxyPushConsumer *proxy,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_EC_ProxyPushConsumer *proxy
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Supplier %x does not exists\n", long(proxy)));
-      proxy->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -164,8 +164,8 @@ TAO_EC_Reactive_SupplierControl::supplier_not_exist (
 void
 TAO_EC_Reactive_SupplierControl::system_exception (
       TAO_EC_ProxyPushConsumer *proxy,
-      CORBA::SystemException & /* exception */,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::SystemException & /* exception */
+      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -179,7 +179,7 @@ TAO_EC_Reactive_SupplierControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -209,25 +209,25 @@ TAO_EC_SupplierControl_Adapter::handle_timeout (
 // ****************************************************************
 
 void
-TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
+                            TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
-        consumer->supplier_non_existent (disconnected,
-                                         ACE_TRY_ENV);
+        consumer->supplier_non_existent (disconnected
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+          this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -235,7 +235,7 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer,
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->supplier_not_exist (consumer, ACE_TRY_ENV);
+      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 4d433c04056..ef97e4677df 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -80,16 +80,16 @@ public:
   // = Documented in TAO_EC_SupplierControl
   virtual int activate (void);
   virtual int shutdown (void);
-  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy,
-                                   CORBA::Environment &);
+  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy,
-                                 CORBA::SystemException &,
-                                 CORBA::Environment &);
+                                 CORBA::SystemException &
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  void query_suppliers (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -121,8 +121,8 @@ class TAO_EC_Ping_Supplier : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
 public:
   TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control);
 
-  virtual void work (TAO_EC_ProxyPushConsumer *consumer,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_EC_ProxyPushConsumer *consumer
+                     TAO_ENV_ARG_DECL);
 
 private:
   TAO_EC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 1526017d97f..6306943ef3f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -55,26 +55,26 @@ TAO_EC_Sched_Filter::size (void) const
 
 int
 TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL)
 {
-  return this->body_->filter (event, qos_info, ACE_TRY_ENV);
+  return this->body_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info& qos_info,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    TAO_EC_QOS_Info& qos_info
+                                    TAO_ENV_ARG_DECL)
 {
-  return this->body_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
+  return this->body_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 // This is private, so we can make it inline in the .cpp file...
 void
-TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
+                                       TAO_ENV_ARG_DECL)
 {
-  this->init_rt_info (ACE_TRY_ENV);
+  this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   qos_info.rt_info = this->rt_info_;
@@ -93,8 +93,8 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info,
         this->scheduler_->priority (this->rt_info_,
                                     os_priority,
                                     p_subpriority,
-                                    p_priority,
-                                    ACE_TRY_ENV);
+                                    p_priority
+                                     TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
         qos_info.preemption_priority = p_priority;
       }
@@ -103,30 +103,30 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info,
 
 void
 TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event,
-                           TAO_EC_QOS_Info& qos_info,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           TAO_EC_QOS_Info& qos_info
+                           TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info, ACE_TRY_ENV);
+      this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                  TAO_EC_QOS_Info& qos_info,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  TAO_EC_QOS_Info& qos_info
+                                  TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info, ACE_TRY_ENV);
+      this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -151,26 +151,26 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const
 
 int
 TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
-                                       const TAO_EC_QOS_Info &qos_info,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       const TAO_EC_QOS_Info &qos_info
+                                       TAO_ENV_ARG_DECL)
 {
-  this->init_rt_info (ACE_TRY_ENV);
+  this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int matches = this->body_->add_dependencies (header,
-                                               qos_info,
-                                               ACE_TRY_ENV);
+                                               qos_info
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (matches != 0)
     {
       this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
-                                        RtecBase::TWO_WAY_CALL,
-                                        ACE_TRY_ENV);
+                                        RtecBase::TWO_WAY_CALL
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (qos_info.rt_info, ACE_TRY_ENV);
+        this->scheduler_->get (qos_info.rt_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   this->name_.c_str (),
@@ -180,24 +180,24 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      (*i)->add_dependencies (header, qos_info, ACE_TRY_ENV);
+      (*i)->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 0;
 }
 
 void
-TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
-  this->init_rt_info (ACE_TRY_ENV);
+  this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   qos_info.rt_info = this->rt_info_;
 }
 
 void
-TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->rt_info_computed_)
     return;
@@ -213,8 +213,8 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV)
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          0, // quantum
                          0, // threads
-                         this->info_type_,
-                         ACE_TRY_ENV);
+                         this->info_type_
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if 0
@@ -224,17 +224,17 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV)
       TAO_EC_Filter* filter = *i;
 
       TAO_EC_QOS_Info child;
-      filter->get_qos_info (child, ACE_TRY_ENV);
+      filter->get_qos_info (child TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->scheduler_->add_dependency (this->rt_info_,
                                         child.rt_info, 1,
-                                        RtecBase::TWO_WAY_CALL,
-                                        ACE_TRY_ENV);
+                                        RtecBase::TWO_WAY_CALL
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (child.rt_info, ACE_TRY_ENV);
+        this->scheduler_->get (child.rt_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
@@ -249,12 +249,12 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV)
       this->scheduler_->add_dependency (this->rt_info_,
                                         this->body_info_,
                                         1,
-                                        RtecBase::TWO_WAY_CALL,
-                                        ACE_TRY_ENV);
+                                        RtecBase::TWO_WAY_CALL
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (this->body_info_, ACE_TRY_ENV);
+        this->scheduler_->get (this->body_info_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
@@ -266,12 +266,12 @@ TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV)
   this->scheduler_->add_dependency (this->parent_info_,
                                     this->rt_info_,
                                     1,
-                                    RtecBase::TWO_WAY_CALL,
-                                    ACE_TRY_ENV);
+                                    RtecBase::TWO_WAY_CALL
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecScheduler::RT_Info_var info =
-    this->scheduler_->get (this->parent_info_, ACE_TRY_ENV);
+    this->scheduler_->get (this->parent_info_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
               this->name_.c_str (),
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index f0f63b3f37c..69accbb1460 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -63,25 +63,25 @@ public:
   virtual ChildrenIterator end (void) const;
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
+  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter
@@ -90,11 +90,11 @@ private:
                               (const TAO_EC_Sched_Filter&))
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (CORBA::Environment& env);
+  void init_rt_info (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Compute a new qos_info to push up.
-  void compute_qos_info (TAO_EC_QOS_Info& qos_info,
-                         CORBA::Environment &ACE_TRY_ENV);
+  void compute_qos_info (TAO_EC_QOS_Info& qos_info
+                         TAO_ENV_ARG_DECL);
 
 private:
   /// The RT_Info handle for this object
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 00d03d647ef..5f81a9b265a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -22,26 +22,26 @@ TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void)
 TAO_EC_Filter*
 TAO_EC_Sched_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos,
-    CORBA::Environment &ACE_TRY_ENV) const
+    RtecEventChannelAdmin::ConsumerQOS& qos
+    TAO_ENV_ARG_DECL) const
 {
   CORBA::ULong pos = 0;
   CORBA::Object_var tmp =
     this->event_channel_->scheduler ();
 
   RtecScheduler::Scheduler_var scheduler =
-    RtecScheduler::Scheduler::_narrow (tmp.in (), ACE_TRY_ENV);
+    RtecScheduler::Scheduler::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // @@ How do we figure out which parent???
   RtecScheduler::handle_t parent_info =
-    scheduler->lookup ("Dispatching_Task-250000.us", ACE_TRY_ENV);
+    scheduler->lookup ("Dispatching_Task-250000.us" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->recursive_build (supplier, qos, pos,
                                 scheduler.in (),
-                                parent_info,
-                                ACE_TRY_ENV);
+                                parent_info
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_EC_Filter*
@@ -50,8 +50,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    RtecScheduler::handle_t parent_info,
-    CORBA::Environment& ACE_TRY_ENV) const
+    RtecScheduler::handle_t parent_info
+    TAO_ENV_ARG_DECL) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -60,12 +60,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name,
-                            ACE_TRY_ENV);
+                            scheduler, name
+                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str (), ACE_TRY_ENV);
+        scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       pos++; // Consume the designator
@@ -77,8 +77,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               rt_info,
-                                               ACE_TRY_ENV);
+                                               rt_info
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
 
@@ -94,7 +94,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                                            RtecScheduler::CONJUNCTION),
                       0);
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info, ACE_TRY_ENV);
+      filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
       // @@
       ACE_CHECK_RETURN (0);
       return filter;
@@ -105,12 +105,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       CORBA::ULong npos = pos;
       ACE_CString name;
       this->recursive_name (qos, npos,
-                            scheduler, name,
-                            ACE_TRY_ENV);
+                            scheduler, name
+                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str (), ACE_TRY_ENV);
+        scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       pos++; // Consume the designator
@@ -122,8 +122,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
         {
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
-                                               rt_info,
-                                               ACE_TRY_ENV);
+                                               rt_info
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
       TAO_EC_Sched_Filter *filter;
@@ -139,7 +139,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       0);
 
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info, ACE_TRY_ENV);
+      filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
       // @@
       ACE_CHECK_RETURN (0);
       return filter;
@@ -161,7 +161,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
 
       TAO_EC_QOS_Info qos_info;
       qos_info.rt_info =
-        scheduler->create (name.c_str (), ACE_TRY_ENV);
+        scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Convert the time to the proper units....
@@ -178,15 +178,15 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       RtecScheduler::VERY_LOW_IMPORTANCE,
                       0, // quantum
                       1, // threads
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
+                      RtecScheduler::OPERATION
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       scheduler->add_dependency (qos_info.rt_info,
                                  parent_info,
                                  1,
-                                 RtecBase::TWO_WAY_CALL,
-                                 ACE_TRY_ENV);
+                                 RtecBase::TWO_WAY_CALL
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return new TAO_EC_Timeout_Filter (this->event_channel_,
@@ -199,14 +199,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info, ACE_TRY_ENV);
+    scheduler->get (body_info TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_CString name = info->entry_point.in ();
   name += "#rep";
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name.c_str (), ACE_TRY_ENV);
+    scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   pos++;
@@ -222,7 +222,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                   0);
 
   TAO_EC_QOS_Info qos_info;
-  filter->get_qos_info (qos_info, ACE_TRY_ENV);
+  filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
   // @@
   ACE_CHECK_RETURN (0);
   return filter;
@@ -233,8 +233,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
     RtecEventChannelAdmin::ConsumerQOS& qos,
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
-    ACE_CString& name,
-    CORBA::Environment& ACE_TRY_ENV) const
+    ACE_CString& name
+    TAO_ENV_ARG_DECL) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -248,8 +248,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
           ACE_CString child_name;
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name,
-                                ACE_TRY_ENV);
+                                child_name
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           if (i == 0)
@@ -273,8 +273,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
 
           this->recursive_name (qos, pos,
                                 scheduler,
-                                child_name,
-                                ACE_TRY_ENV);
+                                child_name
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           if (i == 0)
@@ -305,7 +305,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info, ACE_TRY_ENV);
+    scheduler->get (body_info TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   name = info->entry_point.in ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index ddf3604bc51..138c02e7d04 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -47,8 +47,8 @@ public:
 
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos,
-                        CORBA::Environment &env) const;
+                        RtecEventChannelAdmin::ConsumerQOS& qos
+                        TAO_ENV_ARG_DECL) const;
 
 private:
   /// Recursively build the filter tree.
@@ -56,15 +56,15 @@ private:
                                   RtecEventChannelAdmin::ConsumerQOS& qos,
                                   CORBA::ULong& pos,
                                   RtecScheduler::Scheduler_ptr scheduler,
-                                  RtecScheduler::handle_t parent_info,
-                                  CORBA::Environment& env) const;
+                                  RtecScheduler::handle_t parent_info
+                                  TAO_ENV_ARG_DECL) const;
 
   /// Build the name recursively...
   void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos,
                        CORBA::ULong& pos,
                        RtecScheduler::Scheduler_ptr scheduler,
-                       ACE_CString &name,
-                       CORBA::Environment& env) const;
+                       ACE_CString &name
+                       TAO_ENV_ARG_DECL) const;
 
   /// Count the number of children of the current node, i.e. until a
   /// conjunction or disjunction starts.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index f846795fe9d..c48249cfa81 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -47,16 +47,16 @@ public:
   /// Add all the dependencies between <supplier> and <consumer>
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV) = 0;
+      TAO_EC_ProxyPushConsumer *consumer
+      TAO_ENV_ARG_DECL) = 0;
 
   /// Initializes <qos_info> based on the QoS information for
   /// <consumer> and the event header.
   virtual void init_event_qos (
       const RtecEventComm::EventHeader& header,
       TAO_EC_ProxyPushConsumer *consumer,
-      TAO_EC_QOS_Info& qos_info,
-      CORBA::Environment &ACE_TRY_ENV) = 0;
+      TAO_EC_QOS_Info& qos_info
+      TAO_ENV_ARG_DECL) = 0;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index 53c3e2ddd6e..f80673b22f0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -29,8 +29,8 @@ TAO_EC_SupplierControl::shutdown (void)
 }
 
 void
-TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *,
-                                            CORBA::Environment &)
+TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *
+                                            TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 85603bc872e..8c1594f11c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -55,8 +55,8 @@ public:
    * not exists (i.e. _non_existent() returns true and/or the
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
-  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy,
-                                   CORBA::Environment &);
+  virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
+                                   TAO_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index 54573aa5844..180cf20432c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -17,9 +17,9 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
 // ****************************************************************
 
 void
-TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier
+                            TAO_ENV_ARG_DECL)
 {
   TAO_EC_QOS_Info qos_info = this->event_info_;
-  supplier->filter (this->event_, qos_info, ACE_TRY_ENV);
+  supplier->filter (this->event_, qos_info TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index d31a3e4081d..5f91240be13 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -89,20 +89,20 @@ public:
 
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
-  virtual void connected (TAO_EC_ProxyPushSupplier *supplier,
-                          CORBA::Environment &env) = 0;
-  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier,
-                          CORBA::Environment &env) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                             CORBA::Environment &env) = 0;
+  virtual void connected (TAO_EC_ProxyPushSupplier *supplier
+                          TAO_ENV_ARG_DECL) = 0;
+  virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
+                          TAO_ENV_ARG_DECL) = 0;
+  virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
+                             TAO_ENV_ARG_DECL) = 0;
 
   /// The event channel is shutting down.
-  virtual void shutdown (CORBA::Environment &env) = 0;
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0;
 
   /// The ProxyPushConsumer delegates on this class to actually send
   /// the event.
-  virtual void push (const RtecEventComm::EventSet &event,
-                     CORBA::Environment &) = 0;
+  virtual void push (const RtecEventComm::EventSet &event
+                     TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
   /// Increment and decrement the reference count, locking must be
   /// provided by the user.
@@ -118,8 +118,8 @@ public:
   TAO_EC_Filter_Worker (RtecEventComm::EventSet &event,
                         const TAO_EC_QOS_Info &event_info);
 
-  virtual void work (TAO_EC_ProxyPushSupplier *supplier,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void work (TAO_EC_ProxyPushSupplier *supplier
+                     TAO_ENV_ARG_DECL);
 
 private:
   /// The event we push on each case, use a reference to avoid copies.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index ab0ff6a1301..0753bd74bcc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -65,26 +65,26 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void)
 
 void
 TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event,
-                                      TAO_EC_QOS_Info& qos_info,
-                                      CORBA::Environment& ACE_TRY_ENV)
+                                      TAO_EC_QOS_Info& qos_info
+                                      TAO_ENV_ARG_DECL)
 {
   qos_info.timer_id_ = this->id_;
 
   if (this->supplier_ != 0)
     this->supplier_->filter (event,
-                             qos_info,
-                             ACE_TRY_ENV);
+                             qos_info
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
-                               TAO_EC_QOS_Info &qos_info,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               TAO_EC_QOS_Info &qos_info
+                               TAO_ENV_ARG_DECL)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -93,13 +93,13 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
 
 int
 TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                      TAO_EC_QOS_Info &qos_info,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      TAO_EC_QOS_Info &qos_info
+                                      TAO_ENV_ARG_DECL)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -108,15 +108,15 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
 
 void
 TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&,
-                          TAO_EC_QOS_Info&,
-                          CORBA::Environment&)
+                          TAO_EC_QOS_Info&
+                          TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&,
-                                    TAO_EC_QOS_Info&,
-                                    CORBA::Environment&)
+                                    TAO_EC_QOS_Info&
+                                    TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -158,8 +158,8 @@ TAO_EC_Timeout_Filter::can_match (
 int
 TAO_EC_Timeout_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info &
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index 7b3a151eabd..a0cb386b195 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -56,29 +56,29 @@ public:
 
   /// Callback from the Timeout_Generator
   void push_to_proxy (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& ACE_TRY_ENV);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 93176469a1e..8ee6be22be4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -41,8 +41,8 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
 
       TAO_EC_QOS_Info qos_info = filter->qos_info ();
       filter->push_to_proxy (single_event,
-                             qos_info,
-                             ACE_TRY_ENV);
+                             qos_info
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index 807af16d1ca..53fb0cb99cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -32,31 +32,31 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*)
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*,
-                                           CORBA::Environment &)
+TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*
+                                           TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*,
-                                             CORBA::Environment &)
+TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*
+                                             TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*,
-                                              CORBA::Environment &)
+TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*
+                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::shutdown (CORBA::Environment &)
+TAO_EC_Trivial_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event
+                                      TAO_ENV_ARG_DECL)
 {
   TAO_EC_ConsumerAdmin* consumer_admin =
     this->event_channel_->consumer_admin ();
@@ -71,7 +71,7 @@ TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event,
       TAO_EC_QOS_Info qos_info;
 
       TAO_EC_Filter_Worker worker (single_event, qos_info);
-      consumer_admin->for_each (&worker, ACE_TRY_ENV);
+      consumer_admin->for_each (&worker TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index 75bc401ab2c..d1cc5818e4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -47,15 +47,15 @@ public:
   // = The TAO_EC_Supplier_Filter methods.
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
-  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier,
-                            CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
-  virtual void shutdown (CORBA::Environment &env);
-  virtual void push (const RtecEventComm::EventSet& event,
-                     CORBA::Environment &);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier
+                          TAO_ENV_ARG_DECL);
+  virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
+                            TAO_ENV_ARG_DECL);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
+                             TAO_ENV_ARG_DECL);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void push (const RtecEventComm::EventSet& event
+                     TAO_ENV_ARG_DECL_NOT_USED);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 5bae518f6ea..cdda4fefccd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -15,8 +15,8 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header
 
 int
 TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL)
 {
   // @@ It this the right way to do this?
   if (event.length () != 1)
@@ -24,7 +24,7 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
   if (this->can_match (event[0].header))
     {
-      this->push (event, qos_info, ACE_TRY_ENV);
+      this->push (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -33,8 +33,8 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
 int
 TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   TAO_EC_QOS_Info& qos_info
+                                   TAO_ENV_ARG_DECL)
 {
   // @@ It this the right way to do this?
   if (event.length () != 1)
@@ -42,7 +42,7 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
   if (this->can_match (event[0].header))
     {
-      this->push_nocopy (event, qos_info, ACE_TRY_ENV);
+      this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -51,20 +51,20 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
 void
 TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event,
-                          TAO_EC_QOS_Info& qos_info,
-                          CORBA::Environment& ACE_TRY_ENV)
+                          TAO_EC_QOS_Info& qos_info
+                          TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 TAO_EC_QOS_Info& qos_info
+                                 TAO_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
+    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -117,8 +117,8 @@ TAO_EC_Type_Filter::can_match (
 int
 TAO_EC_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader& header,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+      const TAO_EC_QOS_Info &
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   return this->can_match (header);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index d5a1ef62aab..70e0434fc83 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -40,23 +40,23 @@ public:
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
+                      TAO_EC_QOS_Info& qos_info
+                      TAO_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
+                             TAO_EC_QOS_Info& qos_info
+                             TAO_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
+                     TAO_EC_QOS_Info& qos_info
+                     TAO_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
+                            TAO_EC_QOS_Info& qos_info
+                            TAO_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                const TAO_EC_QOS_Info &qos_info
+                                TAO_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 5c3aef55cbd..06f5cf18acb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -15,8 +15,8 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void)
 
 void
 TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header,
-                                    RtecUDPAdmin::UDP_Addr_out addr,
-                                    CORBA::Environment&)
+                                    RtecUDPAdmin::UDP_Addr_out addr
+                                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr.ipaddr = header.type;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 8cddee5b51b..e59d2951f33 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -43,8 +43,8 @@ public:
 
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr_out addr,
-                         CORBA::Environment& env)
+                         RtecUDPAdmin::UDP_Addr_out addr
+                         TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 49d99ff8966..c45aae1d021 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -159,8 +159,8 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description,
 
 static RtecScheduler::Preemption_Priority_t
 Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler,
-                     RtecScheduler::handle_t rtinfo,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     RtecScheduler::handle_t rtinfo
+                     TAO_ENV_ARG_DECL)
 {
   RtecScheduler::OS_Priority thread_priority;
   RtecScheduler::Preemption_Subpriority_t subpriority;
@@ -173,15 +173,15 @@ Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler,
     (rtinfo,
      thread_priority,
      subpriority,
-     preemption_priority,
-     ACE_TRY_ENV);
+     preemption_priority
+      TAO_ENV_ARG_PARAMETER);
 #else
   ACE_Scheduler_Factory::server ()->priority
     (rtinfo,
      thread_priority,
      subpriority,
-     preemption_priority,
-     ACE_TRY_ENV);
+     preemption_priority
+      TAO_ENV_ARG_PARAMETER);
 #endif
   ACE_CHECK_RETURN (0);
   return preemption_priority;
@@ -231,7 +231,7 @@ public:
       ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
     while (iter.advance_dependency () == 0)
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
+        TAO_ENV_DECLARE_NEW_ENV;
         ACE_TRY
           {
             RtecEventComm::EventType &type = (*iter).event.header.type;
@@ -241,8 +241,8 @@ public:
                 type != ACE_ES_DISJUNCTION_DESIGNATOR)
               {
                 RtecScheduler::Preemption_Priority_t q =
-                  ::Preemption_Priority (scheduler, (*iter).rt_info,
-                                         ACE_TRY_ENV);
+                  ::Preemption_Priority (scheduler, (*iter).rt_info
+                                          TAO_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
                 if (rt_info_ == 0 || q < p)
                   {
@@ -324,11 +324,11 @@ public:
 
   virtual int execute (void* /* arg = 0 */)
   {
-    ACE_DECLARE_NEW_CORBA_ENV;
+    TAO_ENV_DECLARE_NEW_ENV;
     ACE_TRY
       {
         ACE_ES_Dispatch_Request *request = request_;
-        dispatching_module_->push (request, ACE_TRY_ENV);
+        dispatching_module_->push (request TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
         delete this;
       }
@@ -367,8 +367,8 @@ ACE_Push_Supplier_Proxy::ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *sm)
 void
 ACE_Push_Supplier_Proxy::connect_push_supplier (
     RtecEventComm::PushSupplier_ptr push_supplier,
-    const RtecEventChannelAdmin::SupplierQOS &qos,
-    CORBA::Environment &ACE_TRY_ENV)
+    const RtecEventChannelAdmin::SupplierQOS &qos
+    TAO_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -391,12 +391,12 @@ ACE_Push_Supplier_Proxy::connect_push_supplier (
   // not work: it usually results in some form of dead-lock.
   this->source_id_ = qos_.publications[0].event.header.source;
 
-  supplier_module_->connected (this, ACE_TRY_ENV);
+  supplier_module_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event,
-                               CORBA::Environment &ACE_TRY_ENV)
+ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_ENTER_PUSH_SUPPLIER_PROXY_PUSH);
@@ -413,14 +413,14 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event,
         ACE_const_cast (RtecEventComm::EventSet&, event);
 
       this->time_stamp (copy);
-      this->supplier_module_->push (this, copy, ACE_TRY_ENV);
+      this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       RtecEventComm::EventSet copy = event;
       this->time_stamp (copy);
-      this->supplier_module_->push (this, copy, ACE_TRY_ENV);
+      this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -442,14 +442,14 @@ ACE_Push_Supplier_Proxy::time_stamp (RtecEventComm::EventSet& event)
 
 void
 ACE_Push_Supplier_Proxy::disconnect_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE_PRINT;
   if (this->connected ())
     {
       this->push_supplier_ = 0;
-      this->supplier_module_->disconnecting (this, ACE_TRY_ENV);
+      this->supplier_module_->disconnecting (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -457,10 +457,10 @@ ACE_Push_Supplier_Proxy::disconnect_push_consumer (
 void
 ACE_Push_Supplier_Proxy::shutdown (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      push_supplier_->disconnect_push_supplier (ACE_TRY_ENV);
+      push_supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -482,8 +482,8 @@ ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void)
 }
 
 void
-ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
-                               CORBA::Environment &ACE_TRY_ENV)
+ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events
+                               TAO_ENV_ARG_DECL)
 {
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_EVENT_TO_CONSUMER_PROXY);
 
@@ -494,15 +494,15 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
       return;
     }
 
-  push_consumer_->push (events, ACE_TRY_ENV);
+  push_consumer_->push (events TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ACE_Push_Consumer_Proxy::connect_push_consumer (
     RtecEventComm::PushConsumer_ptr push_consumer,
-    const RtecEventChannelAdmin::ConsumerQOS &qos,
-    CORBA::Environment &ACE_TRY_ENV)
+    const RtecEventChannelAdmin::ConsumerQOS &qos
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError))
@@ -523,28 +523,28 @@ ACE_Push_Consumer_Proxy::connect_push_consumer (
 
   // ACE_ConsumerQOS_Factory::debug (qos_);
 
-  this->consumer_module_->connected (this, ACE_TRY_ENV);
+  this->consumer_module_->connected (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
 ACE_Push_Consumer_Proxy::disconnect_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE_PRINT;
   this->push_consumer_ = RtecEventComm::PushConsumer::_nil ();
-  this->consumer_module_->disconnecting (this, ACE_TRY_ENV);
+  this->consumer_module_->disconnecting (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ACE_Push_Consumer_Proxy::suspend_connection (CORBA::Environment &)
+ACE_Push_Consumer_Proxy::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   correlation_.suspend ();
 }
 
 void
-ACE_Push_Consumer_Proxy::resume_connection (CORBA::Environment &)
+ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   correlation_.resume ();
@@ -553,10 +553,10 @@ ACE_Push_Consumer_Proxy::resume_connection (CORBA::Environment &)
 void
 ACE_Push_Consumer_Proxy::shutdown (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->push_consumer_->disconnect_push_consumer (ACE_TRY_ENV);
+      this->push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -644,10 +644,10 @@ ACE_EventChannel::~ACE_EventChannel (void)
   // @@ This should go away, it is too late to raise a CORBA
   // exception, at this point we should only be cleaning up memory,
   // not sending messages.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->destroy (ACE_TRY_ENV);
+      this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -674,7 +674,7 @@ ACE_EventChannel::~ACE_EventChannel (void)
 }
 
 void
-ACE_EventChannel::destroy (CORBA::Environment &)
+ACE_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -766,28 +766,28 @@ ACE_EventChannel::report_disconnect_i (u_long event)
 }
 
 void
-ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw,
-                               CORBA::Environment& ACE_TRY_ENV)
+ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw
+                               TAO_ENV_ARG_DECL)
 {
-  RtecEventChannelAdmin::Observer_var observer = gw->_this (ACE_TRY_ENV);
+  RtecEventChannelAdmin::Observer_var observer = gw->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  gw->observer_handle (this->append_observer (observer.in (), ACE_TRY_ENV));
+  gw->observer_handle (this->append_observer (observer.in () TAO_ENV_ARG_PARAMETER));
   ACE_CHECK;
 }
 
 void
-ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw,
-                               CORBA::Environment& ACE_TRY_ENV)
+ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw
+                               TAO_ENV_ARG_DECL)
 {
-  this->remove_observer (gw->observer_handle (), ACE_TRY_ENV);
+  this->remove_observer (gw->observer_handle () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   gw->observer_handle (0);
 }
 
 void
-ACE_EventChannel::update_consumer_gwys (CORBA::Environment& ACE_TRY_ENV)
+ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL)
 {
   Observer_Map observers;
   {
@@ -818,13 +818,13 @@ ACE_EventChannel::update_consumer_gwys (CORBA::Environment& ACE_TRY_ENV)
        i != observers.end ();
        ++i)
     {
-      (*i).int_id_.observer->update_consumer (c_qos, ACE_TRY_ENV);
+      (*i).int_id_.observer->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ACE_EventChannel::update_supplier_gwys (CORBA::Environment& ACE_TRY_ENV)
+ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL)
 {
   Observer_Map observers;
   {
@@ -854,14 +854,14 @@ ACE_EventChannel::update_supplier_gwys (CORBA::Environment& ACE_TRY_ENV)
        i != observers.end ();
        ++i)
     {
-      (*i).int_id_.observer->update_supplier (s_qos, ACE_TRY_ENV);
+      (*i).int_id_.observer->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 RtecEventChannelAdmin::Observer_Handle
-ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs,
-                                   CORBA::Environment &ACE_TRY_ENV)
+ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -882,20 +882,20 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs,
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
   this->consumer_module_->fill_qos (c_qos);
-  obs->update_consumer (c_qos, ACE_TRY_ENV);
+  obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
   this->supplier_module_->fill_qos (s_qos);
-  obs->update_supplier (s_qos, ACE_TRY_ENV);
+  obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return entry.handle;
 }
 
 void
-ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h,
-                                   CORBA::Environment &ACE_TRY_ENV)
+ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -932,22 +932,22 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
       RtecScheduler::handle_t timer_rtinfo =
         this->timer_module ()->rt_info (preemption_priority);
 
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
 #if 1
           this->scheduler_->add_dependency (rt_info,
                                             timer_rtinfo,
                                             1,
-                                            RtecBase::ONE_WAY_CALL,
-                                            ACE_TRY_ENV);
+                                            RtecBase::ONE_WAY_CALL
+                                             TAO_ENV_ARG_PARAMETER);
 #else
           ACE_Scheduler_Factory::server()->add_dependency
             (rt_info,
              timer_rtinfo,
              1,
-             RtecBase::ONE_WAY_CALL,
-             ACE_TRY_ENV);
+             RtecBase::ONE_WAY_CALL
+              TAO_ENV_ARG_PARAMETER);
 #endif
           ACE_TRY_CHECK;
         }
@@ -1251,19 +1251,19 @@ ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down)
 }
 
 void
-ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-                                   CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer
+                                   TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //             "EC (%t) Consumer_Module - connecting consumer %x\n",
   //  consumer));
 
   this->channel_->report_connect (ACE_EventChannel::CONSUMER);
-  this->down_->connected (consumer, ACE_TRY_ENV);
+  this->down_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!consumer->qos ().is_gateway)
-    this->channel_->update_consumer_gwys (ACE_TRY_ENV);
+    this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -1286,12 +1286,12 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
 
       // Deactivate the consumer proxy
       PortableServer::POA_var poa =
-        sc->consumer ()->_default_POA (ACE_TRY_ENV);
+        sc->consumer ()->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (sc->consumer (), ACE_TRY_ENV);
+        poa->servant_to_id (sc->consumer () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Delete the consumer proxy, no need to delete it, is is owned
@@ -1299,7 +1299,7 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
       // delete sc->consumer ();
 
       if (!dont_update)
-        this->channel_->update_consumer_gwys (ACE_TRY_ENV);
+        this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_GUARD_THROW_EX (
@@ -1347,7 +1347,7 @@ ACE_ES_Consumer_Module::shutdown (void)
   {
     Consumer_Iterator iter (copy);
 
-    ACE_DECLARE_NEW_CORBA_ENV;
+    TAO_ENV_DECLARE_NEW_ENV;
     ACE_TRY
       {
         for (ACE_Push_Consumer_Proxy **proxy = 0;
@@ -1359,12 +1359,12 @@ ACE_ES_Consumer_Module::shutdown (void)
             // servant.
             // Deactivate the proxy...
             PortableServer::POA_var poa =
-              (*proxy)->_default_POA (ACE_TRY_ENV);
+              (*proxy)->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             PortableServer::ObjectId_var id =
-              poa->servant_to_id (*proxy, ACE_TRY_ENV);
+              poa->servant_to_id (*proxy TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            poa->deactivate_object (id.in (), ACE_TRY_ENV);
+            poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             // Remove the consumer from our list.
@@ -1393,8 +1393,8 @@ DONE:
 }
 
 void
-ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                                       CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer
+                                       TAO_ENV_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (
@@ -1411,7 +1411,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
   // etc.  However, messages may still be queued in the ReactorEx or
   // in the Dispatching Module for this consumer, so no queues or
   // proxies can be deleted just yet.
-  down_->disconnecting (consumer, ACE_TRY_ENV);
+  down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Send a shutdown message through the system.  When this is
@@ -1458,8 +1458,8 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
 // copy the event set to be queued.  Or a same address-space consumer
 // can read the set we allocated off the stack.
 void
-ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
-                              CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request
+                              TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Consumer_Module::push\n"));
 
@@ -1478,12 +1478,12 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
       ORBSVCS_Time::hrtime_to_TimeT (ev.header.ec_send_time, ec_send);
     }
 #endif /* TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS */
-  request->consumer ()->push (event_set, ACE_TRY_ENV);
+  request->consumer ()->push (event_set TAO_ENV_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 ACE_ES_Consumer_Module::obtain_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy =
@@ -1510,7 +1510,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier (
       ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n"));
   }
 
-  proxy = new_consumer->_this (ACE_TRY_ENV);
+  proxy = new_consumer->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxy);
 
   // Give away ownership to the POA....
@@ -1621,8 +1621,8 @@ ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up,
 }
 
 void
-ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-                                      CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer
+                                      TAO_ENV_ARG_DECL)
 {
   // Initialize the consumer correlation filter.
   if (consumer->correlation ().connected (consumer, this) == -1)
@@ -1630,8 +1630,8 @@ ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer,
 }
 
 void
-ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                                          CORBA::Environment &)
+ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer
+                                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (consumer->correlation ().disconnecting () == -1)
     ACE_ERROR ((LM_ERROR,
@@ -1652,8 +1652,8 @@ ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr)
 
 void
 ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
-                                 const TAO_EC_Event& event,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 const TAO_EC_Event& event
+                                 TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Correlation_Module::push\n"));
 
@@ -1666,7 +1666,7 @@ ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
   // we need to push the event now.
   if (request != 0)
     {
-      up_->push (request, ACE_TRY_ENV);
+      up_->push (request TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -1814,7 +1814,7 @@ ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void)
 }
 
 void
-ACE_ES_Consumer_Correlation::disconnect_push_supplier (CORBA::Environment &)
+ACE_ES_Consumer_Correlation::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->connected_ = 0;
@@ -2169,10 +2169,10 @@ ACE_ES_Consumer_Correlation::disconnecting (void)
   // If we were forwarding events, disconnect as a supplier.
   if (connected_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
-          channel_->disconnect_push_consumer (ACE_TRY_ENV);
+          channel_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -2336,14 +2336,14 @@ ACE_ES_Consumer_Rep_Timeout::execute (void* /* arg */)
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_REP_TIMEOUT_EXECUTE);
   if (this->receiving_events ())
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           ACE_Time_Value tv = ACE_OS::gettimeofday ();
           ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv);
           correlation_->correlation_module_->push (this,
-                                                   this->timeout_event_,
-                                                   ACE_TRY_ENV);
+                                                   this->timeout_event_
+                                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -2384,8 +2384,8 @@ ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void)
 // starting with any consumers having a type-based subscription in the
 // global type collection.
 void
-ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-                                       CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier
+                                       TAO_ENV_ARG_DECL)
 {
   RtecEventComm::EventSourceID sid = 0;
   // We will record the source_id for later usage.
@@ -2462,15 +2462,15 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier,
                   ((*proxy)->dependency()->rt_info,
                    new_subscribers->dependency_info_->rt_info,
                    new_subscribers->dependency_info_->number_of_calls,
-                   RtecBase::ONE_WAY_CALL,
-                   ACE_TRY_ENV);
+                   RtecBase::ONE_WAY_CALL
+                    TAO_ENV_ARG_PARAMETER);
 #else
                 ACE_Scheduler_Factory::server()->add_dependency
                   ((*proxy)->dependency()->rt_info,
                    new_subscribers->dependency_info_->rt_info,
                    new_subscribers->dependency_info_->number_of_calls,
-                   RtecBase::ONE_WAY_CALL,
-                   ACE_TRY_ENV);
+                   RtecBase::ONE_WAY_CALL
+                    TAO_ENV_ARG_PARAMETER);
 #endif
                 ACE_CHECK;
 
@@ -2537,8 +2537,8 @@ ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID s
 
 
 void
-ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                                           CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier
+                                           TAO_ENV_ARG_DECL)
 {
   ACE_WRITE_GUARD_THROW_EX (
       ACE_ES_RW_LOCK, ace_mon, this->lock_,
@@ -2591,8 +2591,8 @@ ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *)
 // Forward <events> to all consumers subscribed to <source> only.
 int
 ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
-                                         const TAO_EC_Event &event,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                         const TAO_EC_Event &event
+                                         TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push_source\n"));
 
@@ -2626,7 +2626,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
         // and not disconnected.
         if ((*consumer)->receiving_events ())
           {
-            up_->push (*consumer, event, ACE_TRY_ENV);
+            up_->push (*consumer, event TAO_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (-1);
           }
         // If the consumer has disconnected, schedule it for
@@ -2674,8 +2674,8 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
 
 int
 ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
-                                              const TAO_EC_Event &event,
-                                              CORBA::Environment& ACE_TRY_ENV)
+                                              const TAO_EC_Event &event
+                                              TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG,
   // "EC (%t) Subscription_Module::push_source_type: \n"));
@@ -2742,7 +2742,7 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
       {
         if ((*consumer)->receiving_events ())
           {
-            up_->push (*consumer, event, ACE_TRY_ENV);
+            up_->push (*consumer, event TAO_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (-1);
           }
         if ((*consumer)->disconnected ())
@@ -2837,7 +2837,7 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer,
                  iter2.next (temp) != 0;
                  iter2.advance ())
               {
-                ACE_DECLARE_NEW_CORBA_ENV;
+                TAO_ENV_DECLARE_NEW_ENV;
                 ACE_TRY
                   {
 #if 1
@@ -2845,15 +2845,15 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer,
                       (consumer->dependency()->rt_info,
                        temp->int_id_->dependency_info_->rt_info,
                        temp->int_id_->dependency_info_->number_of_calls,
-                       RtecBase::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       RtecBase::ONE_WAY_CALL
+                        TAO_ENV_ARG_PARAMETER);
 #else
                     ACE_Scheduler_Factory::server()->add_dependency
                       (consumer->dependency()->rt_info,
                        temp->int_id_->dependency_info_->rt_info,
                        temp->int_id_->dependency_info_->number_of_calls,
-                       RtecBase::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       RtecBase::ONE_WAY_CALL
+                        TAO_ENV_ARG_PARAMETER);
 #endif
                     ACE_TRY_CHECK;
                   }
@@ -2916,7 +2916,7 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
           // Success.  Add the supplier dependency info to the
           // consumer's dependency list.
           // @@ TODO handle exceptions.
-          ACE_DECLARE_NEW_CORBA_ENV;
+          TAO_ENV_DECLARE_NEW_ENV;
           ACE_TRY
             {
 #if 1
@@ -2924,15 +2924,15 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
                 (consumer->dependency ()->rt_info,
                  dependency_info->rt_info,
                  dependency_info->number_of_calls,
-                 RtecBase::ONE_WAY_CALL,
-                 ACE_TRY_ENV);
+                 RtecBase::ONE_WAY_CALL
+                  TAO_ENV_ARG_PARAMETER);
 #else
               ACE_Scheduler_Factory::server()->add_dependency
                 (consumer->dependency ()->rt_info,
                  dependency_info->rt_info,
                  dependency_info->number_of_calls,
-                 RtecBase::ONE_WAY_CALL,
-                 ACE_TRY_ENV);
+                 RtecBase::ONE_WAY_CALL
+                  TAO_ENV_ARG_PARAMETER);
 #endif
               ACE_TRY_CHECK;
             }
@@ -2989,7 +2989,7 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer
                 // Success.
                 // Add the supplier to the consumer's dependency list.
                 // @@ TODO handle exceptions.
-                ACE_DECLARE_NEW_CORBA_ENV;
+                TAO_ENV_DECLARE_NEW_ENV;
                 ACE_TRY
                   {
 #if 1
@@ -2997,15 +2997,15 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer
                       (consumer->dependency ()->rt_info,
                        dependency_info->rt_info,
                        dependency_info->number_of_calls,
-                       RtecBase::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       RtecBase::ONE_WAY_CALL
+                        TAO_ENV_ARG_PARAMETER);
 #else
                     ACE_Scheduler_Factory::server()->add_dependency
                       (consumer->dependency ()->rt_info,
                        dependency_info->rt_info,
                        dependency_info->number_of_calls,
-                       RtecBase::ONE_WAY_CALL,
-                       ACE_TRY_ENV);
+                       RtecBase::ONE_WAY_CALL
+                        TAO_ENV_ARG_PARAMETER);
 #endif
                     ACE_TRY_CHECK;
                   }
@@ -3231,14 +3231,14 @@ ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consum
 
 void
 ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source,
-                                  const TAO_EC_Event &event,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const TAO_EC_Event &event
+                                  TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push\n"));
 
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUBSCRIPTION_MODULE);
   // These are all inline function calls.
-  int result = this->push_source (source, event, ACE_TRY_ENV);
+  int result = this->push_source (source, event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == -1)
@@ -3247,7 +3247,7 @@ ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source,
   {
     ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_BEGIN_PUSH_SOURCE_TYPE);
 
-    result = this->push_source_type (source, event, ACE_TRY_ENV);
+    result = this->push_source_type (source, event TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (result == -1)
@@ -3320,20 +3320,20 @@ ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up)
 }
 
 void
-ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-                                   CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier
+                                   TAO_ENV_ARG_DECL)
 {
   channel_->report_connect (ACE_EventChannel::SUPPLIER);
-  up_->connected (supplier, ACE_TRY_ENV);
+  up_->connected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!supplier->qos ().is_gateway)
-    this->channel_->update_supplier_gwys (ACE_TRY_ENV);
+    this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                                       CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier
+                                       TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean need_update = 0;
   {
@@ -3345,7 +3345,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
     if (all_suppliers_.remove (supplier) == -1)
       ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
 
-    up_->disconnecting (supplier, ACE_TRY_ENV);
+    up_->disconnecting (supplier TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->all_suppliers_.size () <= 0)
@@ -3363,7 +3363,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
     // CORBA::release (supplier);
   }
   if (need_update)
-    this->channel_->update_supplier_gwys (ACE_TRY_ENV);
+    this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -3381,14 +3381,14 @@ ACE_ES_Supplier_Module::shutdown (void)
     {
       Supplier_Iterator iter (copy);
 
-      CORBA::Environment env;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       for (ACE_Push_Supplier_Proxy **proxy = 0;
            iter.next (proxy) != 0;
            iter.advance ())
         {
           (*proxy)->shutdown ();
-          this->disconnecting (*proxy, env);
+          this->disconnecting (*proxy TAO_ENV_ARG_PARAMETER);
         }
     }
 
@@ -3396,7 +3396,7 @@ ACE_ES_Supplier_Module::shutdown (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy =
@@ -3418,7 +3418,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
       ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n"));
   }
 
-  proxy = new_supplier->_this (ACE_TRY_ENV);
+  proxy = new_supplier->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxy);
 
   // Give ownership to the POA
@@ -3429,8 +3429,8 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
 
 void
 ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
-                              RtecEventComm::EventSet &event_set,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              RtecEventComm::EventSet &event_set
+                              TAO_ENV_ARG_DECL)
 {
   // Steal the events from the EventSet and put them into a reference
   // counted event set.
@@ -3447,7 +3447,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
       // the scope.
       TAO_EC_Event event_copy (event, i);
       ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUPPLIER_MODULE_THRU_SUPPLIER_PROXY);
-      up_->push (proxy, event_copy, ACE_TRY_ENV);
+      up_->push (proxy, event_copy TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   TAO_EC_Event_Set::_release (event);
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 02904d801a1..955838fae77 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -201,7 +201,7 @@ public:
   virtual ~ACE_EventChannel (void);
   // Calls destroy.
 
-  RtecEventChannelAdmin::EventChannel_ptr get_ref (CORBA::Environment &);
+  RtecEventChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Allow transformations to RtecEventChannelAdmin::EventChannel.
 
   ACE_RTU_Manager *rtu_manager (void);
@@ -232,12 +232,12 @@ public:
   void report_disconnect_i (u_long);
   // Consumer or supplier disconnected.
 
-  void add_gateway (TAO_EC_Gateway* gw, CORBA::Environment& _env);
-  void del_gateway (TAO_EC_Gateway* gw, CORBA::Environment& _env);
+  void add_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL);
+  void del_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL);
   // Add and remove gateways from the EC.
 
-  void update_consumer_gwys (CORBA::Environment& _env);
-  void update_supplier_gwys (CORBA::Environment& _env);
+  void update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL);
+  void update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL);
   // The consumer (or supplier) list has changed, thus the EC has to
   // inform any gateways it has.
 
@@ -247,30 +247,30 @@ public:
   // = The RtecEventChannelAdmin::EventChannel methods.
 
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (CORBA::Environment &)
+    for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // In this implementation of the EC this returns the interface for
   // the Consumer_Module.
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (CORBA::Environment &)
+    for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Return an interface to the Supplier_Module.
 
-  virtual void destroy (CORBA::Environment &)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the EC, free all resources, stop all threads and then
   // shutdown the server where the Servant is running.
 
   virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                     CORBA::Environment &env)
+    append_observer (RtecEventChannelAdmin::Observer_ptr observer
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                                CORBA::Environment &env)
+  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -840,7 +840,7 @@ public:
   // that ACE_ES_Consumer_Rep_Timeout::execute can access it.
 
 private:
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Called when the channel disconnects us.
 
@@ -943,23 +943,23 @@ public:
   // Link to the next module.
 
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (CORBA::Environment &)
+      obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException));
   // Factory method for push consumer proxies.
 
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-                  CORBA::Environment &);
+  void connected (ACE_Push_Consumer_Proxy *consumer
+                  TAO_ENV_ARG_DECL_NOT_USED);
   // Register the consumer with the Event Service.  This handles all
   // the details regarding Correlation_Module and Subscription_Module.
 
-  void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                      CORBA::Environment &);
+  void disconnecting (ACE_Push_Consumer_Proxy *consumer
+                      TAO_ENV_ARG_DECL_NOT_USED);
   // Unregister the consumer from the Event Service.
 
-  virtual void push (const ACE_ES_Dispatch_Request *request,
-                     CORBA::Environment &);
+  virtual void push (const ACE_ES_Dispatch_Request *request
+                     TAO_ENV_ARG_DECL_NOT_USED);
 
-  RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (CORBA::Environment &);
+  RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin.
 
   void shutdown_request (ACE_ES_Dispatch_Request *request);
@@ -1010,17 +1010,17 @@ public:
              ACE_ES_Subscription_Module *down);
   // Link to adjacent modules.
 
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-                  CORBA::Environment &);
+  void connected (ACE_Push_Consumer_Proxy *consumer
+                  TAO_ENV_ARG_DECL_NOT_USED);
   // Create the consumers filter object.
 
-  void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                      CORBA::Environment &);
+  void disconnecting (ACE_Push_Consumer_Proxy *consumer
+                      TAO_ENV_ARG_DECL_NOT_USED);
   // Release the consumers filter object.
 
   void push (ACE_ES_Consumer_Rep *consumer,
-             const TAO_EC_Event &event,
-             CORBA::Environment &);
+             const TAO_EC_Event &event
+             TAO_ENV_ARG_DECL_NOT_USED);
   // Take in an event and its subscriber.  Apply consumer-specific
   // filters to each event and forward any dispatch requests to the
   // Dispatching Module.
@@ -1098,14 +1098,14 @@ public:
   int unsubscribe (ACE_ES_Consumer_Rep *consumer);
   // Removes the -consumer- from any subscription lists.
 
-  void connected (ACE_Push_Supplier_Proxy *supplier,
-                  CORBA::Environment &);
-  void disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                      CORBA::Environment &);
+  void connected (ACE_Push_Supplier_Proxy *supplier
+                  TAO_ENV_ARG_DECL_NOT_USED);
+  void disconnecting (ACE_Push_Supplier_Proxy *supplier
+                      TAO_ENV_ARG_DECL_NOT_USED);
 
   void push (ACE_Push_Supplier_Proxy *source,
-             const TAO_EC_Event &event,
-             CORBA::Environment &);
+             const TAO_EC_Event &event
+             TAO_ENV_ARG_DECL_NOT_USED);
   // Takes in an event and pushes subscriber sets to the
   // Correlation Module.
 
@@ -1159,19 +1159,19 @@ private:
   // = Push helper methods.
 
   int push_source (ACE_Push_Supplier_Proxy *source,
-                   const TAO_EC_Event &event,
-                   CORBA::Environment &_env);
+                   const TAO_EC_Event &event
+                   TAO_ENV_ARG_DECL);
   // Push <event> to all consumers subscribed to all events from
   // <source>.  Returns 0 on success, -1 on failure.
 
   int push_source_type (ACE_Push_Supplier_Proxy *source,
-                        const TAO_EC_Event &event,
-                        CORBA::Environment &_env);
+                        const TAO_EC_Event &event
+                        TAO_ENV_ARG_DECL);
   // Push <event> to all consumers subscribed to <event>.type_ from
   // <source>.  Returns 0 on success, -1 on failure.
 
-  void push_all (const TAO_EC_Event &event,
-                 CORBA::Environment &);
+  void push_all (const TAO_EC_Event &event
+                 TAO_ENV_ARG_DECL_NOT_USED);
   // Push <event> to all_suppliers_.
 
   ACE_ES_Correlation_Module *up_;
@@ -1216,26 +1216,26 @@ public:
   // Associate the module to a channel.
 
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (CORBA::Environment &)
+      obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException));
   // Factory method for push supplier proxies.
 
   virtual void push (ACE_Push_Supplier_Proxy *proxy,
-                     RtecEventComm::EventSet &event,
-                     CORBA::Environment &);
+                     RtecEventComm::EventSet &event
+                     TAO_ENV_ARG_DECL_NOT_USED);
   // The supplier module acts on behalf of the supplier proxy to
   // forward events through the channel.
 
-  void connected (ACE_Push_Supplier_Proxy *supplier,
-                  CORBA::Environment &);
+  void connected (ACE_Push_Supplier_Proxy *supplier
+                  TAO_ENV_ARG_DECL_NOT_USED);
   // Register the consumer with the Event Service.  This handles all
   // the details regarding Correlation_Module and Subscription_Module.
 
-  void disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                      CORBA::Environment &);
+  void disconnecting (ACE_Push_Supplier_Proxy *supplier
+                      TAO_ENV_ARG_DECL_NOT_USED);
   // Unregister the consumer from the Event Service.
 
-  RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (CORBA::Environment &);
+  RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Allow transformations to RtecEventComm::PushConsumer.
 
   void shutdown (void);
@@ -1289,21 +1289,21 @@ public:
 
   virtual void connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
-      const RtecEventChannelAdmin::SupplierQOS& qos,
-      CORBA::Environment &)
+      const RtecEventChannelAdmin::SupplierQOS& qos
+      TAO_ENV_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          RtecEventChannelAdmin::AlreadyConnected));
   // Suppliers connect via this interface.  <push_supplier> is a
   // reference to the supplier.  <qos> represents the publish types of
   // the supplier.
 
-  virtual void push (const RtecEventComm::EventSet &event,
-                     CORBA::Environment &)
+  virtual void push (const RtecEventComm::EventSet &event
+                     TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Data arriving from a PushSupplier that must be sent to
   // consumers.  This is the entry point of all events.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect the supplier from the channel.
 
@@ -1373,30 +1373,30 @@ public:
 
   virtual void connect_push_consumer (
        RtecEventComm::PushConsumer_ptr push_consumer,
-       const RtecEventChannelAdmin::ConsumerQOS& qos,
-       CORBA::Environment &)
+       const RtecEventChannelAdmin::ConsumerQOS& qos
+       TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError));
   // A push consumer is connecting.  <push_consumer> is a reference to
   // the consumer.  <qos> is the subscription types for the consumer.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The consumer is disconnecting.
 
-  virtual void suspend_connection (CORBA::Environment &)
+  virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Stop forwarding events to the calling consumer.
 
-  virtual void resume_connection (CORBA::Environment &)
+  virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Resume forwarding events to the calling consumer.
 
   // = Event Channel operations.
 
-  void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment &);
+  void push (const RtecEventComm::EventSet &events
+             TAO_ENV_ARG_DECL_NOT_USED);
   // Push <events> to push_consumer_.
 
   int connected (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index 066a923782c..2582e74ee2e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -96,7 +96,7 @@ ACE_RT_Task::~ACE_RT_Task (void)
 int
 ACE_RT_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // @@ TODO It may be necessary to pass the options to this class
@@ -107,7 +107,7 @@ ACE_RT_Task::svc (void)
       };
       int argc = sizeof (argv)/sizeof (argv[0]);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif
 
@@ -120,14 +120,14 @@ ACE_RT_Task::svc (void)
         (this->rt_info_,
          thread_priority,
          subpriority,
-         preemption_priority, ACE_TRY_ENV);
+         preemption_priority TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       ACE_Scheduler_Factory::server ()->priority
         (this->rt_info_,
          thread_priority,
          subpriority,
-         preemption_priority, ACE_TRY_ENV);
+         preemption_priority TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif
       if (ACE_OS::thr_setprio (thread_priority) == -1)
@@ -257,17 +257,17 @@ ACE_RT_Task::open_task (const char* name)
       tempname = tempbuffer;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 #if 1
       rt_info_ =
-        this->scheduler_->create (tempname, ACE_TRY_ENV);
+        this->scheduler_->create (tempname TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       rt_info_ =
-        ACE_Scheduler_Factory::server()->create (tempname,
-                                                 ACE_TRY_ENV);
+        ACE_Scheduler_Factory::server()->create (tempname
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif
       // @@ TODO: We do no initialization of the new rt_info, the
@@ -314,7 +314,7 @@ ACE_RT_Task::synch_threads (size_t threads)
       RtecScheduler::Preemption_Subpriority_t subpriority;
       RtecScheduler::Preemption_Priority_t preemption_priority;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           {
@@ -325,14 +325,14 @@ ACE_RT_Task::synch_threads (size_t threads)
               (rt_info_,
                thread_priority,
                subpriority,
-               preemption_priority, ACE_TRY_ENV);
+               preemption_priority TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 #else
             ACE_Scheduler_Factory::server ()->priority
               (rt_info_,
                thread_priority,
                subpriority,
-               preemption_priority, ACE_TRY_ENV);
+               preemption_priority TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 #endif
           }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index 851cbe05b9e..826009f8d12 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -75,7 +75,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
     case 0:
       // @@ TODO handle exceptions
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
+        TAO_ENV_DECLARE_NEW_ENV;
         ACE_TRY
           {
 #if 1
@@ -89,8 +89,8 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
                RtecScheduler::VERY_LOW_IMPORTANCE,
                ORBSVCS_Time::zero (),
                1,
-               RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               RtecScheduler::OPERATION
+                TAO_ENV_ARG_PARAMETER);
 #else
             ACE_Scheduler_Factory::server()->set
               (rt_info_,
@@ -102,8 +102,8 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
                RtecScheduler::VERY_LOW_IMPORTANCE,
                ORBSVCS_Time::zero (),
                1,
-               RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               RtecScheduler::OPERATION
+                TAO_ENV_ARG_PARAMETER);
 #endif
             ACE_TRY_CHECK;
           }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 790a39dcd5b..7363d0956f9 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -19,8 +19,8 @@ TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void)
 
 
 TAO_Invocation_Endpoint_Selector *
-TAO_FT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *,
-                                                CORBA::Environment &ACE_TRY_ENV)
+TAO_FT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *
+                                                TAO_ENV_ARG_DECL)
 {
   if (this->ft_endpoint_selector_ == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index 6d07c616028..6cb35899442 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -52,8 +52,8 @@ public:
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
-      TAO_GIOP_Invocation *,
-      CORBA::Environment &ACE_TRY_ENV);
+      TAO_GIOP_Invocation *
+      TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index 4fcda4d248e..ec979f5a1cb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -13,8 +13,8 @@ ACE_RCSID(FaultTolerance, TAO_FT_IOGR_Property, "$Id$")
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
-    CORBA::Object_ptr ior,
-    CORBA::Environment & /*ACE_TRY_ENV*/)
+    CORBA::Object_ptr ior
+    TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::Invalid_IOR))
 {
@@ -62,8 +62,8 @@ TAO_FT_IOGR_Property::set_property (
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::is_primary_set (
-    CORBA::Object_ptr ior,
-    CORBA::Environment & /*ACE_TRY_ENV*/)
+    CORBA::Object_ptr ior
+    TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -77,8 +77,8 @@ TAO_FT_IOGR_Property::is_primary_set (
 
 CORBA::Object_ptr
 TAO_FT_IOGR_Property::get_primary (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Object_ptr ior
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -150,8 +150,8 @@ TAO_FT_IOGR_Property::get_primary (
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_primary (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Object_ptr ior2
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index 9bb7d5e3ae7..5b40302b226 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -75,10 +75,9 @@ public:
   // Decrement the reference count.
 
   virtual CORBA::Boolean set_property (
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::Invalid_IOR
@@ -87,10 +86,9 @@ public:
 
   virtual CORBA::Boolean set_primary (
       CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr ior2
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::NotFound,
@@ -99,10 +97,9 @@ public:
   // Set <ior1> as  primary which is a part of <ior2>
 
   virtual CORBA::Object_ptr get_primary (
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-      )
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -110,10 +107,9 @@ public:
   // Get the primary member from the IOGR <ior>
 
   virtual CORBA::Boolean is_primary_set (
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index a00cc6dd248..2f07b99f486 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -31,12 +31,12 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void)
 
 void
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
-  TAO_GIOP_Invocation *invocation,
-  CORBA::Environment &ACE_TRY_ENV)
+  TAO_GIOP_Invocation *invocation
+  TAO_ENV_ARG_DECL)
 {
 
-  int retval = this->select_endpoint_i (invocation,
-                                        ACE_TRY_ENV);
+  int retval = this->select_endpoint_i (invocation
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (retval == 0)
@@ -46,8 +46,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
                     "(%P|%t) TAO-FT - Primary doesnt exist.",
                     "Falling back on the default selection routines \n"));
 
-      TAO_Default_Endpoint_Selector::select_endpoint (invocation,
-                                                      ACE_TRY_ENV);
+      TAO_Default_Endpoint_Selector::select_endpoint (invocation
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -56,8 +56,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
 
 // @@ RTCORBA_Subsetting - next should be deprecated...
 void
-TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *,
-                                     CORBA::Environment &)
+TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n")));
   // if (invocation->stub_->next_profile_retry () == 0)
@@ -68,8 +68,8 @@ TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *,
 void
 TAO_FT_Invocation_Endpoint_Selector::forward (TAO_GIOP_Invocation
                                         *invocation,
-                                        const TAO_MProfile &mprofile,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const TAO_MProfile &mprofile
+                                        TAO_ENV_ARG_DECL)
 {
   invocation->stub ()->add_forward_profiles (mprofile);
   // This has to be and is thread safe.
@@ -105,12 +105,12 @@ TAO_FT_Invocation_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invo
 
 int
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
-    TAO_GIOP_Invocation *invocation,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_GIOP_Invocation *invocation
+    TAO_ENV_ARG_DECL)
 {
   int retval =
-    this->select_primary (invocation,
-                          ACE_TRY_ENV);
+    this->select_primary (invocation
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -165,8 +165,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
           invocation->endpoint (invocation->profile ()->endpoint ());
 
           int status =
-            this->endpoint_from_profile (invocation,
-                                         ACE_TRY_ENV);
+            this->endpoint_from_profile (invocation
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           if (status == 1)
@@ -184,8 +184,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
 
 int
 TAO_FT_Invocation_Endpoint_Selector::select_primary (
-    TAO_GIOP_Invocation *invoc,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_GIOP_Invocation *invoc
+    TAO_ENV_ARG_DECL)
 {
   // Get the current profile
   TAO_Profile *temp_profile =
@@ -198,8 +198,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       // Check whether we have a primary profile in hand.
       retval =
         this->check_profile_for_primary (invoc,
-                                         temp_profile,
-                                         ACE_TRY_ENV);
+                                         temp_profile
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   else
@@ -254,8 +254,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       // Check whether we have a primary profile in hand.
       retval =
         this->check_profile_for_primary (invoc,
-                                         temp_profile,
-                                         ACE_TRY_ENV);
+                                         temp_profile
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (retval == 1 || retval == -1)
@@ -286,8 +286,8 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
 int
 TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
     TAO_GIOP_Invocation *invocation,
-    TAO_Profile*pfile,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_Profile*pfile
+    TAO_ENV_ARG_DECL)
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = IOP::TAG_FT_PRIMARY;
@@ -309,8 +309,8 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
       invocation->endpoint (invocation->profile ()->endpoint ());
 
       int status =
-        this->endpoint_from_profile (invocation,
-                                     ACE_TRY_ENV);
+        this->endpoint_from_profile (invocation
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (status == 1)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index 9cdf8682b30..62e82e2a09e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -54,30 +54,28 @@ public:
   /// Implementation for FT. Please refer to
   /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h  for details of
   /// documentation.
-  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation
+                                TAO_ENV_ARG_DECL);
 
-  virtual void next (TAO_GIOP_Invocation *invocation,
-                     CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  virtual void next (TAO_GIOP_Invocation *invocation
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void forward (TAO_GIOP_Invocation *invocation,
-                        const TAO_MProfile &mprofile,
-                        CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                        const TAO_MProfile &mprofile
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void success (TAO_GIOP_Invocation *invocation);
   virtual void close_connection (TAO_GIOP_Invocation *invocation);
 
 protected:
 
-  int select_endpoint_i (TAO_GIOP_Invocation *invoc,
-                         CORBA::Environment &ACE_TRY_ENV);
+  int select_endpoint_i (TAO_GIOP_Invocation *invoc
+                         TAO_ENV_ARG_DECL);
 
-  int select_primary (TAO_GIOP_Invocation *invocation,
-                      CORBA::Environment &ACE_TRY_ENV);
+  int select_primary (TAO_GIOP_Invocation *invocation
+                      TAO_ENV_ARG_DECL);
 
   int check_profile_for_primary (TAO_GIOP_Invocation *,
-                                 TAO_Profile *,
-                                 CORBA::Environment &ACE_TRY_ENV);
+                                 TAO_Profile *
+                                 TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index a1c2b16555c..4f8a14173f8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -40,8 +40,6 @@ TAO_FT_ORBInitializer::register_policy_factories (
     PortableInterceptor::PolicyFactory::_nil ();
   PortableInterceptor::PolicyFactory_var policy_factory;
 
-  TAO_ENV_ARG_DEFN;
-
   // This policy factory is used for all FTCORBA related policies.
 
   ACE_NEW_THROW_EX (temp_factory,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
index ebee9f63a80..ba1b9775a2c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -22,17 +22,15 @@ TAO_FT_PolicyFactory::create_policy (
                    CORBA::PolicyError))
 {
 
-  TAO_ENV_ARG_DEFN;
-
   if (type ==  FT::REQUEST_DURATION_POLICY)
-    return  TAO_FT_Request_Duration_Policy::create (val,
-                                                    ACE_TRY_ENV);
+    return  TAO_FT_Request_Duration_Policy::create (val
+                                                    TAO_ENV_ARG_PARAMETER);
   else if (type == FT::HEARTBEAT_POLICY)
-    return TAO_FT_Heart_Beat_Policy::create (val,
-                                             ACE_TRY_ENV);
+    return TAO_FT_Heart_Beat_Policy::create (val
+                                             TAO_ENV_ARG_PARAMETER);
   else if (type == FT::HEARTBEAT_ENABLED_POLICY)
-    return TAO_FT_Heart_Beat_Enabled_Policy::create (val,
-                                                     ACE_TRY_ENV);
+    return TAO_FT_Heart_Beat_Enabled_Policy::create (val
+                                                     TAO_ENV_ARG_PARAMETER);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index e8ce8c4a5d9..0fe68876e0e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -10,22 +10,22 @@
 ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$")
 
 TimeBase::TimeT
-TAO_FT_Request_Duration_Policy::request_duration_value (CORBA::Environment &)
+TAO_FT_Request_Duration_Policy::request_duration_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
-TAO_FT_Request_Duration_Policy::policy_type (CORBA_Environment &)
+TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::REQUEST_DURATION_POLICY;
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
+                                        TAO_ENV_ARG_DECL)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
@@ -53,7 +53,7 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
+TAO_FT_Request_Duration_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Request_Duration_Policy* tmp;
@@ -66,7 +66,7 @@ TAO_FT_Request_Duration_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_FT_Request_Duration_Policy::destroy (CORBA_Environment &)
+TAO_FT_Request_Duration_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -94,7 +94,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 /*****************************************************************/
 
 FT::HeartbeatPolicyValue
-TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (CORBA::Environment &)
+TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::HeartbeatPolicyValue val;
@@ -107,8 +107,8 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (CORBA::Environment &)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
+                                  TAO_ENV_ARG_DECL)
 {
   FT::HeartbeatPolicyValue *value;
   if ((val >>= value) == 0)
@@ -129,7 +129,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val,
 
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Policy::policy_type (CORBA_Environment &)
+TAO_FT_Heart_Beat_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_POLICY;
@@ -137,7 +137,7 @@ TAO_FT_Heart_Beat_Policy::policy_type (CORBA_Environment &)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
+TAO_FT_Heart_Beat_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Policy * tmp;
@@ -160,7 +160,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 }
 
 void
-TAO_FT_Heart_Beat_Policy::destroy (CORBA_Environment &)
+TAO_FT_Heart_Beat_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -189,7 +189,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
 
 CORBA::Boolean
 TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
@@ -197,8 +197,8 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
+                                          TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean value;
 
@@ -217,7 +217,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val,
 }
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Enabled_Policy::policy_type (CORBA_Environment &)
+TAO_FT_Heart_Beat_Enabled_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_ENABLED_POLICY;
@@ -225,7 +225,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (CORBA_Environment &)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
+TAO_FT_Heart_Beat_Enabled_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp;
@@ -249,7 +249,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
 
 
 void
-TAO_FT_Heart_Beat_Enabled_Policy::destroy (CORBA_Environment &)
+TAO_FT_Heart_Beat_Enabled_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index 7da5d297aa8..c5231421ea1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -60,8 +60,8 @@ public:
   TAO_FT_Request_Duration_Policy (const TAO_FT_Request_Duration_Policy &rhs);
   // Copy constructor.
 
-  static CORBA::Policy_ptr create (const CORBA::Any& val,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  static CORBA::Policy_ptr create (const CORBA::Any& val
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
 
@@ -69,19 +69,19 @@ public:
   // Returns a copy of <this>.
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_value (CORBA::Environment &ACE_TRY_ENV)
+  virtual TimeBase::TimeT request_duration_value (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void set_time_value (ACE_Time_Value &time_value);
@@ -114,8 +114,8 @@ public:
   TAO_FT_Heart_Beat_Policy (const TAO_FT_Heart_Beat_Policy &rhs);
   // Copy constructor.
 
-  static CORBA::Policy_ptr create (const CORBA::Any& val,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  static CORBA::Policy_ptr create (const CORBA::Any& val
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
 
@@ -123,19 +123,19 @@ public:
   // Returns a copy of <this>.
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (CORBA::Environment &ACE_TRY_ENV)
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void set_time_value (ACE_Time_Value &time_value,
@@ -177,9 +177,8 @@ public:
       const TAO_FT_Heart_Beat_Enabled_Policy &rhs);
   // Copy constructor.
 
-  static CORBA::Policy_ptr create (const CORBA::Any& val,
-                                   CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ());
+  static CORBA::Policy_ptr create (const CORBA::Any& val
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
 
@@ -188,19 +187,19 @@ public:
 
   // = The FT::HeartBeatPolicy methods
   virtual CORBA::Boolean heartbeat_enabled_policy_value (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Policy_ptr copy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 4db5b479aab..7d75ef8a98b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -158,8 +158,8 @@ void
 TAO_FT_Service_Callbacks::service_context_list (
     TAO_Stub *&stub,
     IOP::ServiceContextList &service_list,
-    CORBA::Boolean restart,
-    CORBA::Environment  &ACE_TRY_ENV)
+    CORBA::Boolean restart
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -170,14 +170,14 @@ TAO_FT_Service_Callbacks::service_context_list (
     {
       // Pack the group version service context
       this->group_version_service_context (stub,
-                                           service_list,
-                                           ACE_TRY_ENV);
+                                           service_list
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Pack the request service context
       this->request_service_context (stub,
-                                     service_list,
-                                     ACE_TRY_ENV);
+                                     service_list
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -187,8 +187,8 @@ TAO_FT_Service_Callbacks::service_context_list (
 void
 TAO_FT_Service_Callbacks::request_service_context (
     TAO_Stub *&stub,
-    IOP::ServiceContextList &service_list,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceContextList &service_list
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_OutputCDR cdr;
@@ -210,8 +210,8 @@ TAO_FT_Service_Callbacks::request_service_context (
 
   // Check whether the FT::RequestDurationPolicy has been set
   CORBA::Policy_var policy =
-    stub->get_policy (FT::REQUEST_DURATION_POLICY,
-                      ACE_TRY_ENV);
+    stub->get_policy (FT::REQUEST_DURATION_POLICY
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ There are two possibilities a) Duration policy has not been
@@ -231,7 +231,7 @@ TAO_FT_Service_Callbacks::request_service_context (
         FT::RequestDurationPolicy::_narrow (policy.in ());
 
       exp_time =
-        duration_policy->request_duration_value (ACE_TRY_ENV);
+        duration_policy->request_duration_value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -288,8 +288,8 @@ TAO_FT_Service_Callbacks::request_service_context (
 void
 TAO_FT_Service_Callbacks::group_version_service_context (
     TAO_Stub *&stub,
-    IOP::ServiceContextList &service_list,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceContextList &service_list
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_OutputCDR cdr;
@@ -368,8 +368,8 @@ TAO_FT_Service_Callbacks::get_object_group_version (TAO_Profile *profile)
 int
 TAO_FT_Service_Callbacks::raise_comm_failure (
     TAO_GIOP_Invocation *invoke,
-    TAO_Profile *profile,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_Profile *profile
+    TAO_ENV_ARG_DECL)
 {
   if (this->restart_policy_check (
           invoke->request_service_context ().service_info (),
@@ -402,8 +402,8 @@ TAO_FT_Service_Callbacks::raise_comm_failure (
 int
 TAO_FT_Service_Callbacks::raise_transient_failure (
     TAO_GIOP_Invocation *invoke,
-    TAO_Profile *profile,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_Profile *profile
+    TAO_ENV_ARG_DECL)
 {
   if (restart_policy_check (
         invoke->request_service_context ().service_info (),
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index 66acf2c3ad1..76148080a80 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -75,23 +75,23 @@ public:
 
   virtual void service_context_list (TAO_Stub *&stub,
                                      IOP::ServiceContextList &service_list,
-                                     CORBA::Boolean restart,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Boolean restart
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Add relevant stuff to the service context list
 
   virtual int raise_comm_failure (
       TAO_GIOP_Invocation *invoke,
-      TAO_Profile *profile,
-      CORBA::Environment &ACE_TRY_ENV);
+      TAO_Profile *profile
+      TAO_ENV_ARG_DECL);
   // Check whether we need to raise an exception or go for a
   // reinvocaton.
 
   virtual int raise_transient_failure (
       TAO_GIOP_Invocation *invoke,
-      TAO_Profile *profile,
-      CORBA::Environment &ACE_TRY_ENV);
+      TAO_Profile *profile
+      TAO_ENV_ARG_DECL);
   // Check whether we need to raise an exception or go for a
   // reinvocaton.
 
@@ -109,14 +109,14 @@ public:
 private:
 
   void request_service_context (TAO_Stub *&stub,
-                                IOP::ServiceContextList &service_list,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                IOP::ServiceContextList &service_list
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Makes  the  request service_context list
 
   void group_version_service_context (TAO_Stub *&stub,
-                                      IOP::ServiceContextList &service_list,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      IOP::ServiceContextList &service_list
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make the group version service context list
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp
index 7dbe9cefca5..af98cb7e372 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp
@@ -29,8 +29,8 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void)
 
 LoadBalancing::ReplicaProxy_ptr
 TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
-                              CORBA::Object_ptr replica,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Object_ptr replica
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
@@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
 
   PortableServer::ServantBase_var proxy_servant = proxy;
 
-  proxy->connect (this, control, replica, ACE_TRY_ENV);
+  proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ());
 
   if (this->strategy_->insert (proxy) == -1)
@@ -56,21 +56,21 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
                         LoadBalancing::ReplicaProxy::_nil ());
     }
 
-  return proxy->_this (ACE_TRY_ENV);
+  return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_LB_LoadBalancer::group_identity (CORBA::Environment &)
+TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->group_identity_.in ());
 }
 
 void
-TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy
+                                   TAO_ENV_ARG_DECL)
 {
-  this->strategy_->load_changed (proxy, ACE_TRY_ENV);
+  this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 int
@@ -84,14 +84,14 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       // for a ServantLocator.
       PortableServer::RequestProcessingPolicy_var request =
         root_poa->create_request_processing_policy (
-          PortableServer::USE_SERVANT_MANAGER,
-          ACE_TRY_ENV);
+          PortableServer::USE_SERVANT_MANAGER
+          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ServantRetentionPolicy_var retention =
         root_poa->create_servant_retention_policy (
-          PortableServer::NON_RETAIN,
-          ACE_TRY_ENV);
+          PortableServer::NON_RETAIN
+          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the PolicyList.
@@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       // Create the child POA with the ServantManager (ReplicaLocator)
       // above policies.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA",
                                          poa_manager.in (),
-                                         policy_list,
-                                         ACE_TRY_ENV);
+                                         policy_list
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the child POA.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      request->destroy (ACE_TRY_ENV);
+      request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      retention->destroy (ACE_TRY_ENV);
+      retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now set the ReplicaLocator as the child POA's Servant
       // Manager.
-      this->poa_->set_servant_manager (&this->locator_,
-                                       ACE_TRY_ENV);
+      this->poa_->set_servant_manager (&this->locator_
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ What ObjectId should be used?
@@ -137,8 +137,8 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
 
       this->group_identity_ =
         this->poa_->create_reference_with_id (oid.in (),
-                                              repository_id,
-                                              ACE_TRY_ENV);
+                                              repository_id
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h
index 1b711b531e6..a410c01cdec 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h
@@ -58,18 +58,18 @@ public:
   // that should let us keep the average load (and other similar
   // things) pre-computed.
   //
-  void load_changed (TAO_LB_ReplicaProxy *proxy,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void load_changed (TAO_LB_ReplicaProxy *proxy
+                     TAO_ENV_ARG_DECL);
   // The load for <proxy> has changed, the LoadBalancer can use this
   // opportunity to determine if the load on one of the services is
   // too high.
 
-  void disconnect (TAO_LB_ReplicaProxy *proxy,
-                   CORBA::Environment &ACE_TRY_ENV)
+  void disconnect (TAO_LB_ReplicaProxy *proxy
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect proxy from the Load Balancer.
 
-  CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a reference to the Replica to which client requests should
   // be redirected next.
@@ -77,12 +77,12 @@ public:
   // = See the descriptions in LoadBalancing.idl
   virtual LoadBalancing::ReplicaProxy_ptr connect (
         LoadBalancing::ReplicaControl_ptr control,
-        CORBA::Object_ptr replica,
-        CORBA::Environment &ACE_TRY_ENV)
+        CORBA::Object_ptr replica
+        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
-  virtual CORBA::Object_ptr group_identity (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i
index 884b8ab95ab..f667e95a552 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i
@@ -4,8 +4,8 @@
 
 
 ACE_INLINE void
-TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy,
-                                 CORBA::Environment &)
+TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy
+                                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama, what is the we cannot raise that exception here!
@@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy,
 
 
 ACE_INLINE CORBA::Object_ptr
-TAO_LB_LoadBalancer::replica (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->strategy_->replica (ACE_TRY_ENV);
+  return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp
index 7dbe9cefca5..af98cb7e372 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp
@@ -29,8 +29,8 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void)
 
 LoadBalancing::ReplicaProxy_ptr
 TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
-                              CORBA::Object_ptr replica,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Object_ptr replica
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
@@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
 
   PortableServer::ServantBase_var proxy_servant = proxy;
 
-  proxy->connect (this, control, replica, ACE_TRY_ENV);
+  proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ());
 
   if (this->strategy_->insert (proxy) == -1)
@@ -56,21 +56,21 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
                         LoadBalancing::ReplicaProxy::_nil ());
     }
 
-  return proxy->_this (ACE_TRY_ENV);
+  return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_LB_LoadBalancer::group_identity (CORBA::Environment &)
+TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->group_identity_.in ());
 }
 
 void
-TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy
+                                   TAO_ENV_ARG_DECL)
 {
-  this->strategy_->load_changed (proxy, ACE_TRY_ENV);
+  this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER);
 }
 
 int
@@ -84,14 +84,14 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       // for a ServantLocator.
       PortableServer::RequestProcessingPolicy_var request =
         root_poa->create_request_processing_policy (
-          PortableServer::USE_SERVANT_MANAGER,
-          ACE_TRY_ENV);
+          PortableServer::USE_SERVANT_MANAGER
+          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ServantRetentionPolicy_var retention =
         root_poa->create_servant_retention_policy (
-          PortableServer::NON_RETAIN,
-          ACE_TRY_ENV);
+          PortableServer::NON_RETAIN
+          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the PolicyList.
@@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       // Create the child POA with the ServantManager (ReplicaLocator)
       // above policies.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA",
                                          poa_manager.in (),
-                                         policy_list,
-                                         ACE_TRY_ENV);
+                                         policy_list
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the child POA.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      request->destroy (ACE_TRY_ENV);
+      request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      retention->destroy (ACE_TRY_ENV);
+      retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now set the ReplicaLocator as the child POA's Servant
       // Manager.
-      this->poa_->set_servant_manager (&this->locator_,
-                                       ACE_TRY_ENV);
+      this->poa_->set_servant_manager (&this->locator_
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ What ObjectId should be used?
@@ -137,8 +137,8 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
 
       this->group_identity_ =
         this->poa_->create_reference_with_id (oid.in (),
-                                              repository_id,
-                                              ACE_TRY_ENV);
+                                              repository_id
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h
index 1b711b531e6..a410c01cdec 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h
@@ -58,18 +58,18 @@ public:
   // that should let us keep the average load (and other similar
   // things) pre-computed.
   //
-  void load_changed (TAO_LB_ReplicaProxy *proxy,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void load_changed (TAO_LB_ReplicaProxy *proxy
+                     TAO_ENV_ARG_DECL);
   // The load for <proxy> has changed, the LoadBalancer can use this
   // opportunity to determine if the load on one of the services is
   // too high.
 
-  void disconnect (TAO_LB_ReplicaProxy *proxy,
-                   CORBA::Environment &ACE_TRY_ENV)
+  void disconnect (TAO_LB_ReplicaProxy *proxy
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect proxy from the Load Balancer.
 
-  CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a reference to the Replica to which client requests should
   // be redirected next.
@@ -77,12 +77,12 @@ public:
   // = See the descriptions in LoadBalancing.idl
   virtual LoadBalancing::ReplicaProxy_ptr connect (
         LoadBalancing::ReplicaControl_ptr control,
-        CORBA::Object_ptr replica,
-        CORBA::Environment &ACE_TRY_ENV)
+        CORBA::Object_ptr replica
+        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
-  virtual CORBA::Object_ptr group_identity (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i
index 884b8ab95ab..f667e95a552 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i
@@ -4,8 +4,8 @@
 
 
 ACE_INLINE void
-TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy,
-                                 CORBA::Environment &)
+TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy
+                                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama, what is the we cannot raise that exception here!
@@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy,
 
 
 ACE_INLINE CORBA::Object_ptr
-TAO_LB_LoadBalancer::replica (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->strategy_->replica (ACE_TRY_ENV);
+  return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
index a64cf50f4b7..f0b9d4f00f7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
@@ -17,8 +17,8 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void)
 }
 
 void
-TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *,
-                                              CORBA::Environment &)
+TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *
+                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
index a13fe85e1e7..946325788d9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
@@ -47,7 +47,7 @@ public:
   // @@ The name of the method should be more meaningful, what about:
   //    select_replica(), select_unloaded_replica() or something like
   //    that?
-  virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Return the object reference to the Replica to which requests should
   // be redirected.
@@ -59,8 +59,8 @@ public:
   virtual int remove (TAO_LB_ReplicaProxy *) = 0;
   // Remove ReplicaProxy servant from the set of replica proxies.
 
-  virtual void load_changed (TAO_LB_ReplicaProxy *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void load_changed (TAO_LB_ReplicaProxy *proxy
+                             TAO_ENV_ARG_DECL);
   // The load on one proxy has changed.
   // @@ Ossama: see my comments on LoadBalancing_i about changing the
   // signature of this method.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
index 696af20d676..06d74819fb2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
@@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for ( ; ; )
@@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
         ACE_TRY
           {
             CORBA::Boolean non_existent =
-              object->_non_existent (ACE_TRY_ENV);
+              object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (!non_existent)
               {
@@ -129,8 +129,8 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy)
 }
 
 void
-TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy,
-                                               CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
+                                               TAO_ENV_ARG_DECL)
 {
   int send_load_advisory = 0;
 
@@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy,
   // dispersion we tolerate before starting to send advisories.
   if (send_load_advisory == 2)
     {
-      proxy->control_->high_load_advisory (ACE_TRY_ENV);
+      proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;  // We may not throw an exception, so explicitly return.
@@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy,
   // construction time...
   if (send_load_advisory == 1)
     {
-      proxy->control_->nominal_load_advisory (ACE_TRY_ENV);
+      proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
index fcf0b686ae3..df4e679543c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
@@ -56,12 +56,12 @@ public:
   // Destructor
 
   // = The TAO_LB_LoadBalancing_Strategy methods
-  virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
-  virtual void load_changed (TAO_LB_ReplicaProxy *,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void load_changed (TAO_LB_ReplicaProxy *
+                             TAO_ENV_ARG_DECL);
 
 private:
   TAO_LB_ReplicaProxySet proxies_;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp
index 03686e655bc..66a03582d03 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp
@@ -23,13 +23,11 @@ TAO_LB_ReplicaLocator::preinvoke (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   if (this->load_balancer_ == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   CORBA::Object_var replica =
-    this->load_balancer_->replica (ACE_TRY_ENV);
+    this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Throw a forward exception to force the client to redirect its
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
index 8dc15cbde74..bfc9d025ba7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
@@ -22,8 +22,8 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void)
 }
 
 void
-TAO_LB_ReplicaProxy::current_load (CORBA::Float load,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_ReplicaProxy::current_load (CORBA::Float load
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama: this is the point were the load dampening should
@@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load,
   this->current_load_ = load;
   // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load));
 
-  this->balancer_->load_changed (this, ACE_TRY_ENV);
+  this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                    CORBA::SystemException))
 {
@@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->connected_)
     {
-      this->balancer_->disconnect (this, ACE_TRY_ENV);
+      this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->connected_ = 0;
@@ -63,8 +63,8 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
                               LoadBalancing::ReplicaControl_ptr control,
-                              CORBA::Object_ptr replica,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Object_ptr replica
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
index a4f60a41a06..9eb629ea29f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
@@ -54,8 +54,8 @@ public:
   CORBA::Object_ptr replica (void);
   // Return a reference to the Replica.
 
-  virtual void current_load (CORBA::Float load,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void current_load (CORBA::Float load
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send the value of the current load on the Object being load
   // balanced, where the definition of "load" is load balancing
@@ -69,7 +69,7 @@ public:
   // without affecting the client, or detect rapid raises in load and
   // react proactively to those...
 
-  virtual void disconnect (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                      CORBA::SystemException));
   // Send a request to disconnect from the LoadBalancer.
@@ -92,8 +92,8 @@ private:
 
   void connect (TAO_LB_LoadBalancer *balancer,
                 LoadBalancing::ReplicaControl_ptr control,
-                CORBA::Object_ptr replica,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Object_ptr replica
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
index a64cf50f4b7..f0b9d4f00f7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
@@ -17,8 +17,8 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void)
 }
 
 void
-TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *,
-                                              CORBA::Environment &)
+TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *
+                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
index a13fe85e1e7..946325788d9 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
@@ -47,7 +47,7 @@ public:
   // @@ The name of the method should be more meaningful, what about:
   //    select_replica(), select_unloaded_replica() or something like
   //    that?
-  virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Return the object reference to the Replica to which requests should
   // be redirected.
@@ -59,8 +59,8 @@ public:
   virtual int remove (TAO_LB_ReplicaProxy *) = 0;
   // Remove ReplicaProxy servant from the set of replica proxies.
 
-  virtual void load_changed (TAO_LB_ReplicaProxy *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void load_changed (TAO_LB_ReplicaProxy *proxy
+                             TAO_ENV_ARG_DECL);
   // The load on one proxy has changed.
   // @@ Ossama: see my comments on LoadBalancing_i about changing the
   // signature of this method.
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 6bb9811ad30..f121cfc75f3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -14,30 +14,30 @@ BasicLogFactory_i::~BasicLogFactory_i()
 }
 
 DsLogAdmin::BasicLogFactory_ptr
-BasicLogFactory_i::activate (PortableServer::POA_ptr poa,
-                           CORBA::Environment &ACE_TRY_ENV)
+BasicLogFactory_i::activate (PortableServer::POA_ptr poa
+                           TAO_ENV_ARG_DECL)
 {
   DsLogAdmin::BasicLogFactory_var v_return;
 
   PortableServer::ObjectId_var oid =
-    poa->activate_object (this,
-                          ACE_TRY_ENV);
+    poa->activate_object (this
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   CORBA::Object_var obj =
-    poa->id_to_reference (oid.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (oid.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   // narrow and store the result..
   this->log_mgr_ =
-    DsLogAdmin::LogMgr::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+    DsLogAdmin::LogMgr::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   v_return =
-    DsLogAdmin::BasicLogFactory::_narrow (obj.in (),
-                                          ACE_TRY_ENV);
+    DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
 
   return v_return._retn ();
@@ -46,8 +46,8 @@ BasicLogFactory_i::activate (PortableServer::POA_ptr poa,
 DsLogAdmin::BasicLog_ptr
 BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action,
                            CORBA::ULongLong max_rec_size,
-                           DsLogAdmin::LogId_out id,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           DsLogAdmin::LogId_out id
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::NoResources
                    ))
@@ -58,8 +58,8 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action,
   DsLogAdmin::BasicLog_ptr basiclog =
     this->create_with_id (this->max_id_,
                           full_action,
-                          max_rec_size,
-                          ACE_TRY_ENV);
+                          max_rec_size
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
 
   // Set the id to return..
@@ -70,8 +70,8 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action,
 DsLogAdmin::BasicLog_ptr
 BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
                                    DsLogAdmin::LogFullAction full_action,
-                                   CORBA::ULongLong max_size,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::ULongLong max_size
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    DsLogAdmin::NoResources,
@@ -101,14 +101,14 @@ BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
   auto_ptr<BasicLog_i> basic_log_auto (basic_log_i);
   // just in case the activation fails.
 
-  basic_log_i->init (ACE_TRY_ENV);
+  basic_log_i->init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (basic_log._retn ());
 
   // Register with the poa
-  basic_log = basic_log_i->_this (ACE_TRY_ENV);
+  basic_log = basic_log_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (basic_log._retn ());
 
-  basic_log_i->_remove_ref (ACE_TRY_ENV);
+  basic_log_i->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
 
   // Add to the Hash table..
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index e291baa60e2..58c6c556192 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -50,15 +50,15 @@ public:
   // Dtor
 
   DsLogAdmin::BasicLogFactory_ptr
-    activate (PortableServer::POA_ptr poa,
-              CORBA::Environment &ACE_TRY_ENV);
+    activate (PortableServer::POA_ptr poa
+              TAO_ENV_ARG_DECL);
   // Activate this servant with the POA passed in.
 
   DsLogAdmin::BasicLog_ptr
     create (DsLogAdmin::LogFullAction full_action,
             CORBA::ULongLong max_size,
-            DsLogAdmin::LogId_out id,
-            CORBA_Environment& ACE_TRY_ENV)
+            DsLogAdmin::LogId_out id
+            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::NoResources
                      ));
@@ -68,8 +68,8 @@ public:
   DsLogAdmin::BasicLog_ptr
     create_with_id (DsLogAdmin::LogId id,
                     DsLogAdmin::LogFullAction full_action,
-                    CORBA::ULongLong max_size,
-                    CORBA_Environment& ACE_TRY_ENV)
+                    CORBA::ULongLong max_size
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      DsLogAdmin::NoResources,
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index bb9e047abd3..4c242a8c376 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -21,7 +21,7 @@ BasicLog_i::~BasicLog_i ()
 }
 
 void
-BasicLog_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+BasicLog_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove ourselves from the list of logs.
@@ -29,15 +29,15 @@ BasicLog_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 942a6b7e715..8483089c925 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -31,29 +31,29 @@ Iterator_i::~Iterator_i (void)
 }
 
 void
-Iterator_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_ptr poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_ptr poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Goodbye cruel world...
   // deactivate from the poa.
-  poa->deactivate_object (oid.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (oid.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   return;
 }
 
 DsLogAdmin::RecordList*
 Iterator_i::get (CORBA::ULong position,
-                 CORBA::ULong how_many,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::ULong how_many
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -72,8 +72,8 @@ Iterator_i::get (CORBA::ULong position,
     }
 
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint_,
-                                              ACE_TRY_ENV);
+  TAO_Log_Constraint_Interpreter interpreter (constraint_
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Sequentially iterate over all the records and pick the ones that
@@ -122,7 +122,7 @@ Iterator_i::get (CORBA::ULong position,
   if (done == 1)
     {
       // destroy this object..
-      this->destroy (ACE_TRY_ENV);
+      this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (rec_list);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index 7b4ff48eb1f..f20c1e7980b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -57,13 +57,13 @@ public:
   //Destructor
 
   DsLogAdmin::RecordList* get (CORBA::ULong position,
-                               CORBA::ULong how_many,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::ULong how_many
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
   // Gets a list of LogRecords.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV)
+  void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This destroys the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 79083bb3a25..eef4349d9ff 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -13,7 +13,7 @@ LogMgr_i::~LogMgr_i ()
 }
 
 DsLogAdmin::LogList*
-LogMgr_i::list_logs (CORBA::Environment &ACE_TRY_ENV)
+LogMgr_i::list_logs (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -50,8 +50,8 @@ LogMgr_i::list_logs (CORBA::Environment &ACE_TRY_ENV)
 }
 
 DsLogAdmin::Log_ptr
-LogMgr_i::find_log (DsLogAdmin::LogId id,
-                    CORBA::Environment &/*ACE_TRY_ENV*/)
+LogMgr_i::find_log (DsLogAdmin::LogId id
+                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -82,7 +82,7 @@ LogMgr_i::find_log (DsLogAdmin::LogId id,
 }
 
 DsLogAdmin::LogIdList*
-LogMgr_i::list_logs_by_id (CORBA::Environment &ACE_TRY_ENV)
+LogMgr_i::list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index a3f0d8adf96..8b6455b0fef 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -40,25 +40,22 @@ public:
   // Destructor.
 
   DsLogAdmin::LogList *
-    list_logs (CORBA::Environment &ACE_TRY_ENV =
-               CORBA::default_environment ())
+    list_logs (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
   // Lists all logs created by the log factory
 
   DsLogAdmin::Log_ptr
-    find_log (DsLogAdmin::LogId id,
-              CORBA::Environment &ACE_TRY_ENV =
-              CORBA::default_environment ())
+    find_log (DsLogAdmin::LogId id
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
   // Returns a reference to the log with the supplied id
 
   DsLogAdmin::LogIdList *
-  list_logs_by_id (CORBA::Environment &ACE_TRY_ENV =
-		   CORBA::default_environment ())
+  list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index 533efe4307f..d87f5406087 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -4,8 +4,8 @@
 #include "Log_Constraint_Visitors.h"
 
 TAO_Log_Constraint_Interpreter::
-TAO_Log_Constraint_Interpreter(const char* constraints,
-                               CORBA::Environment& ACE_TRY_ENV)
+TAO_Log_Constraint_Interpreter(const char* constraints
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                    CORBA::NO_MEMORY))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index 07cfca1fd89..a68ab3deedb 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -36,8 +36,8 @@ class TAO_Log_Export TAO_Log_Constraint_Interpreter : public TAO_Interpreter
   //   "TCL" Interpreter for the Log queries.
 public:
   // = Initialization and termination methods.
-  TAO_Log_Constraint_Interpreter (const char* constraints,
-                              CORBA::Environment& ACE_TRY_ENV)
+  TAO_Log_Constraint_Interpreter (const char* constraints
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                      CORBA::NO_MEMORY));
   // This constructor builds an expression tree representing the
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 90b54c73063..c9c9aeae5a0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -29,13 +29,13 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       CORBA::Any *value = 0;
       // Retrieve the value of the property from the Property_Evaluator
       ACE_TRY
         {
-          // value = this->prop_eval_.property_value (prop_index, ACE_TRY_ENV);
+          // value = this->prop_eval_.property_value (prop_index TAO_ENV_ARG_PARAMETER);
           ACE_NEW_THROW_EX (value,
                             CORBA::Any,
                             CORBA::NO_MEMORY ());
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index dfd6e3c3b6c..8136149246a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -29,7 +29,7 @@ Log_i::Log_i (DsLogAdmin::LogMgr_ptr factory,
 }
 
 void
-Log_i::init (CORBA::Environment &ACE_TRY_ENV)
+Log_i::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (recordstore_.open () ==-1)
     ACE_THROW (CORBA::UNKNOWN ());
@@ -46,21 +46,21 @@ Log_i::~Log_i (void)
 }
 
 DsLogAdmin::LogMgr_ptr
-Log_i::my_factory (CORBA::Environment &)
+Log_i::my_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return DsLogAdmin::LogMgr::_duplicate (factory_.in ());
 }
 
 DsLogAdmin::LogId
-Log_i::id (CORBA::Environment &)
+Log_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return logid_;
 }
 
 DsLogAdmin::QoSList*
-Log_i::get_qos (CORBA::Environment &ACE_TRY_ENV)
+Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::QoSList* ret_val;
@@ -72,8 +72,8 @@ Log_i::get_qos (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Log_i::set_qos (const DsLogAdmin::QoSList &qos,
-                CORBA::Environment &ACE_TRY_ENV)
+Log_i::set_qos (const DsLogAdmin::QoSList &qos
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::UnsupportedQoS))
 {
@@ -100,15 +100,15 @@ Log_i::set_qos (const DsLogAdmin::QoSList &qos,
 }
 
 CORBA::ULong
-Log_i::get_max_record_life (CORBA::Environment &)
+Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return max_record_life_;
 }
 
 void
-Log_i::set_max_record_life (CORBA::ULong life,
-                            CORBA::Environment &ACE_TRY_ENV)
+Log_i::set_max_record_life (CORBA::ULong life
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // life is in seconds.
@@ -119,15 +119,15 @@ Log_i::set_max_record_life (CORBA::ULong life,
 }
 
 CORBA::ULongLong
-Log_i::get_max_size (CORBA::Environment &)
+Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return recordstore_.get_max_size ();
 }
 
 void
-Log_i::set_max_size (CORBA::ULongLong size,
-                     CORBA::Environment &ACE_TRY_ENV)
+Log_i::set_max_size (CORBA::ULongLong size
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -146,81 +146,81 @@ Log_i::set_max_size (CORBA::ULongLong size,
 }
 
 CORBA::ULongLong
-Log_i::get_current_size (CORBA::Environment &)
+Log_i::get_current_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recordstore_.get_current_size ();
 }
 
 CORBA::ULongLong
-Log_i::get_n_records (CORBA::Environment &)
+Log_i::get_n_records (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recordstore_.get_n_records ();
 }
 
 DsLogAdmin::LogFullAction
-Log_i::get_log_full_action (CORBA::Environment &)
+Log_i::get_log_full_action (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return log_full_action_;
 }
 
 void
-Log_i::set_log_full_action (DsLogAdmin::LogFullAction action,
-                            CORBA::Environment &)
+Log_i::set_log_full_action (DsLogAdmin::LogFullAction action
+                            TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   log_full_action_ = action;
 }
 
 DsLogAdmin::AdministrativeState
-Log_i::get_administrative_state (CORBA::Environment &)
+Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return admin_state_;
 }
 
 void
-Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state,
-                                 CORBA::Environment &)
+Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
+                                 TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->admin_state_ = state;
 }
 
 DsLogAdmin::ForwardingState
-Log_i::get_forwarding_state (CORBA::Environment &)
+Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->forward_state_;
 }
 
 void
-Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state,
-                             CORBA::Environment &)
+Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
+                             TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->forward_state_ = state;
 }
 
 DsLogAdmin::OperationalState
-Log_i::get_operational_state (CORBA::Environment &)
+Log_i::get_operational_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->op_state_;
 }
 
 DsLogAdmin::TimeInterval
-Log_i::get_interval (CORBA::Environment &)
+Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->interval_;
 }
 
 void
-Log_i::set_interval (const DsLogAdmin::TimeInterval &interval,
-                     CORBA::Environment &ACE_TRY_ENV)
+Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval))
@@ -232,7 +232,7 @@ Log_i::set_interval (const DsLogAdmin::TimeInterval &interval,
 }
 
 DsLogAdmin::AvailabilityStatus
-Log_i::get_availability_status (CORBA::Environment &)
+Log_i::get_availability_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO:
@@ -249,7 +249,7 @@ Log_i::get_availability_status (CORBA::Environment &)
 }
 
 DsLogAdmin::CapacityAlarmThresholdList*
-Log_i::get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV)
+Log_i::get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::CapacityAlarmThresholdList* ret_val;
@@ -264,8 +264,8 @@ Log_i::get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV)
 void
 Log_i::set_capacity_alarm_thresholds (const
                                       DsLogAdmin::CapacityAlarmThresholdList
-                                      &threshs,
-                                      CORBA::Environment &)
+                                      &threshs
+                                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidThreshold))
 {
@@ -277,7 +277,7 @@ Log_i::set_capacity_alarm_thresholds (const
 }
 
 DsLogAdmin::WeekMask*
-Log_i::get_week_mask (CORBA::Environment &ACE_TRY_ENV)
+Log_i::get_week_mask (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::WeekMask* ret_val;
@@ -290,8 +290,8 @@ Log_i::get_week_mask (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks,
-                      CORBA::Environment &)
+Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
+                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval,
@@ -305,14 +305,14 @@ Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks,
 DsLogAdmin::RecordList*
 Log_i::query_i (const char *constraint,
                 DsLogAdmin::Iterator_out &iter_out,
-                CORBA::ULong how_many,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::ULong how_many
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidConstraint))
 {
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint,
-                                              ACE_TRY_ENV);
+  TAO_Log_Constraint_Interpreter interpreter (constraint
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Sequentially iterate over all the records and pick the ones that
@@ -393,11 +393,11 @@ Log_i::query_i (const char *constraint,
       ACE_CHECK_RETURN (rec_list);
 
       // Activate it.
-      iter_out = iter_query->_this (ACE_TRY_ENV);
+      iter_out = iter_query->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (rec_list);
 
       // Give ownership to the POA.
-      this->_remove_ref (ACE_TRY_ENV);
+      this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (rec_list);
     }
 
@@ -407,20 +407,20 @@ Log_i::query_i (const char *constraint,
 DsLogAdmin::RecordList*
 Log_i::query (const char *grammar,
               const char *constraint,
-              DsLogAdmin::Iterator_out iter_out,
-              CORBA::Environment &ACE_TRY_ENV)
+              DsLogAdmin::Iterator_out iter_out
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar, ACE_TRY_ENV);
+  this->check_grammar (grammar TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   DsLogAdmin::RecordList* rec_list =
     this->query_i (constraint,
                    iter_out,
-                   this->max_rec_list_len_,
-                   ACE_TRY_ENV);
+                   this->max_rec_list_len_
+                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (rec_list);
 
   return rec_list;
@@ -429,8 +429,8 @@ Log_i::query (const char *grammar,
 DsLogAdmin::RecordList*
 Log_i::retrieve (DsLogAdmin::TimeT from_time,
                  CORBA::Long how_many,
-                 DsLogAdmin::Iterator_out iter_out,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 DsLogAdmin::Iterator_out iter_out
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Decide between forward vs backward retrieval.
@@ -453,8 +453,8 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time,
   DsLogAdmin::RecordList* rec_list =
     this->query_i (constraint,
                    iter_out,
-                   how_many,
-                   ACE_TRY_ENV);
+                   how_many
+                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (rec_list);
 
   return rec_list;
@@ -462,14 +462,14 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time,
 
 CORBA::ULong
 Log_i::match_i (const char *constraint,
-                CORBA::Boolean delete_rec,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Boolean delete_rec
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidConstraint))
 {
   // Use an Interpreter to build an expression tree.
-  TAO_Log_Constraint_Interpreter interpreter (constraint,
-                                              ACE_TRY_ENV);
+  TAO_Log_Constraint_Interpreter interpreter (constraint
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the underlying storage.
@@ -514,17 +514,17 @@ Log_i::match_i (const char *constraint,
 
 CORBA::ULong
 Log_i::match (const char* grammar,
-              const char *constraint,
-              CORBA::Environment &ACE_TRY_ENV)
+              const char *constraint
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar, ACE_TRY_ENV);
+  this->check_grammar (grammar TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong count =
-    this->match_i (constraint, 0, ACE_TRY_ENV);
+    this->match_i (constraint, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (count);
 
   return count;
@@ -532,17 +532,17 @@ Log_i::match (const char* grammar,
 
 CORBA::ULong
 Log_i::delete_records (const char *grammar,
-                       const char *constraint,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const char *constraint
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar, ACE_TRY_ENV);
+  this->check_grammar (grammar TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong count =
-    this->match_i (constraint, 1, ACE_TRY_ENV);
+    this->match_i (constraint, 1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (count);
 
   return count;
@@ -550,8 +550,8 @@ Log_i::delete_records (const char *grammar,
 
 CORBA::ULong
 Log_i::delete_records_by_id (const
-                             DsLogAdmin::RecordIdList &ids,
-                             CORBA::Environment &)
+                             DsLogAdmin::RecordIdList &ids
+                             TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong numdone (0);
@@ -568,8 +568,8 @@ Log_i::delete_records_by_id (const
 }
 
 void
-Log_i::write_records (const DsLogAdmin::Anys &records,
-                      CORBA::Environment &ACE_TRY_ENV)
+Log_i::write_records (const DsLogAdmin::Anys &records
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogFull,
                    DsLogAdmin::LogLocked))
@@ -583,13 +583,13 @@ Log_i::write_records (const DsLogAdmin::Anys &records,
       reclist [i].info = records[i];
     }
 
-  this->write_recordlist (reclist, ACE_TRY_ENV);
+  this->write_recordlist (reclist TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist,
-                         CORBA::Environment &ACE_TRY_ENV)
+Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogLocked))
@@ -601,7 +601,7 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist,
   // Check if the log is on duty
   // @@ Wait for Comittee ruling on the proper behavior
   DsLogAdmin::AvailabilityStatus avail_stat =
-    this->get_availability_status (ACE_TRY_ENV);
+    this->get_availability_status (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (avail_stat.off_duty == 1)
@@ -660,8 +660,8 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist,
 
 void
 Log_i::set_record_attribute (DsLogAdmin::RecordId id,
-                             const DsLogAdmin::NVList &attr_list,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             const DsLogAdmin::NVList &attr_list
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId,
                    DsLogAdmin::InvalidAttribute))
@@ -686,7 +686,7 @@ CORBA::ULong
 Log_i::set_records_attribute (const char *grammar,
                               const char *constraint,
                               const DsLogAdmin::NVList
-                              &attr_list, CORBA::Environment &ACE_TRY_ENV)
+                              &attr_list TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -700,8 +700,8 @@ Log_i::set_records_attribute (const char *grammar,
 }
 
 DsLogAdmin::NVList*
-Log_i::get_record_attribute (DsLogAdmin::RecordId id,
-                             CORBA::Environment &ACE_TRY_ENV)
+Log_i::get_record_attribute (DsLogAdmin::RecordId id
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId))
 {
@@ -723,8 +723,8 @@ Log_i::get_record_attribute (DsLogAdmin::RecordId id,
 
 // @@ These two methods are non-trivial. Let's hold off on them for a while
 DsLogAdmin::Log_ptr
-Log_i::copy (DsLogAdmin::LogId_out id,
-             CORBA::Environment &ACE_TRY_ENV)
+Log_i::copy (DsLogAdmin::LogId_out id
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (id);
@@ -732,8 +732,8 @@ Log_i::copy (DsLogAdmin::LogId_out id,
 }
 
 DsLogAdmin::Log_ptr
-Log_i::copy_with_id (DsLogAdmin::LogId id,
-                     CORBA::Environment &ACE_TRY_ENV)
+Log_i::copy_with_id (DsLogAdmin::LogId id
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogIdAlreadyExists))
 {
@@ -743,7 +743,7 @@ Log_i::copy_with_id (DsLogAdmin::LogId id,
 
 // @@ Should I just raise the exception?
 void
-Log_i::flush (CORBA::Environment &ACE_TRY_ENV)
+Log_i::flush (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS))
 {
@@ -768,8 +768,8 @@ Log_i::scheduled (void)
 }
 
 void
-Log_i::check_grammar (const char* grammar,
-                      CORBA::Environment &ACE_TRY_ENV)
+Log_i::check_grammar (const char* grammar
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 8d9b3e37ed7..79c5a90aae1 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -55,130 +55,130 @@ public:
   ~Log_i ();
   // Destructor.
 
-  void init (CORBA::Environment &ACE_TRY_ENV);
+  void init (TAO_ENV_SINGLE_ARG_DECL);
   // Initlialize the Log.
 
   // = DsLogAdmin::Log methods
-  DsLogAdmin::LogMgr_ptr my_factory (CORBA::Environment &ACE_TRY_ENV)
+  DsLogAdmin::LogMgr_ptr my_factory (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the factory of the log
 
-  DsLogAdmin::LogId id (CORBA::Environment &ACE_TRY_ENV)
+  DsLogAdmin::LogId id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the id of the log
 
   DsLogAdmin::QoSList*
-  get_qos (CORBA::Environment &ACE_TRY_ENV)
+  get_qos (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Get the list of the QoS properties supported by the log
 
-  void set_qos (const DsLogAdmin::QoSList & qos,
-                CORBA::Environment &ACE_TRY_ENV)
+  void set_qos (const DsLogAdmin::QoSList & qos
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS));
   // Set the list of the QoS properties supported by the log.
 
   CORBA::ULong
-  get_max_record_life (CORBA::Environment &ACE_TRY_ENV)
+  get_max_record_life (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the record life in seconds (0 infinite)
 
   void
-  set_max_record_life (CORBA::ULong life,
-		       CORBA::Environment &ACE_TRY_ENV)
+  set_max_record_life (CORBA::ULong life
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the record life in seconds (0 infinite)
 
   CORBA::ULongLong
-  get_max_size (CORBA::Environment &ACE_TRY_ENV)
+  get_max_size (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the maximum size in octets
 
   void
-  set_max_size (CORBA::ULongLong size,
-		CORBA::Environment &ACE_TRY_ENV)
+  set_max_size (CORBA::ULongLong size
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
   // Set the maximum size in octets.
 
   CORBA::ULongLong
-  get_current_size (CORBA::Environment &ACE_TRY_ENV)
+  get_current_size (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the current size of the log in octets.
 
   CORBA::ULongLong
-  get_n_records (CORBA::Environment &ACE_TRY_ENV)
+  get_n_records (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the number of records in the log
 
   DsLogAdmin::LogFullAction
-  get_log_full_action (CORBA::Environment &ACE_TRY_ENV)
+  get_log_full_action (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the action to be taken when the log reaches its maximum size
 
   void
-  set_log_full_action (DsLogAdmin::LogFullAction action,
-		       CORBA::Environment &ACE_TRY_ENV)
+  set_log_full_action (DsLogAdmin::LogFullAction action
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the action to be taken when the log reaches its maximum size
 
   DsLogAdmin::AdministrativeState
-  get_administrative_state (CORBA::Environment &ACE_TRY_ENV)
+  get_administrative_state (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the administrative state of the log.
 
   void
-  set_administrative_state (DsLogAdmin::AdministrativeState state,
-			    CORBA::Environment &ACE_TRY_ENV)
+  set_administrative_state (DsLogAdmin::AdministrativeState state
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the administrative state of the log.
 
   virtual DsLogAdmin::ForwardingState
-  get_forwarding_state (CORBA::Environment &ACE_TRY_ENV)
+  get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the forwarding state of the log.
   // @@ Note: is it ok to make this method virtual?
 
   void
-    set_forwarding_state (DsLogAdmin::ForwardingState state,
-                          CORBA::Environment &ACE_TRY_ENV)
+    set_forwarding_state (DsLogAdmin::ForwardingState state
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the forwarding state of the log.
   // @@ Note: is it ok to make this method virtual?
 
   DsLogAdmin::OperationalState
-  get_operational_state (CORBA::Environment &ACE_TRY_ENV)
+  get_operational_state (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the operational state of the log.
 
   DsLogAdmin::TimeInterval
-  get_interval (CORBA::Environment &ACE_TRY_ENV)
+  get_interval (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the log duration
 
   void
-  set_interval (const DsLogAdmin::TimeInterval & interval,
-		CORBA::Environment &ACE_TRY_ENV)
+  set_interval (const DsLogAdmin::TimeInterval & interval
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval));
   // Set the log duration.
 
   DsLogAdmin::AvailabilityStatus
-  get_availability_status (CORBA::Environment &ACE_TRY_ENV)
+  get_availability_status (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the availability status
 
   DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (CORBA::Environment &ACE_TRY_ENV)
+    get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the capacity alarm threshold
 
   void
     set_capacity_alarm_thresholds
-  (const DsLogAdmin::CapacityAlarmThresholdList & threshs,
-   CORBA::Environment &ACE_TRY_ENV)
+  (const DsLogAdmin::CapacityAlarmThresholdList & threshs
+   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidThreshold));
   // Set the capacity alarm threshold. Threshold values represent
@@ -189,13 +189,13 @@ public:
   // 0).
 
   DsLogAdmin::WeekMask*
-  get_week_mask (CORBA::Environment &ACE_TRY_ENV)
+  get_week_mask (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the weekly scheduling parameters
 
   void
-  set_week_mask (const DsLogAdmin::WeekMask & masks,
-		 CORBA::Environment &ACE_TRY_ENV)
+  set_week_mask (const DsLogAdmin::WeekMask & masks
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval,
@@ -204,9 +204,9 @@ public:
 
   DsLogAdmin::RecordList*
   query (const char * grammar,
-	 const char * c,
-	 DsLogAdmin::Iterator_out i,
-	 CORBA::Environment &ACE_TRY_ENV)
+         const char * c,
+         DsLogAdmin::Iterator_out i
+         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -215,17 +215,17 @@ public:
 
   DsLogAdmin::RecordList*
   retrieve (DsLogAdmin::TimeT from_time,
-	    CORBA::Long how_many,
-	    DsLogAdmin::Iterator_out i,
-	    CORBA::Environment &ACE_TRY_ENV)
+            CORBA::Long how_many,
+            DsLogAdmin::Iterator_out i
+            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Retrieve <how_many> records from time <from_time> using iterator
   // <i>.
 
   CORBA::ULong
   match (const char * grammar,
-	 const char * c,
-	 CORBA::Environment &ACE_TRY_ENV)
+         const char * c
+         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -233,31 +233,31 @@ public:
 
   CORBA::ULong
   delete_records (const char * grammar,
-		  const char * c,
-		  CORBA::Environment &ACE_TRY_ENV)
+                  const char * c
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
   // Delete records matching constraint <c>.
 
   CORBA::ULong
-  delete_records_by_id (const DsLogAdmin::RecordIdList & ids,
-			CORBA::Environment &ACE_TRY_ENV)
+  delete_records_by_id (const DsLogAdmin::RecordIdList & ids
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Delete records matching ids in <ids>
 
 
   void
-  write_records (const DsLogAdmin::Anys & records,
-		 CORBA::Environment &ACE_TRY_ENV)
+  write_records (const DsLogAdmin::Anys & records
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogLocked));
   // Write records to the log storage.
 
   void
-  write_recordlist (const DsLogAdmin::RecordList & list,
-		    CORBA::Environment &ACE_TRY_ENV)
+  write_recordlist (const DsLogAdmin::RecordList & list
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogLocked));
@@ -266,8 +266,8 @@ public:
 
   void
   set_record_attribute (DsLogAdmin::RecordId id,
-			const DsLogAdmin::NVList & attr_list,
-			CORBA::Environment &ACE_TRY_ENV)
+                        const DsLogAdmin::NVList & attr_list
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute));
@@ -275,9 +275,9 @@ public:
 
   CORBA::ULong
   set_records_attribute (const char * grammar,
-			 const char * c,
-			 const DsLogAdmin::NVList & attr_list,
-			 CORBA::Environment &ACE_TRY_ENV)
+                         const char * c,
+                         const DsLogAdmin::NVList & attr_list
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -286,30 +286,30 @@ public:
   // constraints with same attr_list.
 
   DsLogAdmin::NVList*
-  get_record_attribute (DsLogAdmin::RecordId id,
-			CORBA::Environment &ACE_TRY_ENV)
+  get_record_attribute (DsLogAdmin::RecordId id
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId));
   // Get the attributes of the record with id <id>. Raises
   // DsLogAdmin::InvalidRecordId
 
   DsLogAdmin::Log_ptr
-  copy (DsLogAdmin::LogId_out id,
-	CORBA::Environment &ACE_TRY_ENV)
+  copy (DsLogAdmin::LogId_out id
+        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Copy the log on which the operation was invoked.
 
   DsLogAdmin::Log_ptr
-  copy_with_id (DsLogAdmin::LogId id,
-		CORBA::Environment &ACE_TRY_ENV)
+  copy_with_id (DsLogAdmin::LogId id
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogIdAlreadyExists));
   // Copy the log on which the operation was invoked and assign it the
   // given id.
 
   void
-  flush (CORBA::Environment &ACE_TRY_ENV)
+  flush (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS));
   // Causes all pending events to be written to storage. Raises
@@ -320,18 +320,18 @@ protected:
 
   DsLogAdmin::RecordList* query_i (const char *constraint,
                                       DsLogAdmin::Iterator_out &iter_out,
-                                      CORBA::ULong how_many,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::ULong how_many
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidConstraint));
 
   CORBA::ULong match_i (const char *constraint,
-                        CORBA::Boolean delete_rec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Boolean delete_rec
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidConstraint));
 
-  void check_grammar (const char* grammar, CORBA::Environment &ACE_TRY_ENV)
+  void check_grammar (const char* grammar TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar));
   // Throws DsLogAdmin::InvalidGrammar if we don't support this grammar.
diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp
index 696af20d676..06d74819fb2 100644
--- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp
@@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for ( ; ; )
@@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
         ACE_TRY
           {
             CORBA::Boolean non_existent =
-              object->_non_existent (ACE_TRY_ENV);
+              object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (!non_existent)
               {
@@ -129,8 +129,8 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy)
 }
 
 void
-TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy,
-                                               CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
+                                               TAO_ENV_ARG_DECL)
 {
   int send_load_advisory = 0;
 
@@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy,
   // dispersion we tolerate before starting to send advisories.
   if (send_load_advisory == 2)
     {
-      proxy->control_->high_load_advisory (ACE_TRY_ENV);
+      proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;  // We may not throw an exception, so explicitly return.
@@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy,
   // construction time...
   if (send_load_advisory == 1)
     {
-      proxy->control_->nominal_load_advisory (ACE_TRY_ENV);
+      proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h
index fcf0b686ae3..df4e679543c 100644
--- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h
@@ -56,12 +56,12 @@ public:
   // Destructor
 
   // = The TAO_LB_LoadBalancing_Strategy methods
-  virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
-  virtual void load_changed (TAO_LB_ReplicaProxy *,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void load_changed (TAO_LB_ReplicaProxy *
+                             TAO_ENV_ARG_DECL);
 
 private:
   TAO_LB_ReplicaProxySet proxies_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index ce20b14bc53..1349a07e442 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -31,19 +31,19 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
 
   // Since we are going away, decrement the reference count on the
   // Naming Context we were iterating over.
-  context_->interface ()->_remove_ref (ACE_TRY_ENV);
+  context_->interface ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Return the Default POA of this Servant
 template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (CORBA::Environment &/*env*/)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b,
-                                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
+                                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNaming::Binding *binding;
@@ -71,7 +71,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
   // self-destruct.
   if (context_->destroyed ())
     {
-      destroy (ACE_TRY_ENV);
+      destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
@@ -100,8 +100,8 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
 
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
-                                                      CosNaming::BindingList_out bl,
-                                                      CORBA::Environment &ACE_TRY_ENV)
+                                                      CosNaming::BindingList_out bl
+                                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
@@ -125,7 +125,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
   // self-destruct.
   if (context_->destroyed ())
     {
-      destroy (ACE_TRY_ENV);
+      destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
@@ -167,7 +167,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
 }
 
 template <class ITERATOR, class TABLE_ENTRY> void
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
@@ -184,12 +184,12 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (CORBA::Environment &ACE_T
   this->destroyed_ = 1;
 
   PortableServer::ObjectId_var id =
-    poa_->servant_to_id (this,
-                         ACE_TRY_ENV);
+    poa_->servant_to_id (this
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_->deactivate_object (id.in (),
-                           ACE_TRY_ENV);
+  poa_->deactivate_object (id.in ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 66cbea7d01e..8881a030306 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -63,26 +63,26 @@ public:
   ~TAO_Bindings_Iterator (void);
   // Destructor.
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
   // Returns the Default POA of this Servant object
 
   // = Idl methods.
 
-  CORBA::Boolean next_one (CosNaming::Binding_out b,
-                           CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Boolean next_one (CosNaming::Binding_out b
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation passes back the next unseen binding.  True is
   // returned if a binding is passed back, and false is returned otherwise.
 
   CORBA::Boolean next_n (CORBA::ULong how_many,
-                         CosNaming::BindingList_out bl,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CosNaming::BindingList_out bl
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation passes back at most <how_many> unseen bindings.
   // True is returned if bindings were passed back, and false is
   // returned if no bindings were passed back.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV)
+  void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation destroys the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index df040362419..98a689c88f7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -49,8 +49,8 @@ TAO_Hash_Naming_Context::_default_POA (void)
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
+                                      TAO_ENV_ARG_DECL)
 {
   // Naming context we will return.
   CosNaming::NamingContext_var result =
@@ -68,13 +68,13 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
   ACE_TRY
     {
       // Resolve the name.
-      CORBA::Object_var context = resolve (comp_name,
-                                           ACE_TRY_ENV);
+      CORBA::Object_var context = resolve (comp_name
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try narrowing object reference to the NamingContext type.
-      result = CosNaming::NamingContext::_narrow (context.in (),
-                                                  ACE_TRY_ENV);
+      result = CosNaming::NamingContext::_narrow (context.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -108,8 +108,8 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
 
 void
 TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
-                               CORBA::Object_ptr obj,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Object_ptr obj
+                               TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon, this->lock_,
@@ -134,13 +134,13 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        this->get_context (n, ACE_TRY_ENV);
+        this->get_context (n TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind (simple_name, obj, ACE_TRY_ENV);
+      context->bind (simple_name, obj TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // If we received a simple name, we need to bind it in this context.
@@ -162,8 +162,8 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
 
 void
 TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
-                                 CORBA::Object_ptr obj,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Object_ptr obj
+                                 TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -188,13 +188,13 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
+        get_context (n TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind (simple_name, obj, ACE_TRY_ENV);
+      context->rebind (simple_name, obj TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -218,8 +218,8 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
 
 void
 TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
-                                       CosNaming::NamingContext_ptr nc,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CosNaming::NamingContext_ptr nc
+                                       TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -248,13 +248,13 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
+        get_context (n TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind_context (simple_name, nc, ACE_TRY_ENV);
+      context->bind_context (simple_name, nc TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // If we received a simple name, we need to bind it in this context.
@@ -276,8 +276,8 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
 
 void
 TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                         CosNaming::NamingContext_ptr nc,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                         CosNaming::NamingContext_ptr nc
+                                         TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -302,13 +302,13 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
+        get_context (n TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind_context (simple_name, nc, ACE_TRY_ENV);
+      context->rebind_context (simple_name, nc TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -331,8 +331,8 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
 }
 
 CORBA::Object_ptr
-TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -381,8 +381,8 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
       if (type == CosNaming::ncontext)
         {
           // Narrow to NamingContext.
-          context = CosNaming::NamingContext::_narrow (result.in (),
-                                                       ACE_TRY_ENV);
+          context = CosNaming::NamingContext::_narrow (result.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (result._retn ());
         }
       else
@@ -415,8 +415,8 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
              + 1);
 
           // If there are any exceptions, they will propagate up.
-          return context->resolve (rest_of_name,
-                                   ACE_TRY_ENV);
+          return context->resolve (rest_of_name
+                                   TAO_ENV_ARG_PARAMETER);
         }
     }
   // If the name we had to resolve was simple, we just need to return
@@ -425,8 +425,8 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
 }
 
 void
-TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
+                                 TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -451,13 +451,13 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
+        get_context (n TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->unbind (simple_name, ACE_TRY_ENV);
+      context->unbind (simple_name TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // If we received a simple name, we need to unbind it in this
@@ -471,8 +471,8 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
+                                           TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -491,15 +491,15 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
     CosNaming::NamingContext::_nil ();
 
   // Create new context.
-  result = new_context (ACE_TRY_ENV);
+  result = new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Bind the new context to the name.
   ACE_TRY
     {
       bind_context (n,
-                    result.in (),
-                    ACE_TRY_ENV);
+                    result.in ()
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -508,10 +508,10 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
       // created context, should any exceptions be raised by the
       // destroy() operation we want to ignore them.
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
+        TAO_ENV_DECLARE_NEW_ENV;
         ACE_TRY_EX(DESTROY)
           {
-            result->destroy (ACE_TRY_ENV);
+            result->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK_EX(DESTROY);
           }
         ACE_CATCHANY {} ACE_ENDTRY;
@@ -526,7 +526,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
 }
 
 void
-TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -562,8 +562,8 @@ TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
 
       ACE_CHECK;
 
-      poa->deactivate_object (id.in (),
-                              ACE_TRY_ENV);
+      poa->deactivate_object (id.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 5002530994b..c98b13d2b1a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -122,8 +122,8 @@ public:
   // = CosNaming::NamingContext idl interface methods.
 
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Object_ptr obj
+                     TAO_ENV_ARG_DECL);
   // Create a binding for name <n> and object <obj> in the naming
   // context.  Compound names are treated as follows: ctx->bind (<c1;
   // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
@@ -133,49 +133,49 @@ public:
   // participate in name resolution later.
 
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Object_ptr obj
+                       TAO_ENV_ARG_DECL);
   // This is similar to <bind> operation above, except for when the
   // binding for the specified name already exists in the specified
   // context.  In that case, the existing binding is replaced with the
   // new one.
 
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             CosNaming::NamingContext_ptr nc
+                             TAO_ENV_ARG_DECL);
   // This is the version of <bind> specifically for binding naming
   // contexts, so that they will participate in name resolution when
   // compound names are passed to be resolved.
 
    virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV);
+                               CosNaming::NamingContext_ptr nc
+                               TAO_ENV_ARG_DECL);
   // This is a version of <rebind> specifically for naming contexts,
   // so that they can participate in name resolution when compound
   // names are passed.
 
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
+                                     TAO_ENV_ARG_DECL);
   // Return object reference that is bound to the name.  Compound name
   // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
   // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
   // does not return the type of the object.  Clients are responsible
   // for "narrowing" the object to the appropriate type.
 
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV);
+  virtual void unbind (const CosNaming::Name &n
+                       TAO_ENV_ARG_DECL);
   // Remove the name binding from the context.  When compound names
   // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV);
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
+                                                         TAO_ENV_ARG_DECL);
   // This operation creates a new context and binds it to the name
   // supplied as an argument.  The newly-created context is
   // implemented by the same server as the context in which it was
   // bound (the name argument excluding the last component).
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL);
   // Delete the naming context.  The user should take care to <unbind> any
   // bindings in which the given context is bound to some names, to
   // avoid dangling references when invoking <destroy> operation.
@@ -189,8 +189,8 @@ public:
 protected:
   // = Helper method used by other methods.
 
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name,
-                                            CORBA::Environment &_env);
+  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name
+                                            TAO_ENV_ARG_DECL);
   // <get_context> is used by methods that need to resolve a compound
   // name before performing the actual operation (e.g., bind, unbind,
   // etc.)  <get_context> takes a full name (including the last
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index e3b532684c2..129aeb3f853 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -25,118 +25,118 @@ TAO_Naming_Context::~TAO_Naming_Context (void)
 }
 
 PortableServer::POA_ptr
-TAO_Naming_Context::_default_POA (CORBA::Environment &/*env*/)
+TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 {
   return impl_->_default_POA ();
 }
 
 void
 TAO_Naming_Context::bind (const CosNaming::Name &n,
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Object_ptr obj
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
                      CosNaming::NamingContext::InvalidName,
                      CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind (n, obj, ACE_TRY_ENV);
+  impl_->bind (n, obj TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::rebind (const CosNaming::Name &n,
-                            CORBA::Object_ptr obj,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Object_ptr obj
+                            TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind (n, obj, ACE_TRY_ENV);
+  impl_->rebind (n, obj TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
-                                  CosNaming::NamingContext_ptr nc,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CosNaming::NamingContext_ptr nc
+                                  TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName,
                        CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind_context (n, nc, ACE_TRY_ENV);
+  impl_->bind_context (n, nc TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                    CosNaming::NamingContext_ptr nc,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CosNaming::NamingContext_ptr nc
+                                    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind_context (n, nc, ACE_TRY_ENV);
+  impl_->rebind_context (n, nc TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Naming_Context::resolve (const CosNaming::Name &n,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::resolve (const CosNaming::Name &n
+                             TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->resolve (n, ACE_TRY_ENV);
+  return impl_->resolve (n TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Naming_Context::unbind (const CosNaming::Name &n,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::unbind (const CosNaming::Name &n
+                            TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->unbind (n, ACE_TRY_ENV);
+  impl_->unbind (n TAO_ENV_ARG_PARAMETER);
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return impl_->new_context (ACE_TRY_ENV);
+  return impl_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Context::bind_new_context (const CosNaming::Name &n,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::bind_new_context (const CosNaming::Name &n
+                                      TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->bind_new_context (n, ACE_TRY_ENV);
+  return impl_->bind_new_context (n TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotEmpty))
 {
-  impl_->destroy (ACE_TRY_ENV);
+  impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
-                          CosNaming::BindingIterator_out bi,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CosNaming::BindingIterator_out bi
+                          TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  impl_->list (how_many, bl, bi, ACE_TRY_ENV);
+  impl_->list (how_many, bl, bi TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -171,8 +171,8 @@ to_string_helper_assign (char * &k, const char * &src)
 }
 
 char *
-TAO_Naming_Context::to_string (const CosNaming::Name &n,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::to_string (const CosNaming::Name &n
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -287,8 +287,8 @@ to_name_helper (char *dest, const char*& src)
 }
 
 CosNaming::Name *
-TAO_Naming_Context::to_name (const char *sn,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::to_name (const char *sn
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -403,8 +403,8 @@ TAO_Naming_Context::to_url_is_alnum_or_punctuation (char c)
 size_t
 TAO_Naming_Context::to_url_validate_and_compute_size (
     const char *addr,
-    const char *sn,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char *sn
+    TAO_ENV_ARG_DECL)
 {
   size_t addr_len = ACE_OS_String::strlen (addr);
 
@@ -434,16 +434,16 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
 
 char *
 TAO_Naming_Context::to_url (const char * addr,
-                            const char * sn,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            const char * sn
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContextExt::InvalidAddress,
                    CosNaming::NamingContext::InvalidName))
 {
   /// Compute how many characters will be required for the URL
   CORBA::ULong no_char =
-    TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn,
-                                                          ACE_TRY_ENV);
+    TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn
+                                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
 
@@ -497,8 +497,8 @@ TAO_Naming_Context::to_url (const char * addr,
 }
 
 CORBA::Object_ptr
-TAO_Naming_Context::resolve_str (const char * n,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Naming_Context::resolve_str (const char * n
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::NotFound,
                    CosNaming::NamingContext::CannotProceed,
@@ -509,11 +509,11 @@ TAO_Naming_Context::resolve_str (const char * n,
   // argument instead of a Name.
 
   // Get the unstrigified name.
-  CosNaming::Name_var name = this->to_name (n, ACE_TRY_ENV);
+  CosNaming::Name_var name = this->to_name (n TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Pass this unstringified name to resolve and return an Object_ptr
-  return this->resolve (name.in (), ACE_TRY_ENV);
+  return this->resolve (name.in () TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index afe36fc0d1a..7168ed8deb4 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -54,9 +54,8 @@ public:
   // = CosNaming::NamingContext idl interface methods.
 
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+                     CORBA::Object_ptr obj
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
@@ -72,9 +71,8 @@ public:
   // participate in name resolution later.
 
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+                       CORBA::Object_ptr obj
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -86,9 +84,8 @@ public:
   // new one.
 
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+                             CosNaming::NamingContext_ptr nc
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -100,9 +97,8 @@ public:
   // compound names are passed to be resolved.
 
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+                               CosNaming::NamingContext_ptr nc
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -111,9 +107,8 @@ public:
   // so that they can participate in name resolution when compound
   // names are passed.
 
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -124,9 +119,8 @@ public:
   // does not return the type of the object.  Clients are responsible
   // for "narrowing" the object to the appropriate type.
 
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+  virtual void unbind (const CosNaming::Name &n
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -137,8 +131,7 @@ public:
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
   virtual CosNaming::NamingContext_ptr new_context (
-      CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // This operation returns a new naming context implemented by the
@@ -146,9 +139,8 @@ public:
   // context is not bound.
 
   virtual CosNaming::NamingContext_ptr bind_new_context (
-      const CosNaming::Name &n,
-      CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ())
+      const CosNaming::Name &n
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
@@ -161,8 +153,7 @@ public:
   // bound (the name argument excluding the last component).
 
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotEmpty));
   // Delete the naming context.  The user should take care to <unbind> any
@@ -174,9 +165,8 @@ public:
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
-                     CosNaming::BindingIterator_out bi,
-                     CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+                     CosNaming::BindingIterator_out bi
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Returns at most the requested number of bindings <how_many> in
@@ -184,30 +174,26 @@ public:
   // are returned with a BindingIterator.  In the naming context does
   // not contain any additional bindings <bi> returned as null.
 
-  virtual char * to_string (const CosNaming::Name &n,
-                            CORBA::Environment
-                            &ACE_TRY_ENV =
-                            TAO_default_environment ())
+  virtual char * to_string (const CosNaming::Name &n
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
   // Stringify the name using '\' as the escape character. The
   // characters '.' , '/' and '\' are to be escaped. If the input name
   // is invalid i.e. if the number of characters in the name is zero,
-  // an InvalidName exception is to be raised. 
-  
-  virtual CosNaming::Name * to_name (const char *sn,
-                                   CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+  // an InvalidName exception is to be raised.
+
+  virtual CosNaming::Name * to_name (const char *sn
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
   // The in parameter is an stringified name. This function removes the
   // escape character '\' and destringifies the stringified name and returns
   // it.
- 
+
   virtual char * to_url ( const char * addr,
-                          const char * sn,
-                          CORBA::Environment &ACE_TRY_ENV = 
-                          TAO_default_environment ()
+                          const char * sn
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
                           )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -218,10 +204,9 @@ public:
   // and sn refers to the strigified name of the object in that
   // context. This function returns a fully formed URL string like
   // iiopname://1.1@myhost.555xyz.com:9999/a/b/c
-  
-  virtual CORBA::Object_ptr resolve_str (const char * n,
-                                         CORBA::Environment &ACE_TRY_ENV = 
-                                         TAO_default_environment ()
+
+  virtual CORBA::Object_ptr resolve_str (const char * n
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                          )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -230,12 +215,12 @@ public:
                      CosNaming::NamingContext::InvalidName,
                      CosNaming::NamingContext::AlreadyBound
                      ));
-  
+
   // Similar to <resolve> as in the CosNaming::NamingContext interface.
   // It accepts a strigified name as an argument instead of a Name.
-  
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env = TAO_default_environment ());
+
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns the Default POA of this Servant object
 
 private:
@@ -266,8 +251,8 @@ private:
   // punctuation.
 
   static size_t to_url_validate_and_compute_size (const char *add,
-                                                  const char *sn,
-                                                  CORBA::Environment &ACE_TRY_ENV);
+                                                  const char *sn
+                                                  TAO_ENV_ARG_DECL);
   // Validate the to_url() method input, and compute the size of the
   // returned URL address.
 
@@ -295,8 +280,8 @@ public:
   // = CosNaming::NamingContext idl interface methods.
 
   virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
+                     CORBA::Object_ptr obj
+                     TAO_ENV_ARG_DECL) = 0;
   // Create a binding for name <n> and object <obj> in the naming
   // context.  Compound names are treated as follows: ctx->bind (<c1;
   // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
@@ -306,55 +291,54 @@ public:
   // participate in name resolution later.
 
   virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV) = 0;
+                       CORBA::Object_ptr obj
+                       TAO_ENV_ARG_DECL) = 0;
   // This is similar to <bind> operation above, except for when the
   // binding for the specified name already exists in the specified
   // context.  In that case, the existing binding is replaced with the
   // new one.
 
   virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
+                             CosNaming::NamingContext_ptr nc
+                             TAO_ENV_ARG_DECL) = 0;
   // This is the version of <bind> specifically for binding naming
   // contexts, so that they will participate in name resolution when
   // compound names are passed to be resolved.
 
   virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV) = 0;
+                               CosNaming::NamingContext_ptr nc
+                               TAO_ENV_ARG_DECL) = 0;
   // This is a version of <rebind> specifically for naming contexts,
   // so that they can participate in name resolution when compound
   // names are passed.
 
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
+                                     TAO_ENV_ARG_DECL) = 0;
   // Return object reference that is bound to the name.  Compound name
   // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
   // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
   // does not return the type of the object.  Clients are responsible
   // for "narrowing" the object to the appropriate type.
 
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void unbind (const CosNaming::Name &n
+                       TAO_ENV_ARG_DECL) = 0;
   // Remove the name binding from the context.  When compound names
   // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment
-                                                    &ACE_TRY_ENV) = 0;
+  virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL) = 0;
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
 
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
+                                                         TAO_ENV_ARG_DECL) = 0;
   // This operation creates a new context and binds it to the name
   // supplied as an argument.  The newly-created context is
   // implemented by the same server as the context in which it was
   // bound (the name argument excluding the last component).
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) = 0;
   // Delete the naming context.  The user should take care to <unbind> any
   // bindings in which the given context is bound to some names, to
   // avoid dangling references when invoking <destroy> operation.
@@ -364,8 +348,8 @@ public:
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
+                     CosNaming::BindingIterator_out &bi
+                     TAO_ENV_ARG_DECL) = 0;
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 240f2368547..1e12d7b1383 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -31,17 +31,17 @@ TAO_Naming_Loader::~TAO_Naming_Loader (void)
 int
 TAO_Naming_Loader::init (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This function call initializes the Naming Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), argc, argv, ACE_TRY_ENV);
+        this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -62,8 +62,8 @@ TAO_Naming_Loader::fini (void)
 
 CORBA::Object_ptr
 TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
-                                  int argc, char *argv[],
-                                  CORBA::Environment &)
+                                  int argc, char *argv[]
+                                  TAO_ENV_ARG_DECL_NOT_USED)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index ddbcab690bc..61e0066a192 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -45,8 +45,8 @@ public:
   // This function call initializes the Naming Service given a reference to the
   // ORB and the command line parameters.
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                   int argc, char *argv[],
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   int argc, char *argv[]
+                                   TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 8cc2cb61c6c..56db0d728fd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -75,7 +75,7 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
 {
   if (resolve_for_existing_naming_service)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           //
@@ -83,8 +83,8 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
           //
           CORBA::Object_var naming_obj =
             orb->resolve_initial_references ("NameService",
-                                             timeout,
-                                             ACE_TRY_ENV);
+                                             timeout
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (naming_obj.in ()))
@@ -97,13 +97,13 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
                             "\nNameService found!\n"));
 
               this->naming_context_ =
-                CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                                   ACE_TRY_ENV);
+                CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->naming_service_ior_ =
-                orb->object_to_string (naming_obj.in (),
-                                       ACE_TRY_ENV);
+                orb->object_to_string (naming_obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return 0;
@@ -202,7 +202,7 @@ TAO_Naming_Server::init_with_orb (int argc,
 {
   int result;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Duplicate the ORB
@@ -210,7 +210,7 @@ TAO_Naming_Server::init_with_orb (int argc,
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -221,16 +221,16 @@ TAO_Naming_Server::init_with_orb (int argc,
         }
 
       // Get the POA object.
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in (),
-                                                      ACE_TRY_ENV);
+      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_Manager.
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (2);
@@ -238,22 +238,22 @@ TAO_Naming_Server::init_with_orb (int argc,
 
       // Id Assignment policy
       policies[0] =
-        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                      ACE_TRY_ENV);
+        this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
-        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                 ACE_TRY_ENV);
+        this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We use a different POA, otherwise the user would have to change
       // the object key each time it invokes the server.
       this->ns_poa_ = this->root_poa_->create_POA ("NameService",
                                                    poa_manager.in (),
-                                                   policies,
-                                                   ACE_TRY_ENV);
+                                                   policies
+                                                   TAO_ENV_ARG_PARAMETER);
       // Warning!  If create_POA fails, then the policies won't be
       // destroyed and there will be hell to pay in memory leaks!
       ACE_TRY_CHECK;
@@ -264,7 +264,7 @@ TAO_Naming_Server::init_with_orb (int argc,
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -328,7 +328,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                     size_t context_size,
                                     int enable_multicast)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (persistence_location != 0)
@@ -363,24 +363,24 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
           this->naming_context_ =
             TAO_Transient_Naming_Context::make_new_context (poa,
                                                             TAO_ROOT_NAMING_CONTEXT,
-                                                            context_size,
-                                                            ACE_TRY_ENV);
+                                                            context_size
+                                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
 
       // Set the ior of the root Naming Context.
       this->naming_service_ior_=
-        orb->object_to_string (this->naming_context_.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (this->naming_context_.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable", ACE_TRY_ENV);
+        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -389,10 +389,10 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
       else
         {
           CORBA::String_var ior =
-            orb->object_to_string (this->naming_context_.in (),
-                                   ACE_TRY_ENV);
+            orb->object_to_string (this->naming_context_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          adapter->bind ("NameService", ior.in (), ACE_TRY_ENV);
+          adapter->bind ("NameService", ior.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -492,17 +492,17 @@ TAO_Naming_Server::fini (void)
   // the Naming Service
   ACE_TRY_NEW_ENV
     {
-      this->ns_poa_->destroy (1, 1, ACE_TRY_ENV);
+      this->ns_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       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_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -510,7 +510,7 @@ TAO_Naming_Server::fini (void)
         }
       else
         {
-          adapter->unbind ("NameService", ACE_TRY_ENV);
+          adapter->unbind ("NameService" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -564,11 +564,11 @@ int
 TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                          ACE_Time_Value *timeout)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", timeout, ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService", timeout TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -576,8 +576,8 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                            " (%P|%t) Unable to initialize the NameService.\n"),
                           -1);
       this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 01e5234a342..1fe01ea657a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -173,14 +173,14 @@ TAO_Persistent_Context_Index::init (size_t context_size)
     // CASE 1:there are no Naming Contexts registered.  We need to create
     // one.
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       this->root_context_ =
         TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
                                                          TAO_ROOT_NAMING_CONTEXT,
                                                          context_size,
-                                                         this,
-                                                         ACE_TRY_ENV);
+                                                         this
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -246,16 +246,16 @@ TAO_Persistent_Context_Index::recreate_all (void)
       PortableServer::ServantBase_var s = context;
 
       // Register with the POA.
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           context,
-                                           ACE_TRY_ENV);
+                                           context
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      CosNaming::NamingContext_var result = context->_this (ACE_TRY_ENV);
+      CosNaming::NamingContext_var result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // If this is the root Naming Context, take a note of it.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 41edb44f3f7..43567878765 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -70,8 +70,8 @@ TAO_Persistent_Bindings_Map::find (const char *id,
     return -1;
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_, ACE_TRY_ENV);
+      TAO_ENV_DECLARE_NEW_ENV;
+      obj = orb_->string_to_object (entry.ref_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       type = entry.type_;
 
@@ -163,8 +163,8 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id,
                                           int rebind)
 {
   // Obtain a stringified ior of <obj> (i.e., the representation we can store).
-  ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::String_var ref = orb_->object_to_string (obj, ACE_TRY_ENV);
+  TAO_ENV_DECLARE_NEW_ENV;
+  CORBA::String_var ref = orb_->object_to_string (obj TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Calculate and allocate the memory we need to store this name to
@@ -322,8 +322,8 @@ CosNaming::NamingContext_ptr
 TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                  const char *poa_id,
                                                  size_t context_size,
-                                                 TAO_Persistent_Context_Index * ind,
-                                                 CORBA::Environment &ACE_TRY_ENV)
+                                                 TAO_Persistent_Context_Index * ind
+                                                 TAO_ENV_ARG_DECL)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -376,11 +376,11 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
     PortableServer::string_to_ObjectId (poa_id);
 
   poa->activate_object_with_id (id.in (),
-                                context,
-                                ACE_TRY_ENV);
+                                context
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (result._retn ());
 
-  result = context->_this (ACE_TRY_ENV);
+  result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Everything went smoothly, without errors - we don't need any cleanup.
@@ -390,7 +390,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
 }
 
 CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_Persistent_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -415,8 +415,8 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
     make_new_context (this->poa_.in (),
                       poa_id,
                       this->persistent_context_->total_size (),
-                      this->index_,
-                      ACE_TRY_ENV);
+                      this->index_
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   return result._retn ();
@@ -425,8 +425,8 @@ TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
                                      CosNaming::BindingList_out &bl,
-                                     CosNaming::BindingIterator_out &bi,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CosNaming::BindingIterator_out &bi
+                                     TAO_ENV_ARG_DECL)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -515,7 +515,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
 
       // Increment reference count on this Naming Context, so it doesn't get
       // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (ACE_TRY_ENV);
+      interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Register with the POA.
@@ -528,11 +528,11 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter,
-                                           ACE_TRY_ENV);
+                                           bind_iter
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      bi = bind_iter->_this (ACE_TRY_ENV);
+      bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index a9fbbf636d9..80be98ec6e5 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -179,8 +179,8 @@ public:
   static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
                                                         const char *poa_id,
                                                         size_t context_size,
-                                                        TAO_Persistent_Context_Index *ind,
-                                                        CORBA::Environment &ACE_TRY_ENV);
+                                                        TAO_Persistent_Context_Index *ind
+                                                        TAO_ENV_ARG_DECL);
   // This utility method factors out the code needed to create a new
   // Persistent Naming Context servant and activate it under the
   // specified POA with the specified id.  This function is static so
@@ -189,15 +189,15 @@ public:
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
+  virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL);
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CosNaming::BindingIterator_out &bi
+                     TAO_ENV_ARG_DECL);
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 57782b697fb..14a4cf459a7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -141,8 +141,8 @@ TAO_Transient_Naming_Context::~TAO_Transient_Naming_Context (void)
 CosNaming::NamingContext_ptr
 TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                 const char *poa_id,
-                                                size_t context_size,
-                                                CORBA::Environment &ACE_TRY_ENV)
+                                                size_t context_size
+                                                TAO_ENV_ARG_DECL)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -180,18 +180,18 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
     PortableServer::string_to_ObjectId (poa_id);
 
   poa->activate_object_with_id (id.in (),
-                                context,
-                                ACE_TRY_ENV);
+                                context
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (result._retn ());
 
-  result = context->_this (ACE_TRY_ENV);
+  result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   return result._retn ();
 }
 
 CosNaming::NamingContext_ptr
-TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -216,8 +216,8 @@ TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
   CosNaming::NamingContext_var result =
     make_new_context (this->poa_.in (),
                       poa_id,
-                      this->transient_context_->total_size (),
-                      ACE_TRY_ENV);
+                      this->transient_context_->total_size ()
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   return result._retn ();
@@ -226,8 +226,8 @@ TAO_Transient_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
                                     CosNaming::BindingList_out &bl,
-                                    CosNaming::BindingIterator_out &bi,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CosNaming::BindingIterator_out &bi
+                                    TAO_ENV_ARG_DECL)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -316,7 +316,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
 
       // Increment reference count on this Naming Context, so it doesn't get
       // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (ACE_TRY_ENV);
+      interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Register with the POA.
@@ -329,11 +329,11 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
-                                           bind_iter,
-                                           ACE_TRY_ENV);
+                                           bind_iter
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      bi = bind_iter->_this (ACE_TRY_ENV);
+      bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index d66265afdfe..31912db4da8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -139,8 +139,8 @@ public:
   // = Utility methods.
   static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
                                                         const char *poa_id,
-                                                        size_t context_size,
-                                                        CORBA::Environment &ACE_TRY_ENV);
+                                                        size_t context_size
+                                                        TAO_ENV_ARG_DECL);
   // This utility method factors out the code needed to create a new
   // Transient Naming Context servant and activate it under the
   // specified POA with the specified id.  This function is static so
@@ -149,15 +149,15 @@ public:
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
+  virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL);
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
 
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CosNaming::BindingIterator_out &bi
+                     TAO_ENV_ARG_DECL);
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp
index e160f649712..2d71b2be604 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp
@@ -21,7 +21,7 @@ TAO_Notify_AdminProperties::~TAO_Notify_AdminProperties ()
 }
 
 CosNotification::AdminProperties*
-TAO_Notify_AdminProperties::get_admin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_AdminProperties::get_admin (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -55,7 +55,7 @@ TAO_Notify_AdminProperties::get_admin (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedAdmin
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h
index 43172179ecb..4ee03f658e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h
@@ -43,15 +43,15 @@ public:
   virtual ~TAO_Notify_AdminProperties ();
 
   virtual CosNotification::AdminProperties * get_admin (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void set_admin (
-    const CosNotification::AdminProperties & admin,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::AdminProperties & admin
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
index 739903a3b5e..1a047909a33 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
@@ -22,7 +22,7 @@ TAO_Notify_Buffering_Strategy::~TAO_Notify_Buffering_Strategy ()
 }
 
 void
-TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb, CORBA::Environment& /*ACE_TRY_ENV*/, ACE_Time_Value *tv)
+TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Enqueing command priority %d, queue_length = %d\n",
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h
index 2b1eb90d8b0..db96b8e31f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h
@@ -45,7 +45,7 @@ public:
 
   virtual ~TAO_Notify_Buffering_Strategy ();
 
-  virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv);
+  virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv);
   // Execute this strategy.
 
   void max_queue_length (CORBA::Long max_queue_length);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h
index 38498326b37..b8df19fd784 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h
@@ -59,55 +59,55 @@ class TAO_Notify_Export TAO_Notify_CO_Factory : public ACE_Service_Object
   //
  public:
   // = Creation methods
-  virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL)=0;
   // Create an Event Channel.
 
-  virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0;
   // Create a Consumer Admin.
 
-  virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0;
   // Create a Supplier Admin.
 
-  virtual TAO_Notify_FilterFactory_i* create_filter_factory (CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)=0;
   // Create the Filter Factory.
 
   // = Proxy Creation methods.
-  virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0;
   // Create a Structured ProxyPushSupplier.
 
-  virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0;
   // Create a Sequence ProxyPushSupplier.
 
-  virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0;
   // Create a ProxyPushSupplier.
 
-  virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0;
   // Create a Structured ProxyPushConsumer.
 
-  virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0;
   // Create a Sequence ProxyPushConsumer.
 
-  virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0;
   // Create a ProxyPushConsumer.
 
   //= Locks
   // = Methods to create locks.
-  virtual ACE_Lock* create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by channel factory.
 
-  virtual ACE_Lock* create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by EC's.
 
-  virtual ACE_Lock* create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by Consumer Admin's.
 
-  virtual ACE_Lock* create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by Supplier Admin's.
 
-  virtual ACE_Lock* create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by proxy supplier.
 
-  virtual ACE_Lock* create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV)=0;
+  virtual ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by proxy consumer.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp
index 042f5cdd761..ee8f631d50b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp
@@ -52,9 +52,9 @@ TAO_Notify_Shutdown_Worker::TAO_Notify_Shutdown_Worker (void)
 }
 
 void
-TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL)
 {
-  listener->shutdown (ACE_TRY_ENV);
+  listener->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /********************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h
index 2ecadfb8b77..046ed275efd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h
@@ -80,7 +80,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Worker : public TAO_ESF_Worker<TAO_N
   TAO_Notify_Shutdown_Worker (void);
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV);
+  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 221c84cc271..880651b59be 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -14,8 +14,8 @@ TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void)
 }
 
 void
-TAO_Notify_Constraint_Interpreter::build_tree (const char* constraints,
-                                            CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Constraint_Interpreter::build_tree (const char* constraints
+                                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                    CORBA::NO_MEMORY))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index 00d9fe03ba3..4f481578719 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -47,8 +47,8 @@ public:
   ~TAO_Notify_Constraint_Interpreter (void);
   // Destructor
 
-  void build_tree (const char* constraints,
-                   CORBA::Environment& ACE_TRY_ENV)
+  void build_tree (const char* constraints
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                      CORBA::NO_MEMORY));
   // This constructor builds an expression tree representing the
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
index 84872f1268c..aed89d83655 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
@@ -54,7 +54,7 @@ TAO_Notify_ConsumerAdmin_i::~TAO_Notify_ConsumerAdmin_i (void)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,"in CA %d dtor\n", this->my_id_));
 
-   ACE_DECLARE_NEW_CORBA_ENV;
+   TAO_ENV_DECLARE_NEW_ENV;
 
    delete this->lock_;
 
@@ -89,32 +89,32 @@ TAO_Notify_ConsumerAdmin_i::_decr_refcnt (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::_add_ref (CORBA_Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_ConsumerAdmin_i::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::_remove_ref (CORBA_Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_ConsumerAdmin_i::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
 {
   // Dispatch the event to all the registered listeners.
   TAO_Notify_Dispatch_Command_Worker worker (&event, this->event_manager_->event_processor ());
   // Propogate the filter command.
 
-  this->event_listener_list_->for_each (&worker, ACE_TRY_ENV);
+  this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean bval =
-    this->get_filter_admin ().match (event, ACE_TRY_ENV);
+    this->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if ((bval == 1 && this->filter_operator_ == CosNotifyChannelAdmin::AND_OP) ||
@@ -127,7 +127,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo
     // note the last param. we ask that the parent filter *not* be evaluated again
     // because we've done it here.
 
-    this->event_listener_list_->for_each (&worker, ACE_TRY_ENV);
+    this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
     // Propogate the filter command.
 
@@ -140,7 +140,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo
 
       // OR we could instead do:
       //
-      // this->dispatch_event (event, ACE_TRY_ENV);
+      // this->dispatch_event (event TAO_ENV_ARG_PARAMETER);
       // return 0;
       //
       // This will short circuit a few steps, because the event processor is going to
@@ -161,25 +161,25 @@ TAO_Notify_ConsumerAdmin_i::proxy_pushsupplier_destroyed (CosNotifyChannelAdmin:
 void
 TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
                                   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator,
-                                  PortableServer::POA_ptr my_POA,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  PortableServer::POA_ptr my_POA
+                                  TAO_ENV_ARG_DECL)
 {
   my_POA_ = PortableServer::POA::_duplicate (my_POA);
 
   this->lock_ =
-    this->channel_objects_factory_->create_consumer_admin_lock (ACE_TRY_ENV);
+    this->channel_objects_factory_->create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_pushsupplier_POA_ = this->poa_factory_->
-    create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id,
-                                   ACE_TRY_ENV);
+    create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->my_id_ = my_id;
   this->filter_operator_ = filter_operator;
 
   this->event_listener_list_ =
-    this->collection_factory_->create_event_listener_list (ACE_TRY_ENV);
+    this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the task to forward filtering/dispatching commands to:
@@ -187,12 +187,12 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
   // add a "get_singleton_reactive_task" to the event manager factory interface.
   this->dispatching_task_ =
     new TAO_Notify_Worker_Task ();
-  /*this->event_manager_objects_factory_->create_dispatching_task (ACE_TRY_ENV);
+  /*this->event_manager_objects_factory_->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   */
   this->filter_eval_task_ =
     new TAO_Notify_Worker_Task ();
-  // this->event_manager_objects_factory_->create_listener_eval_task (ACE_TRY_ENV);
+  // this->event_manager_objects_factory_->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -220,7 +220,7 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotification::EventTypeSeq removed;
 
@@ -233,50 +233,50 @@ TAO_Notify_ConsumerAdmin_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
   this->subscription_list_.populate (removed);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed, ACE_TRY_ENV);
+                                              added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate ourselves
-  this->poa_factory_->deactivate_object (this, this->my_POA_.in (),
-                                         ACE_TRY_ENV);
+  this->poa_factory_->deactivate_object (this, this->my_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
 
   // shutdown proxy's.
   TAO_Notify_Shutdown_Worker shutdown_worker;
 
-  this->event_listener_list_->for_each (&shutdown_worker, ACE_TRY_ENV);
+  this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_listener_list_->shutdown (ACE_TRY_ENV);
+  this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in (),
-                                   ACE_TRY_ENV);
+  this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->dispatching_task_->shutdown (ACE_TRY_ENV);
+  this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->filter_eval_task_->shutdown (ACE_TRY_ENV);
+  this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // unregister from EC
-  this->event_channel_->unregister_listener (this, ACE_TRY_ENV);
+  this->event_channel_->unregister_listener (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 TAO_Notify_Worker_Task*
@@ -292,14 +292,14 @@ TAO_Notify_ConsumerAdmin_i::filter_eval_task (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
                    ))
 {
   this->event_manager_->subscribe_for_events (this, //*this->event_listener_list_,
-                                              added, removed, ACE_TRY_ENV);
+                                              added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   {
     ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
@@ -313,15 +313,15 @@ TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTyp
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ConsumerAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var obj = this->poa_factory_->
-    servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV);
+    servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
-  return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in (),
-                                                        ACE_TRY_ENV);
+  return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Notify_Event_Manager*
@@ -337,30 +337,30 @@ TAO_Notify_ConsumerAdmin_i::get_filter_admin (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL)
 {
   // register it.
-  this->event_listener_list_->connected (listener, ACE_TRY_ENV);
+  this->event_listener_list_->connected (listener TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL)
 {
-  this->event_listener_list_->disconnected (listener, ACE_TRY_ENV);
+  this->event_listener_list_->disconnected (listener TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL)
 {
   this->poa_factory_->
-    deactivate_object (servant, this->proxy_pushsupplier_POA_.in (),
-                       ACE_TRY_ENV);
+    deactivate_object (servant, this->proxy_pushsupplier_POA_.in ()
+                       TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_ConsumerAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -369,16 +369,16 @@ TAO_Notify_ConsumerAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ConsumerAdmin_i::MyChannel (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return event_channel_->get_ref (ACE_TRY_ENV);
+  return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_ConsumerAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -387,16 +387,16 @@ TAO_Notify_ConsumerAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin_i::push_suppliers (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::push_suppliers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->proxy_pushsupplier_ids_.get_sequence (ACE_TRY_ENV);
+  return this->proxy_pushsupplier_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ProxyNotFound
@@ -404,74 +404,74 @@ TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID p
 {
   CORBA::Object_var obj =
     this->poa_factory_->id_to_reference (proxy_id,
-                                         proxy_pushsupplier_POA_.in (),
-                                         ACE_TRY_ENV);
+                                         proxy_pushsupplier_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
 
   return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushSupplier_i* struct_proxy_pushsupplier =
-    this->channel_objects_factory_->create_struct_proxy_pushsupplier (this,
-                                                                      ACE_TRY_ENV);
+    this->channel_objects_factory_->create_struct_proxy_pushsupplier (this
+                                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushsupplier_var (struct_proxy_pushsupplier);
 
-  struct_proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV);
+  struct_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushsupplier_POA_.in (),
-                             struct_proxy_pushsupplier,
-                             ACE_TRY_ENV);
+                             struct_proxy_pushsupplier
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushSupplier_i* seq_proxy_pushsupplier =
-    this->channel_objects_factory_->create_seq_proxy_pushsupplier (this,
-                                                                   ACE_TRY_ENV);
+    this->channel_objects_factory_->create_seq_proxy_pushsupplier (this
+                                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushsupplier_var (seq_proxy_pushsupplier);
 
-  seq_proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV);
+  seq_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushsupplier_POA_.in (),
-                             seq_proxy_pushsupplier,
-                             ACE_TRY_ENV);
+                             seq_proxy_pushsupplier
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushSupplier_i* proxy_pushsupplier =
-    this->channel_objects_factory_->create_proxy_pushsupplier (this, ACE_TRY_ENV);
+    this->channel_objects_factory_->create_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushsupplier_var (proxy_pushsupplier);
 
-  proxy_pushsupplier->init (proxy_id, ACE_TRY_ENV);
+  proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushsupplier_POA_.in (),
-                             proxy_pushsupplier,
-                             ACE_TRY_ENV);
+                             proxy_pushsupplier
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminLimitExceeded
@@ -491,21 +491,21 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
-        obj = this->obtain_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV);
+        obj = this->obtain_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
       }
       break;
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
-        obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id, ACE_TRY_ENV);
+        obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
       }
       break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
-        obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id,
-                                                          ACE_TRY_ENV);
+        obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id
+                                                          TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
       }
       break;
@@ -516,88 +516,88 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA
     }
 
   this->proxy_pushsupplier_ids_.next (); // commit this id to the pool
-  return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in (),
-                                                        ACE_TRY_ENV);
+  return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_ConsumerAdmin_i::get_qos (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (ACE_TRY_ENV);
+  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos, ACE_TRY_ENV);
+  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV);
+  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter, ACE_TRY_ENV);
+  return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter, ACE_TRY_ENV);
+  this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter, ACE_TRY_ENV);
+  return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_ConsumerAdmin_i::get_all_filters (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (ACE_TRY_ENV);
+  return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::remove_all_filters (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (ACE_TRY_ENV);
+  this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -610,21 +610,21 @@ TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_EN
 
   PortableServer::ServantBase_var proxy_var (cosec_proxy);
 
-  cosec_proxy->init (ACE_TRY_ENV);
+  cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ());
 
   PortableServer::POA_var def_poa =
     this->event_channel_->get_default_POA ();
 
   CORBA::Object_var obj = this->poa_factory_->
-    activate_object (def_poa.in (), cosec_proxy, ACE_TRY_ENV);
+    activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ());
 
   return CosEventChannelAdmin::ProxyPushSupplier::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     CosNotifyChannelAdmin::AdminLimitExceeded
@@ -635,7 +635,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelA
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -646,7 +646,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &ACE_TRY_EN
 
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin_i::priority_filter (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -656,7 +656,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -665,7 +665,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin_i::lifetime_filter (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -675,7 +675,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -684,7 +684,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin_i::pull_suppliers (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ConsumerAdmin_i::pull_suppliers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -702,10 +702,10 @@ TAO_Notify_Filter_Command_Worker::TAO_Notify_Filter_Command_Worker (TAO_Notify_E
 }
 
 void
-TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL)
 {
   this->event_processor_->evaluate_listener_filter (this->event_, event_listener,
-                                                    this->eval_parent_, ACE_TRY_ENV);
+                                                    this->eval_parent_ TAO_ENV_ARG_PARAMETER);
 }
 
 /****************************************************************************************************/
@@ -721,9 +721,9 @@ TAO_Notify_Dispatch_Command_Worker::~TAO_Notify_Dispatch_Command_Worker ()
 }
 
 void
-TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL)
 {
-  this->event_processor_->dispatch_event (this->event_, event_listener, ACE_TRY_ENV);
+  this->event_processor_->dispatch_event (this->event_, event_listener TAO_ENV_ARG_PARAMETER);
 }
 
 /****************************************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
index 40457951016..1e7aa09ff50 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
@@ -69,17 +69,17 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
   virtual CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV);
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
 
   //= TAO_Notify_EventListener methods
-  virtual void dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV);
+  virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
   // Callback methods to supply the event to the listener.
 
-  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL);
   // Evaluates true if this event is acceptable by the listener.
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Ask the listener to relinqish any bindings and prepare to be disposed.
 
   virtual TAO_Notify_Worker_Task* event_dispatch_task (void);
@@ -91,11 +91,11 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
 
   void init (CosNotifyChannelAdmin::AdminID myID,
              CosNotifyChannelAdmin::InterFilterGroupOperator myOperator,
-             PortableServer::POA_ptr my_POA,
-             CORBA::Environment &ACE_TRY_ENV);
+             PortableServer::POA_ptr my_POA
+             TAO_ENV_ARG_DECL);
   // Initialize the Consumer Admin.
 
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (CORBA::Environment &ACE_TRY_ENV);
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
   // Return the CORBA object for this servant.
 
   TAO_Notify_Event_Manager* get_event_manager (void);
@@ -104,13 +104,13 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
   TAO_Notify_FilterAdmin_i& get_filter_admin (void);
   // Get our filter admin.
 
-  void deactivate_proxy_pushsupplier (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV);
+  void deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL);
   // Deactivate servant from <proxy_pushsupplier_POA_>.
 
-  void register_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV);
+  void register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL);
   // Register with parent for subscription updates.
 
-  void unregister_listener (TAO_Notify_EventListener *listener, CORBA::Environment &ACE_TRY_ENV);
+  void unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL);
   // Unregister with parent from subscription updates.
 
   void proxy_pushsupplier_destroyed (CosNotifyChannelAdmin::ProxyID proxyID);
@@ -118,73 +118,73 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::AdminID MyID (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void priority_filter (
-    CosNotifyFilter::MappingFilter_ptr priority_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::MappingFilter_ptr priority_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void lifetime_filter (
-    CosNotifyFilter::MappingFilter_ptr lifetime_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::MappingFilter_ptr lifetime_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
-    CosNotifyChannelAdmin::ProxyID proxy_id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ProxyID proxy_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -193,8 +193,8 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
 
 virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID_out proxy_id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ProxyID_out proxy_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -203,8 +203,8 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_suppli
 
 virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID_out proxy_id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ProxyID_out proxy_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -212,22 +212,22 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_suppli
   ));
 
 virtual void destroy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotification::QoSProperties * get_qos (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void set_qos (
-    const CosNotification::QoSProperties & qos,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::QoSProperties & qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -236,8 +236,8 @@ virtual void set_qos (
 
 virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out available_qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -246,8 +246,8 @@ virtual void validate_qos (
 
 virtual void subscription_change (
     const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::EventTypeSeq & removed
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -255,16 +255,16 @@ virtual void subscription_change (
   ));
 
 virtual CosNotifyFilter::FilterID add_filter (
-    CosNotifyFilter::Filter_ptr new_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::Filter_ptr new_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -272,8 +272,8 @@ virtual void remove_filter (
   ));
 
 virtual CosNotifyFilter::Filter_ptr get_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -281,28 +281,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter (
   ));
 
 virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -310,16 +310,16 @@ virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
 
 protected:
   // = Helper methods
-  void destroy_i (CORBA::Environment &ACE_TRY_ENV);
+  void destroy_i (TAO_ENV_SINGLE_ARG_DECL);
   // Destroy CA
 
- CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV);
+ CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
  // Obtain a proxy pushsupplier object
 
- CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV);
+ CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
  // Obtain a structured proxy pushsupplier object.
 
- CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV);
+ CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
  // Obtain a sequence proxy pushsupplier object.
 
  // = Data members
@@ -400,7 +400,7 @@ public:
   TAO_Notify_Filter_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Event_Processor* event_processor, CORBA::Boolean eval_parent);
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV);
+  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
 
 protected:
   TAO_Notify_Event* event_;
@@ -423,7 +423,7 @@ public:
   ~TAO_Notify_Dispatch_Command_Worker ();
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV);
+  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
 
 protected:
   TAO_Notify_Event* event_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
index f328a199504..f1baba38849 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -46,7 +46,7 @@ TAO_Notify_Default_CO_Factory::fini (void)
 
 
 TAO_Notify_EventChannel_i*
-TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL)
 {
   TAO_Notify_EventChannel_i* channel;
   ACE_NEW_THROW_EX (channel,
@@ -56,8 +56,8 @@ TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFact
 }
 
 TAO_Notify_ConsumerAdmin_i*
-TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel,
-                                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel
+                                               TAO_ENV_ARG_DECL)
 {
   TAO_Notify_ConsumerAdmin_i* consumer_admin_i;
   ACE_NEW_THROW_EX (consumer_admin_i,
@@ -67,8 +67,8 @@ TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i*
 }
 
 TAO_Notify_SupplierAdmin_i*
-TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel
+                                                   TAO_ENV_ARG_DECL)
 {
   TAO_Notify_SupplierAdmin_i* supplier_admin_i;
 
@@ -80,7 +80,7 @@ TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i*
 
 
 TAO_Notify_FilterFactory_i*
-TAO_Notify_Default_CO_Factory::create_filter_factory (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_FilterFactory_i* filterfactory;
   ACE_NEW_THROW_EX (filterfactory,
@@ -91,7 +91,7 @@ TAO_Notify_Default_CO_Factory::create_filter_factory (CORBA::Environment &ACE_TR
 
 
 TAO_Notify_StructuredProxyPushSupplier_i*
-TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushSupplier_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -101,7 +101,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_Cons
 }
 
 TAO_Notify_SequenceProxyPushSupplier_i*
-TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushSupplier_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -111,7 +111,7 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_Consume
 }
 
 TAO_Notify_ProxyPushSupplier_i*
-TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushSupplier_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -122,7 +122,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdm
 
 
 TAO_Notify_StructuredProxyPushConsumer_i*
-TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushConsumer_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -132,7 +132,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_Supp
 }
 
 TAO_Notify_ProxyPushConsumer_i*
-TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushConsumer_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -142,7 +142,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdm
 }
 
 TAO_Notify_SequenceProxyPushConsumer_i*
-TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushConsumer_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -153,13 +153,13 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie
 
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL)
 {
-  return create_event_channel_lock (ACE_TRY_ENV);
+  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_Lock* lock;
   ACE_NEW_THROW_EX (lock,
@@ -169,31 +169,31 @@ TAO_Notify_Default_CO_Factory::create_event_channel_lock (CORBA::Environment &AC
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (ACE_TRY_ENV);
+  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (ACE_TRY_ENV);
+  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (ACE_TRY_ENV);
+  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (ACE_TRY_ENV);
+  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
index 47a1e10260f..8dd11836a7b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
@@ -51,55 +51,55 @@ public:
 
   // = TAO_Notify_CO_Factory methods
   // = Creation methods
-  TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL);
   // Create an Event Channel.
 
-  TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL);
   // Create a Consumer Admin.
 
-  TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL);
   // Create a Supplier Admin.
 
-  TAO_Notify_FilterFactory_i* create_filter_factory (CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL);
   // Create the Filter Factory.
 
   // = Proxy Creation methods.
-  TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL);
   // Create a Structured ProxyPushSupplier.
 
-  TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL);
   // Create a Sequence ProxyPushSupplier.
 
-  TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL);
   // Create a ProxyPushSupplier.
 
-  TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL);
   // Create a Structured ProxyPushConsumer.
 
-  TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL);
   // Create a Sequence ProxyPushConsumer.
 
-  TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent, CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL);
   // Create a ProxyPushConsumer.
 
   //= Locks
   // = Methods to create locks.
-  ACE_Lock* create_channel_factory_lock (CORBA::Environment &ACE_TRY_ENV);
+  ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL);
   // Create lock type used by channel factory.
 
-  ACE_Lock* create_event_channel_lock (CORBA::Environment &ACE_TRY_ENV);
+  ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL);
   // Create lock type used by EC's.
 
-  ACE_Lock* create_consumer_admin_lock (CORBA::Environment &ACE_TRY_ENV);
+  ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL);
   // Create lock type used by Consumer Admin's.
 
-  ACE_Lock* create_supplier_admin_lock (CORBA::Environment &ACE_TRY_ENV);
+  ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL);
   // Create lock type used by Supplier Admin's.
 
-  ACE_Lock* create_proxy_supplier_lock (CORBA::Environment &ACE_TRY_ENV);
+  ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL);
   // Create lock type used by proxy supplier.
 
-  ACE_Lock* create_proxy_consumer_lock (CORBA::Environment &ACE_TRY_ENV);
+  ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL);
   // Create lock type used by proxy consumer.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index 102c11c435e..8504fedf3a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -129,7 +129,7 @@ TAO_Notify_Default_EMO_Factory::init (int argc, char* argv[])
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size,CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size TAO_ENV_ARG_DECL)
 {
   TAO_Notify_Worker_Task* task;
 
@@ -166,21 +166,21 @@ TAO_Notify_Default_EMO_Factory::init_instance (void)
 int
 TAO_Notify_Default_EMO_Factory::preallocate_tasks (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   this->prealloc_source_eval_task_ =
-    create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_,
-                 ACE_TRY_ENV);
+    create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->prealloc_listener_eval_task_ =
-    create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_,
-                 ACE_TRY_ENV);
+    create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->prealloc_dispatching_task_ =
-    create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_,
-                 ACE_TRY_ENV);
+    create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -194,7 +194,7 @@ TAO_Notify_Default_EMO_Factory::fini (void)
 }
 
 TAO_Notify_Event_Manager*
-TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)
 {
   TAO_Notify_Event_Manager* event_manager;
   ACE_NEW_THROW_EX (event_manager,
@@ -204,7 +204,7 @@ TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i*
 }
 
 TAO_Notify_Event_Map*
-TAO_Notify_Default_EMO_Factory::create_event_map (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_event_map (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_Event_Map* event_map;
   ACE_NEW_THROW_EX (event_map,
@@ -214,7 +214,7 @@ TAO_Notify_Default_EMO_Factory::create_event_map (CORBA::Environment &ACE_TRY_EN
 }
 
 TAO_Notify_Event_Processor*
-TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL)
 {
   TAO_Notify_Event_Processor* event_processor;
   ACE_NEW_THROW_EX (event_processor,
@@ -225,49 +225,49 @@ TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager
 
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_source_eval_task (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
     return create_task (EMO_OPTIONS::instance ()->mt_source_eval_,
-                        EMO_OPTIONS::instance ()->source_threads_,
-                        ACE_TRY_ENV);
+                        EMO_OPTIONS::instance ()->source_threads_
+                        TAO_ENV_ARG_PARAMETER);
   else
     return prealloc_source_eval_task_;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_lookup_task (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_lookup_task (TAO_ENV_SINGLE_ARG_DECL)
 {
   return create_task (EMO_OPTIONS::instance ()->mt_lookup_,
-                      EMO_OPTIONS::instance ()->lookup_threads_, ACE_TRY_ENV);
+                      EMO_OPTIONS::instance ()->lookup_threads_ TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_listener_eval_task (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
     return create_task (EMO_OPTIONS::instance ()->mt_listener_eval_,
-                        EMO_OPTIONS::instance ()->listener_threads_,
-                        ACE_TRY_ENV);
+                        EMO_OPTIONS::instance ()->listener_threads_
+                        TAO_ENV_ARG_PARAMETER);
   else
     return prealloc_listener_eval_task_;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_dispatching_task (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
     return create_task (EMO_OPTIONS::instance ()->mt_dispatching_,
-                        EMO_OPTIONS::instance ()->dispatching_threads_,
-                        ACE_TRY_ENV);
+                        EMO_OPTIONS::instance ()->dispatching_threads_
+                        TAO_ENV_ARG_PARAMETER);
   else
     return prealloc_dispatching_task_;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_updates_task (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_updates_task (TAO_ENV_SINGLE_ARG_DECL)
 {
-  return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS, ACE_TRY_ENV);
+  return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS TAO_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
index bc693dd6b0f..18ada3e25f0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -70,21 +70,21 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F
   virtual int init (int argc, char* argv[]);
   virtual int fini (void);
 
-  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL);
   // Create an event manager.
 
-  virtual TAO_Notify_Event_Map* create_event_map (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL);
   // Create the event map.
 
-  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL);
   // Create event processor.
 
   // = Create processing tasks.
-  virtual TAO_Notify_Worker_Task* create_source_eval_task (CORBA::Environment &ACE_TRY_ENV);
-  virtual TAO_Notify_Worker_Task* create_lookup_task (CORBA::Environment &ACE_TRY_ENV);
-  virtual TAO_Notify_Worker_Task* create_listener_eval_task ( CORBA::Environment &ACE_TRY_ENV);
-  virtual TAO_Notify_Worker_Task* create_dispatching_task (CORBA::Environment &ACE_TRY_ENV);
-  virtual TAO_Notify_Worker_Task* create_updates_task (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_listener_eval_task ( TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL);
 
   virtual void destroy_source_eval_task (TAO_Notify_Worker_Task* task);
   virtual void destroy_lookup_task (TAO_Notify_Worker_Task* task);
@@ -97,7 +97,7 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F
 
 protected:
   //= Protected Methods
-  TAO_Notify_Worker_Task* create_task (int mt, int tp_size,CORBA::Environment &ACE_TRY_ENV);
+  TAO_Notify_Worker_Task* create_task (int mt, int tp_size TAO_ENV_ARG_DECL);
   // Create a worker task, mt => is this a MT task, if so, tp_size is thread pool size.
 
   int preallocate_tasks (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index 3f16e410f11..6db78cedef9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -36,59 +36,59 @@ TAO_Notify_Default_POA_Factory::fini (void)
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL)
 {
   return this->create_generic_childPOA_i (EC_POA_NAME,
-                                          parent_poa, ACE_TRY_ENV);
+                                          parent_poa TAO_ENV_ARG_PARAMETER);
 }
 
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "SA");
 
-  return this->create_generic_childPOA_i (child_poa_name, parent_poa,
-                                          ACE_TRY_ENV);
+  return this->create_generic_childPOA_i (child_poa_name, parent_poa
+                                          TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "CA");
 
   return this->create_generic_childPOA_i (child_poa_name,
-                                          parent_poa, ACE_TRY_ENV);
+                                          parent_poa TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPC");
 
   return this->create_generic_childPOA_i (child_poa_name,
-                                          parent_poa, ACE_TRY_ENV);
+                                          parent_poa TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPS");
 
   return this->create_generic_childPOA_i (child_poa_name,
-                                          parent_poa, ACE_TRY_ENV);
+                                          parent_poa TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
 {
   // @@ Pradeep: if the Notification service is ever going to be
   // persistent or fault tolerant you may need to create this stuff
@@ -99,17 +99,17 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa
   // Create a UNIQUE_ID and USER_ID policy because we want the POA
   // to detect duplicates for us.
   PortableServer::IdUniquenessPolicy_var idpolicy =
-    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID,
-                                      ACE_TRY_ENV);
+    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil());
 
   PortableServer::IdAssignmentPolicy_var assignpolicy =
-    poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                      ACE_TRY_ENV);
+    poa->create_id_assignment_policy (PortableServer::USER_ID
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   PortableServer::POAManager_var manager =
-    poa->the_POAManager (ACE_TRY_ENV);
+    poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Create a PolicyList
@@ -125,11 +125,11 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa
   // Create the child POA.
   PortableServer::POA_var poa_ret = poa->create_POA (child_poa_name,
                                                      manager.in (),
-                                                     policy_list,
-                                                     ACE_TRY_ENV);
+                                                     policy_list
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil());
 
-  idpolicy->destroy (ACE_TRY_ENV);
+  idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil());
 
   assignpolicy->destroy ();
@@ -169,83 +169,83 @@ TAO_Notify_Default_POA_Factory::long_to_ObjectId (const CORBA::Long id)
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL)
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
     this->long_to_ObjectId (id);
 
   poa->activate_object_with_id (oid.in (),
-                                servant,
-                                ACE_TRY_ENV);
+                                servant
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return poa->id_to_reference (oid.in (),
-                               ACE_TRY_ENV);
+  return poa->id_to_reference (oid.in ()
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL)
 {
-  PortableServer::ObjectId_var oid = poa->activate_object (servant, ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid = poa->activate_object (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return poa->id_to_reference (oid.in (), ACE_TRY_ENV);
+  return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL)
 {
-  PortableServer::ObjectId_var oid = poa->servant_to_id (servant, ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid = poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return poa->id_to_reference (oid.in (), ACE_TRY_ENV);
+  return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
     this->long_to_ObjectId (id);
 
-  return poa->id_to_reference (oid.in (),
-                               ACE_TRY_ENV);
+  return poa->id_to_reference (oid.in ()
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (poa))
-    poa->destroy (1,0,ACE_TRY_ENV);
+    poa->destroy (1,0 TAO_ENV_ARG_PARAMETER);
   // The <wait_for_completion> flag causes a deadlock when destroying the POA
   // because we are involved in an upcall.
   // TODO:I have to think about what the implications of not waiting are.
 }
 
 void
-TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (poa) || CORBA::is_nil (obj))
     return;
 
   PortableServer::ObjectId_var id =
-    poa->reference_to_id (obj, ACE_TRY_ENV);
+    poa->reference_to_id (obj TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (poa) || servant == 0)
     return;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
index 3953733fefd..44b314cfdf0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
@@ -47,41 +47,41 @@ public:
   virtual int init (int argc, char* argv[]);
   virtual int fini (void);
 
-  PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL);
   // Create the POA to activate Event Channels in.
 
-  PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
   // Create the POA to activate SA's in.
 
-  PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
   // Create the POA to activate CA's in.
 
-  PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
   // Create the POA to activate proxy push consumers in.
 
-  PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
   // Create the POA to activate proxy push suppliers in.
 
   // = Object activation and POA methods
-  CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL);
   // Converts <id> to an ObjectId and registers with the POA <poa>.
 
-  CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL);
   // Registers with the POA <poa>.
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL);
   // Registers with the POA <poa>.
 
-  CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
   // Look for the Object with id <id> in <poa>.
 
-  void destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV);
+  void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
   // Destroy the <poa>
 
-  void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV);
+  void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
   // Deactivate the object.
 
-  void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr, CORBA::Environment &ACE_TRY_ENV);
+  void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL);
   // Deactivate the object.
 
 protected:
@@ -90,7 +90,7 @@ protected:
   PortableServer::ObjectId* long_to_ObjectId (const CORBA::Long id);
   // Converts a CORBA::Long to an ObjectId
 
-  PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL);
   // Create the POA with the most generic policies required of our POA's.
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp
index 71d9096c54e..ced35b8551e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp
@@ -244,22 +244,22 @@ TAO_Notify_Any::event_type (void) const
 }
 
 CORBA::Boolean
-TAO_Notify_Any::do_match (CosNotifyFilter::Filter_ptr filter,
-                          CORBA::Environment &ACE_TRY_ENV) const
+TAO_Notify_Any::do_match (CosNotifyFilter::Filter_ptr filter
+                          TAO_ENV_ARG_DECL) const
 {
-  return filter->match (*this->data_, ACE_TRY_ENV);
+  return filter->match (*this->data_ TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Any::do_push (CosEventComm::PushConsumer_ptr consumer,
-                         CORBA::Environment &ACE_TRY_ENV) const
+TAO_Notify_Any::do_push (CosEventComm::PushConsumer_ptr consumer
+                         TAO_ENV_ARG_DECL) const
 {
-  consumer->push (*this->data_, ACE_TRY_ENV);
+  consumer->push (*this->data_ TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer,
-                         CORBA::Environment &ACE_TRY_ENV) const
+TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer
+                         TAO_ENV_ARG_DECL) const
 {
   // translation pg. 28
   CosNotification::StructuredEvent event;
@@ -267,7 +267,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer,
   event.header.fixed_header.event_type.type_name = CORBA::string_dup ("%ANY");
   event.header.fixed_header.event_type.domain_name = CORBA::string_dup ("");
 
-  consumer->push_structured_event (event, ACE_TRY_ENV);
+  consumer->push_structured_event (event TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -379,26 +379,26 @@ TAO_Notify_StructuredEvent::event_type (void) const
 }
 
 CORBA::Boolean
-TAO_Notify_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+TAO_Notify_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter
+                                      TAO_ENV_ARG_DECL) const
 {
-  return filter->match_structured (*this->data_, ACE_TRY_ENV);
+  return filter->match_structured (*this->data_ TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer
+                                     TAO_ENV_ARG_DECL) const
 {
   // translation pg. 28
   CORBA::Any any;
   any <<= *this->data_;
   // is the typecode set by this operation or do we need to set it explicity.
 
-  consumer->push (any, ACE_TRY_ENV);
+  consumer->push (any TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const
+TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const
 {
-  consumer->push_structured_event (*this->data_, ACE_TRY_ENV);
+  consumer->push_structured_event (*this->data_ TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
index d51903b117d..e105f3ed138 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
@@ -123,11 +123,11 @@ public:
   // ownership of the data to the new object otherwise we copy the data
   // for the new object.
 
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter, CORBA::Environment &ACE_TRY_ENV) const = 0;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) const = 0;
   // Returns true if the filter matches.
 
-  virtual void do_push (CosEventComm::PushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const = 0;
-  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const = 0;
+  virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0;
+  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0;
   // Push self to <consumer>
 
   // = QoS Properties.
@@ -198,9 +198,9 @@ public:
 
   virtual CORBA::Boolean is_special_event_type (void) const;
   virtual const TAO_Notify_EventType& event_type (void) const;
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter, CORBA::Environment &ACE_TRY_ENV) const;
-  virtual void do_push (CosEventComm::PushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const;
-  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) const;
+  virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
+  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
 
 protected:
   CORBA::Any* data_;
@@ -230,9 +230,9 @@ public:
 
   virtual CORBA::Boolean is_special_event_type (void) const;
   virtual const TAO_Notify_EventType& event_type (void) const;
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter, CORBA::Environment &ACE_TRY_ENV) const;
-  virtual void do_push (CosEventComm::PushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const;
-  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer, CORBA::Environment &ACE_TRY_ENV) const;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) const;
+  virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
+  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 9199a8e5c5a..1bf7a558b67 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -23,7 +23,7 @@ TAO_Notify_EventChannelFactory_i::~TAO_Notify_EventChannelFactory_i (void)
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL)
 {
   TAO_Notify_EventChannelFactory_i* channelfactory;
   ACE_NEW_THROW_EX (channelfactory,
@@ -33,22 +33,22 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA, C
 
   PortableServer::ServantBase_var channelfactory_var (channelfactory);
 
-  channelfactory->init_i (default_POA, ACE_TRY_ENV);
+  channelfactory->init_i (default_POA TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
 
   CORBA::Object_var obj = channelfactory->poa_factory_->
     activate_object (channelfactory->my_POA_.in (),
-                     channelfactory, ACE_TRY_ENV);
+                     channelfactory TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
 
   return CosNotifyChannelAdmin::EventChannelFactory
-    ::_narrow (obj.in (), ACE_TRY_ENV);
+    ::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL)
 {
-  TAO_Notify_Factory::init (ACE_TRY_ENV);
+  TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->my_POA_ = PortableServer::POA::_duplicate (default_POA);
@@ -60,23 +60,23 @@ TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA, C
 
   // The POA that we should activate the Event Channels in.
   this->ec_POA_ = this->poa_factory_->
-    create_event_channel_POA (this->my_POA_.in (), ACE_TRY_ENV);
+    create_event_channel_POA (this->my_POA_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->lock_ =
-    this->channel_objects_factory_->create_channel_factory_lock (ACE_TRY_ENV);
+    this->channel_objects_factory_->create_channel_factory_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->default_filter_factory_ =
-    this->create_default_filter_factory_i (ACE_TRY_ENV);
+    this->create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannelFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
   return CosNotifyChannelAdmin::EventChannelFactory
     ::_narrow (this->poa_factory_->
-               servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV));
+               servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER));
 }
 
 void
@@ -88,29 +88,33 @@ TAO_Notify_EventChannelFactory_i::event_channel_destroyed (CosNotifyChannelAdmin
     ACE_DEBUG ((LM_DEBUG, "event_channel_destroyed %d\n", channel_id));
 }
 
-void TAO_Notify_EventChannelFactory_i::shutdown (CORBA::Environment &ACE_TRY_ENV, CORBA::Boolean destroy_children)
+void TAO_Notify_EventChannelFactory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL
+#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_LACKS_SUPPRESS_ENV)
+                                                 ,
+#endif
+                                                CORBA::Boolean destroy_children)
 {
   if (destroy_children == 1)
     {
-      this->poa_factory_->destroy_POA (this->ec_POA_.in (), ACE_TRY_ENV);
+      this->poa_factory_->destroy_POA (this->ec_POA_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->poa_factory_->deactivate_object(this->default_filter_factory_.in (),
-                                            this->my_POA_.in (),
-                                            ACE_TRY_ENV);
+                                            this->my_POA_.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // Deactivate ourselves.
   this->poa_factory_->deactivate_object (this,
-                                         this->my_POA_.in (),
-                                         ACE_TRY_ENV);
+                                         this->my_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
 TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSProperties& initial_qos,
                                                  const CosNotification::AdminProperties& initial_admin,
-                                                 CosNotifyChannelAdmin::ChannelID_out ec_id,
-                                                 CORBA::Environment &ACE_TRY_ENV
+                                                 CosNotifyChannelAdmin::ChannelID_out ec_id
+                                                 TAO_ENV_ARG_DECL
                                                  )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -119,8 +123,8 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope
                    ))
 {
   TAO_Notify_EventChannel_i* channel =
-    this->channel_objects_factory_->create_event_channel (this,
-                                                          ACE_TRY_ENV);
+    this->channel_objects_factory_->create_event_channel (this
+                                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   PortableServer::ServantBase_var channel_var (channel);
@@ -135,13 +139,13 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope
     ACE_DEBUG ((LM_DEBUG, "event_channel created %d\n", ec_id));
   }
 
-  channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in (),
-                 ACE_TRY_ENV);
+  channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in ()
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   CORBA::Object_var obj = this->poa_factory_->
-    activate_object_with_id (ec_id, this->ec_POA_.in (), channel,
-                             ACE_TRY_ENV);
+    activate_object_with_id (ec_id, this->ec_POA_.in (), channel
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   this->ec_ids_.next ();
@@ -149,18 +153,18 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope
 }
 
 CosNotifyChannelAdmin::ChannelIDSeq*
-TAO_Notify_EventChannelFactory_i::get_all_channels (CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_EventChannelFactory_i::get_all_channels (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
 
-  return this->ec_ids_.get_sequence (ACE_TRY_ENV);
+  return this->ec_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id, CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ChannelNotFound
@@ -170,8 +174,8 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan
 
   ACE_TRY
     {
-      obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in (),
-                                                 ACE_TRY_ENV);
+      obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY // Translate any exception to "not found"
@@ -181,14 +185,14 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
-  return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in (), ACE_TRY_ENV);
+  return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_FilterFactory_i* filterfactory =
-    this->channel_objects_factory_->create_filter_factory (ACE_TRY_ENV);
+    this->channel_objects_factory_->create_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
 
   PortableServer::ServantBase_var filterfactory_var (filterfactory);
@@ -198,7 +202,7 @@ TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (CORBA::Enviro
 
   CORBA::Object_var obj =
     this->poa_factory_->activate_object (this->my_POA_.in (),
-                                         filterfactory, ACE_TRY_ENV);
+                                         filterfactory TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
 
   return CosNotifyFilter::FilterFactory::_narrow (obj.in ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 8f9700a04c3..41750ef9d51 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -61,14 +61,18 @@ public:
   virtual ~TAO_Notify_EventChannelFactory_i (void);
   // Destructor
 
-  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV);
+  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL);
   // Create a factory servant and activates it with the default POA.
   // Also creates a resource factory and assigns it this default_POA.
 
-  CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (CORBA::Environment &ACE_TRY_ENV);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
   // Get the CORBA object.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV, CORBA::Boolean destroy_children = 0);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL
+#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_LACKS_SUPPRESS_ENV)
+  ,    // This is ugly -- destroy_children should come BEFORE the env arg.
+#endif
+                 CORBA::Boolean destroy_children = 0);
   // Destroy the factory
   // By default, the factory's lifetime is not coupled with its creations
   // Setting the <destroy_children> flag to 'true' will destory all event_channels that were created by this factory.
@@ -84,8 +88,8 @@ public:
 virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel (
     const CosNotification::QoSProperties & initial_qos,
     const CosNotification::AdminProperties & initial_admin,
-    CosNotifyChannelAdmin::ChannelID_out id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ChannelID_out id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -94,15 +98,15 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel (
   ));
 
 virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
-    CosNotifyChannelAdmin::ChannelID id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ChannelID id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -113,10 +117,10 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
   TAO_Notify_EventChannelFactory_i (void);
   // Constructor
 
-  void init_i (PortableServer::POA_ptr default_POA, CORBA::Environment &ACE_TRY_ENV);
+  void init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL);
   // Initializes this object.
 
-  CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (CORBA::Environment& ACE_TRY_ENV);
+  CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL);
   // Create the default filter factory.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index 430e7bcd0ef..ff92e190c84 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -50,7 +50,7 @@ TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void)
 }
 
 void
-TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA TAO_ENV_ARG_DECL)
 {
   this->channel_id_ = channel_id;
 
@@ -58,38 +58,38 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co
   this->default_POA_ = PortableServer::POA::_duplicate (default_POA);
 
   this->lock_ =
-    this->channel_objects_factory_->create_event_channel_lock (ACE_TRY_ENV);
+    this->channel_objects_factory_->create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_manager_ =
-    this->event_manager_objects_factory_->create_event_manager (this, ACE_TRY_ENV);
+    this->event_manager_objects_factory_->create_event_manager (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_manager_->init (ACE_TRY_ENV);
+  this->event_manager_->init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // try to set initial qos params
-  this->set_qos (initial_qos, ACE_TRY_ENV);
+  this->set_qos (initial_qos TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // try to set initial admin params
-  this->set_admin (initial_admin, ACE_TRY_ENV);
+  this->set_admin (initial_admin TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the POA for the CA's
   this->CA_POA_ =
-    this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id,
-                                                   ACE_TRY_ENV);
+    this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the POA for the SA's
   this->SA_POA_ =
-    this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id,
-                                                   ACE_TRY_ENV);
+    this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_listener_list_ =
-    TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (ACE_TRY_ENV);
+    TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the default Consumer Admin. Because the ID_Pool is being used
@@ -97,11 +97,11 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co
   CosNotifyChannelAdmin::AdminID id_unused;
 
   CosNotifyChannelAdmin::ConsumerAdmin_var def_consumer_admin =
-    this->new_for_consumers (default_op_, id_unused, ACE_TRY_ENV);
+    this->new_for_consumers (default_op_, id_unused TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::SupplierAdmin_var def_supplier_admin =
-    this->new_for_suppliers (default_op_, id_unused, ACE_TRY_ENV);
+    this->new_for_suppliers (default_op_, id_unused TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -130,10 +130,10 @@ TAO_Notify_EventChannel_i::get_default_POA (void)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_EventChannel_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var obj = this->poa_factory_->
-    servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV);
+    servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -141,76 +141,76 @@ TAO_Notify_EventChannel_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
 
 
 void
-TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL)
 {
   // UnRegister the group listener.
-  this->event_listener_list_->disconnected (group_listener, ACE_TRY_ENV);
+  this->event_listener_list_->disconnected (group_listener TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->event_manager_->shutdown (ACE_TRY_ENV);
+  this->event_manager_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate ourselves.
   this->poa_factory_->deactivate_object (this,
-                                         this->my_POA_.in (),
-                                         ACE_TRY_ENV);
+                                         this->my_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // shutdown consumer admins's.
   TAO_Notify_Shutdown_Worker shutdown_worker;
 
-  this->event_listener_list_->for_each (&shutdown_worker, ACE_TRY_ENV);
+  this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // release all references.
-  this->event_listener_list_->shutdown (ACE_TRY_ENV);
+  this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ TODO: We need a way to send shutdown messages to the proxy consumers too.
   // (event listeners are proxy suppliers or CA's in disguise)
 
-  this->poa_factory_->destroy_POA (this->CA_POA_.in (),
-                                   ACE_TRY_ENV);
+  this->poa_factory_->destroy_POA (this->CA_POA_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->poa_factory_->destroy_POA (this->SA_POA_.in (),
-                                   ACE_TRY_ENV);
+  this->poa_factory_->destroy_POA (this->SA_POA_.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannel_i::MyFactory (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::MyFactory (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->channel_factory_->get_ref (ACE_TRY_ENV);
+  return this->channel_factory_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::default_consumer_admin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::default_consumer_admin (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->get_consumeradmin (this->default_id_, ACE_TRY_ENV);
+  return this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::default_supplier_admin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::default_supplier_admin (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->get_supplieradmin (this->default_id_, ACE_TRY_ENV);
+  return this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_EventChannel_i::default_filter_factory (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -219,14 +219,14 @@ TAO_Notify_EventChannel_i::default_filter_factory (CORBA::Environment &/*ACE_TRY
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // @@ use auto_ptr
   TAO_Notify_ConsumerAdmin_i* consumer_admin =
-    this->channel_objects_factory_->create_consumer_admin (this, ACE_TRY_ENV);
+    this->channel_objects_factory_->create_consumer_admin (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   PortableServer::ServantBase_var consumeradmin_var (consumer_admin);
@@ -239,18 +239,18 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter
     id = this->consumer_admin_ids_.get ();
   }
 
-  consumer_admin->init (id, op, this->CA_POA_.in (), ACE_TRY_ENV);
+  consumer_admin->init (id, op, this->CA_POA_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   CORBA::Object_var obj =
     this->poa_factory_->activate_object_with_id (id,
                                                  this->CA_POA_.in (),
-                                                 consumer_admin,
-                                                 ACE_TRY_ENV);
+                                                 consumer_admin
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   // Register the group listener.
-  this->event_listener_list_->connected (consumer_admin, ACE_TRY_ENV);
+  this->event_listener_list_->connected (consumer_admin TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   this->consumer_admin_ids_.next ();
@@ -258,13 +258,13 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_SupplierAdmin_i* supplieradmin =
-    this->channel_objects_factory_->create_supplier_admin (this, ACE_TRY_ENV);
+    this->channel_objects_factory_->create_supplier_admin (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   PortableServer::ServantBase_var supplieradmin_var (supplieradmin);
@@ -275,14 +275,14 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter
     id = this->supplier_admin_ids_.get ();
   }
 
-  supplieradmin->init (id, op, this->SA_POA_.in (), ACE_TRY_ENV);
+  supplieradmin->init (id, op, this->SA_POA_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   CORBA::Object_var obj = this->poa_factory_->
     activate_object_with_id (id,
                              this->SA_POA_.in (),
-                             supplieradmin,
-                             ACE_TRY_ENV);
+                             supplieradmin
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   this->supplier_admin_ids_.next ();
@@ -290,46 +290,46 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminNotFound
                    ))
 {
   CORBA::Object_var obj =
-    this->poa_factory_->id_to_reference (id, this->CA_POA_.in (),
-                                         ACE_TRY_ENV);
+    this->poa_factory_->id_to_reference (id, this->CA_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminNotFound
                    ))
 {
   CORBA::Object_var obj =
-    this->poa_factory_->id_to_reference (id, this->SA_POA_.in (),
-                                         ACE_TRY_ENV);
+    this->poa_factory_->id_to_reference (id, this->SA_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel_i::get_all_consumeradmins (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::get_all_consumeradmins (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->consumer_admin_ids_.get_sequence (ACE_TRY_ENV);
+  return this->consumer_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel_i::get_all_supplieradmins (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -338,60 +338,60 @@ TAO_Notify_EventChannel_i::get_all_supplieradmins (CORBA::Environment &ACE_TRY_E
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return this->supplier_admin_ids_.get_sequence (ACE_TRY_ENV);
+  return this->supplier_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_EventChannel_i::get_qos (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (ACE_TRY_ENV);
+  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos,CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos, ACE_TRY_ENV);
+  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV);
+  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotification::AdminProperties*
-TAO_Notify_EventChannel_i::get_admin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::get_admin (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // Delegate to Event Manager.
-  return this->event_manager_->admin_properties ()->get_admin (ACE_TRY_ENV);
+  return this->event_manager_->admin_properties ()->get_admin (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedAdmin
                    ))
 {
-  this->event_manager_->admin_properties ()->set_admin (admin, ACE_TRY_ENV);
+  this->event_manager_->admin_properties ()->set_admin (admin TAO_ENV_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::for_consumers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -401,25 +401,25 @@ TAO_Notify_EventChannel_i::for_consumers (CORBA::Environment& ACE_TRY_ENV)
   // TODO: find a way to disable the destroy method in the default Admin.
 
   CORBA::Object_var obj =
-    this->get_consumeradmin (this->default_id_, ACE_TRY_ENV);
+    this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ConsumerAdmin::_nil ());
 
-  return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in (),
-                                                       ACE_TRY_ENV);
+  return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::for_suppliers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CORBA::Object_var obj =
-    this->get_supplieradmin (this->default_id_, ACE_TRY_ENV);
+    this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::SupplierAdmin::_nil ());
 
-  return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in (),
-                                                       ACE_TRY_ENV);
+  return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
index e3c5ea3bfbd..e0035352597 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
@@ -75,8 +75,8 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
              const CosNotification::QoSProperties& initial_qos,
              const CosNotification::AdminProperties& initial_admin,
              PortableServer::POA_ptr default_POA,
-             PortableServer::POA_ptr my_POA,
-             CORBA::Environment &ACE_TRY_ENV);
+             PortableServer::POA_ptr my_POA
+             TAO_ENV_ARG_DECL);
   // Initialize this object.
   // checks if the <initial_qos> and <initial admin> are valid.
   // creates default filter, consumer admin and supplier admin.
@@ -85,7 +85,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
   PortableServer::POA_ptr get_default_POA (void);
   // Get the default POA.
 
-  CosNotifyChannelAdmin::EventChannel_ptr get_ref (CORBA::Environment &ACE_TRY_ENV);
+  CosNotifyChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
   // Get the CORBA object for this servant
 
   TAO_Notify_Event_Manager* get_event_manager (void);
@@ -98,34 +98,34 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
   void supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID);
   // This id is no longer in use.It can be reused by <supplier_admin_ids_>.
 
-  void unregister_listener (TAO_Notify_EventListener* group_listener, CORBA::Environment &ACE_TRY_ENV);
+  void unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL);
   // Consumer Admin's are Group Listeners that are registered automatically with the EC when a ConsumerAdmin
   // is created. When a consumer is destroyed, it asks the EC to unregister itself.
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -133,8 +133,8 @@ virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory (
 
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID_out id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::AdminID_out id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -142,16 +142,16 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (
 
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
-    CosNotifyChannelAdmin::AdminID_out id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::AdminID_out id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (
-    CosNotifyChannelAdmin::AdminID id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::AdminID id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -159,8 +159,8 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (
   ));
 
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (
-    CosNotifyChannelAdmin::AdminID id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::AdminID id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -168,29 +168,29 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (
   ));
 
 virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotification::QoSProperties * get_qos (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void set_qos (
-    const CosNotification::QoSProperties & qos,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::QoSProperties & qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -199,8 +199,8 @@ virtual CosNotification::QoSProperties * get_qos (
 
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out available_qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -208,15 +208,15 @@ virtual CosNotification::QoSProperties * get_qos (
   ));
 
   virtual CosNotification::AdminProperties * get_admin (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void set_admin (
-    const CosNotification::AdminProperties & admin,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::AdminProperties & admin
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -224,21 +224,21 @@ virtual CosNotification::QoSProperties * get_qos (
   ));
 
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void destroy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp
index a6be3b5bd8a..fa626cea37d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp
@@ -30,9 +30,9 @@ TAO_Notify_Event_Dispatch_Command::~TAO_Notify_Event_Dispatch_Command ()
 }
 
 int
-TAO_Notify_Event_Dispatch_Command::execute (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->event_listener_->dispatch_event (*this->event_, ACE_TRY_ENV);
+  this->event_listener_->dispatch_event (*this->event_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
index 17d5970b0ad..e0d1a48bcbe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
@@ -35,7 +35,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager ()
 }
 
 void
-TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->lock_,
                     ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (),
@@ -46,22 +46,22 @@ TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV)
   this->admin_properties_ = new TAO_Notify_AdminProperties ();
 
   this->event_map_ =
-    this->emo_factory_->create_event_map (ACE_TRY_ENV);
+    this->emo_factory_->create_event_map (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_processor_ =
-    this->emo_factory_->create_event_processor (this, ACE_TRY_ENV);
+    this->emo_factory_->create_event_processor (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->updates_dispatching_task_ =
-    this->emo_factory_->create_updates_task (ACE_TRY_ENV);
+    this->emo_factory_->create_updates_task (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Init the objects
-  this->event_map_->init (ACE_TRY_ENV);
+  this->event_map_->init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_processor_->init (ACE_TRY_ENV);
+  this->event_processor_->init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ check return value
@@ -70,58 +70,58 @@ TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_Event_Manager::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  this->event_processor_->shutdown (ACE_TRY_ENV);
+  this->event_processor_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_map_->shutdown (ACE_TRY_ENV);
+  this->event_map_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->updates_dispatching_task_->shutdown (ACE_TRY_ENV);
+  this->updates_dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
 {
   TAO_Notify_EventType_List added_update, removed_update;
 
   this->event_map_->subscribe_for_events (event_listener, added_update,
-                                         added, ACE_TRY_ENV);
+                                         added TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_map_->unsubscribe_from_events (event_listener, removed_update,
-                                              removed, ACE_TRY_ENV);
+                                              removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // if either of the lists are *not* empty, send updates
   if (added_update.is_empty () == 0 || removed_update.is_empty () == 0)
     this->dispatch_updates_i (this->event_map_->subscription_change_listeners (),
-                              added_update, removed_update, ACE_TRY_ENV);
+                              added_update, removed_update TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
 {
   TAO_Notify_EventType_List added_list;
   TAO_Notify_EventType_List removed_list;
 
   this->event_map_->update_publication_list (added, removed,
-                                            added_list, removed_list, ACE_TRY_ENV);
+                                            added_list, removed_list TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // if either of the lists are *not* empty, send updates
   if (added_list.is_empty () == 0 || removed_list.is_empty () == 0)
     this->dispatch_updates_i (this->event_map_->publication_change_listeners (),
-                              added_list, removed_list, ACE_TRY_ENV);
+                              added_list, removed_list TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                       CORBA::INTERNAL ());
@@ -129,7 +129,7 @@ TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* up
   TAO_Notify_Update_Worker update_worker (this->updates_dispatching_task_,
                                           added, removed);
 
-  update_listener_list->for_each (&update_worker, ACE_TRY_ENV);
+  update_listener_list->for_each (&update_worker TAO_ENV_ARG_PARAMETER);
 }
 
 /********************************************************************/
@@ -142,13 +142,13 @@ TAO_Notify_Update_Worker::TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * upd
 }
 
 void
-TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL)
 {
   TAO_Notify_Update_Dispatch_Command* mb =
     new TAO_Notify_Update_Dispatch_Command (listener, this->added_,
                                             this->removed_);
 
-  this->updates_dispatching_task_->process_event (mb, ACE_TRY_ENV);
+  this->updates_dispatching_task_->process_event (mb TAO_ENV_ARG_PARAMETER);
 }
 
 /********************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
index a72162954e5..78fe19a3be8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
@@ -59,34 +59,34 @@ class TAO_Notify_Export TAO_Notify_Event_Manager
   ~TAO_Notify_Event_Manager ();
   // Destructor.
 
-  void init (CORBA::Environment &ACE_TRY_ENV);
+  void init (TAO_ENV_SINGLE_ARG_DECL);
   // Init
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown operations.
 
   // = Publish/Subscribe management
   // = Subscription
-  void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV);
+  void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL);
   // Subscribes <event_listener> for events <added>.
   // Unsubscribes <event_listener> for events <removed>.
 
   // = Publications
-  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV);
+  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL);
   // Suppliers can send anonymous requests to the Event Manager to indicate
   // what kind of events they expect to produce.
 
   // = Updates
-  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Registers the subscription update listener with the Event Manager.
 
-  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Unregister from subscription updates.
 
-  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Registers the publication update listener with the Event Manager.
 
-  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Unregister from publication updates.
 
   // = Accessors
@@ -110,8 +110,8 @@ class TAO_Notify_Export TAO_Notify_Event_Manager
 
   // = Event forwarding methods.
   void process_event (TAO_Notify_Event* event,
-                      TAO_Notify_EventSource* event_source,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      TAO_Notify_EventSource* event_source
+                      TAO_ENV_ARG_DECL);
   // Delivers the event to listeners subscribed for <event>
   // <event_source> is the <event> source to the Event Manager.
 
@@ -119,8 +119,8 @@ protected:
   // = Event dispatching methods.
   void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list,
                            TAO_Notify_EventType_List& added,
-                           TAO_Notify_EventType_List& removed,
-                           CORBA::Environment &ACE_TRY_ENV);
+                           TAO_Notify_EventType_List& removed
+                           TAO_ENV_ARG_DECL);
   // Dispatch the updates to the <update_listener_list>
 
   // = Data members.
@@ -161,7 +161,7 @@ class TAO_Notify_Export TAO_Notify_Update_Worker : public TAO_ESF_Worker<TAO_Not
   TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * updates_dispatching_task, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed);
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_UpdateListener* listener, CORBA::Environment &ACE_TRY_ENV);
+  void work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL);
  protected:
   // = Data members.
   TAO_Notify_EventType_List& added_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
index 374b1f2b47d..88a95c1baf2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
@@ -7,45 +7,45 @@
 
 ACE_INLINE void
 TAO_Notify_Event_Manager::process_event  (TAO_Notify_Event* event,
-                                          TAO_Notify_EventSource* event_source,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          TAO_Notify_EventSource* event_source
+                                          TAO_ENV_ARG_DECL)
 {
   if (admin_properties_->reject_new_events () == 1
       && admin_properties_->queue_full ())
     ACE_THROW (CORBA::IMP_LIMIT ());
 
   this->event_processor_->evaluate_source_filter (event,
-                                                  event_source,
-                                                  ACE_TRY_ENV);
+                                                  event_source
+                                                  TAO_ENV_ARG_PARAMETER);
   // Start by checking if the event passes through the Source's filter.
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->event_map_->register_for_publication_updates (update_listener,
-                                                     ACE_TRY_ENV);
+  this->event_map_->register_for_publication_updates (update_listener
+                                                     TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->event_map_->register_for_subscription_updates (update_listener,
-                                                      ACE_TRY_ENV);
+  this->event_map_->register_for_subscription_updates (update_listener
+                                                      TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->event_map_->unregister_from_subscription_updates (update_listener,
-                                                         ACE_TRY_ENV);
+  this->event_map_->unregister_from_subscription_updates (update_listener
+                                                         TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->event_map_->unregister_from_publication_updates(update_listener,
-                                                       ACE_TRY_ENV);
+  this->event_map_->unregister_from_publication_updates(update_listener
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_Notify_Event_Map*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
index 2403e2a0d63..77c84b86954 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
@@ -47,23 +47,23 @@ class TAO_Notify_Export TAO_Notify_EMO_Factory : public ACE_Service_Object
  public:
   virtual ~TAO_Notify_EMO_Factory (){};
 
-  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)= 0;
+  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)= 0;
   // Create an event manager.
 
-  virtual TAO_Notify_Event_Map* create_event_map (CORBA::Environment &ACE_TRY_ENV)= 0;
+  virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL)= 0;
   // Create the event map.
 
-  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager, CORBA::Environment &ACE_TRY_ENV)= 0;
+  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL)= 0;
   // Create event processor.
 
   // = Create processing tasks.
-  virtual TAO_Notify_Worker_Task* create_source_eval_task (CORBA::Environment &ACE_TRY_ENV)= 0;
-  virtual TAO_Notify_Worker_Task* create_lookup_task (CORBA::Environment &ACE_TRY_ENV)= 0;
-  virtual TAO_Notify_Worker_Task* create_listener_eval_task (CORBA::Environment &ACE_TRY_ENV)= 0;
+  virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Worker_Task* create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
 
-  virtual TAO_Notify_Worker_Task* create_dispatching_task (CORBA::Environment &ACE_TRY_ENV)= 0;
+  virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
   // Task that dispatches events.
-  virtual TAO_Notify_Worker_Task* create_updates_task (CORBA::Environment &ACE_TRY_ENV)= 0;
+  virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
   // Task that dispatches updates.
 
   // Destroy processing tasks.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
index 16dda3f7da0..1ccbc9eb6aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
@@ -41,23 +41,23 @@ TAO_Notify_Event_Map::~TAO_Notify_Event_Map ()
 }
 
 void
-TAO_Notify_Event_Map::init (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Map::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->default_subscription_list_ =
-    this->collection_factory_->create_event_listener_list (ACE_TRY_ENV);
+    this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   // Create the default list of listeners.
 
   this->subscription_change_listeners_
-    = this->collection_factory_->create_update_listener_list (ACE_TRY_ENV);
+    = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->publication_change_listeners_
-    = this->collection_factory_->create_update_listener_list (ACE_TRY_ENV);
+    = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Map::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Shutdown all event listener lists in the event map.
   EVENT_RECIPIENT_MAP::ITERATOR iterator (this->event_recipient_map_);
@@ -66,21 +66,21 @@ TAO_Notify_Event_Map::shutdown (CORBA::Environment &ACE_TRY_ENV)
        iterator.next (entry) != 0;
        iterator.advance ())
     {
-      entry->int_id_->shutdown (ACE_TRY_ENV);
+      entry->int_id_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  default_subscription_list_->shutdown (ACE_TRY_ENV);
+  default_subscription_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  subscription_change_listeners_->shutdown (ACE_TRY_ENV);
+  subscription_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  publication_change_listeners_->shutdown (ACE_TRY_ENV);
+  publication_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL)
 {
   TAO_Notify_EventListener_List* event_listener_list;
   TAO_Notify_EventType event_type;
@@ -101,7 +101,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list
         {
           // create the list.
           TAO_Notify_EventListener_List* new_list =
-            this->collection_factory_->create_event_listener_list (ACE_TRY_ENV);
+            this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // add the list to the recipient map.
@@ -109,7 +109,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list
           event_listener_list = new_list;
         }
 
-      event_listener_list->connected (event_listener, ACE_TRY_ENV);
+      event_listener_list->connected (event_listener TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // mirror changes in the subscription list
@@ -119,7 +119,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list
 }
 
 void
-TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
 {
   TAO_Notify_EventListener_List* event_listener_list;
   TAO_Notify_EventType event_type;
@@ -137,7 +137,7 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l
 
       // remove <event_listener> from the list.
 
-      event_listener_list->disconnected (event_listener, ACE_TRY_ENV);
+      event_listener_list->disconnected (event_listener TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // If this was the last entry in the list then we should remove
@@ -157,27 +157,27 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l
 }
 
 void
-TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->publication_change_listeners_->connected (update_listener, ACE_TRY_ENV);
+  this->publication_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->subscription_change_listeners_->connected (update_listener, ACE_TRY_ENV);
+  this->subscription_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->subscription_change_listeners_->disconnected (update_listener, ACE_TRY_ENV);
+  this->subscription_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
 {
-  this->publication_change_listeners_->disconnected (update_listener, ACE_TRY_ENV);
+  this->publication_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotification::EventTypeSeq*
@@ -209,7 +209,7 @@ TAO_Notify_Event_Map::obtain_subscription_types (void)
 }
 
 void
-TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   TAO_Notify_EventType event_type;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
index fefd8ac52bf..ef139ca3353 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
@@ -57,35 +57,35 @@ public:
   virtual ~TAO_Notify_Event_Map ();
   // Destructor.
 
-  void init (CORBA::Environment &ACE_TRY_ENV);
+  void init (TAO_ENV_SINGLE_ARG_DECL);
   // Init
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown releases all listeners.
 
   // = Subscribe and Unsubscribe methods.
-  void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added, CORBA::Environment &ACE_TRY_ENV);
+  void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL);
 
-  void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV);
+  void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL);
 
   // = Publish and Unpublish methods
   // Later:
-  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list, CORBA::Environment &ACE_TRY_ENV);
+  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL);
   // Suppliers can send anonymous requests to the Event Manager to indicate
   // what kind of events they expect to produce.
 
   // = Subscription Updates
-  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Registers the subscription update listener with the Event Manager.
 
-  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Unregister from subscription updates.
 
   // = Publication Updates
-  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Registers the publication update listener with the Event Manager.
 
-  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener, CORBA::Environment &ACE_TRY_ENV);
+  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
   // Unregister from publication updates.
 
   // = Subscription list lookup
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
index 616daab0ece..e7e4e08042b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
@@ -27,9 +27,9 @@ TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor ()
 }
 
 void
-TAO_Notify_Event_Processor::init (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Processor::init (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->lookup_task_ = this->emo_factory_->create_lookup_task (ACE_TRY_ENV);
+  this->lookup_task_ = this->emo_factory_->create_lookup_task (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -40,15 +40,15 @@ TAO_Notify_Event_Processor::init (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_Event_Processor::shutdown (CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_Event_Processor::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->lookup_task_->shutdown (ACE_TRY_ENV);
+  this->lookup_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event,
-                                                    TAO_Notify_EventSource* event_source,
-                                                    CORBA::Environment& ACE_TRY_ENV)
+                                                    TAO_Notify_EventSource* event_source
+                                                    TAO_ENV_ARG_DECL)
 {
   // TODO: use cache allocator here.
   // @@ Pradeep: you shouldn't be allocating at all!  If this must go
@@ -57,22 +57,22 @@ TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event,
   TAO_Notify_Source_Filter_Eval_Command* mb =
     new TAO_Notify_Source_Filter_Eval_Command (this, event, event_source);
 
-  event_source->filter_eval_task ()->process_event (mb, ACE_TRY_ENV);
+  event_source->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event,
-                                                  TAO_Notify_EventSource* /*event_source*/,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+                                                  TAO_Notify_EventSource* /*event_source*/
+                                                  TAO_ENV_ARG_DECL)
 {
   TAO_Notify_Lookup_Command* lookup =
     new TAO_Notify_Lookup_Command (this, event, this->event_manager_->event_map ());
 
-  this->lookup_task_->process_event (lookup, ACE_TRY_ENV);
+  this->lookup_task_->process_event (lookup TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL)
 {
   // @@ Pradeep: you should use ACE_NEW here....
   // @@ Pradeep: do you really need to allocate this guy from the
@@ -83,14 +83,14 @@ TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, T
   TAO_Notify_Listener_Filter_Eval_Command* mb =
     new TAO_Notify_Listener_Filter_Eval_Command (this, event, event_listener, eval_parent);
 
-  event_listener->filter_eval_task ()->process_event (mb, ACE_TRY_ENV);
+  event_listener->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL)
 {
   TAO_Notify_Event_Dispatch_Command* dispatch =
     new TAO_Notify_Event_Dispatch_Command (this, event, event_listener);
 
-  event_listener->event_dispatch_task ()->process_event (dispatch, ACE_TRY_ENV);
+  event_listener->event_dispatch_task ()->process_event (dispatch TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
index d42fa98db99..4cba31f6026 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
@@ -56,36 +56,36 @@ class TAO_Notify_Export TAO_Notify_Event_Processor
   TAO_Notify_Event_Processor (TAO_Notify_Event_Manager* event_manager);
   virtual ~TAO_Notify_Event_Processor ();
 
-  void init (CORBA::Environment& ACE_TRY_ENV);
+  void init (TAO_ENV_SINGLE_ARG_DECL);
   // Init
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown operations.
 
   void evaluate_source_filter (TAO_Notify_Event* event,
-                               TAO_Notify_EventSource* event_source,
-                               CORBA::Environment& ACE_TRY_ENV);
+                               TAO_Notify_EventSource* event_source
+                               TAO_ENV_ARG_DECL);
   // Event processing entry point.
 
   // = Callbacks for Source/Event Listeners.
   void lookup_subscriptions (TAO_Notify_Event* event,
-                             TAO_Notify_EventSource* event_source,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             TAO_Notify_EventSource* event_source
+                             TAO_ENV_ARG_DECL);
   // This method is called by an Event_Source after it has
-  // successfully evaluated its filter. 
+  // successfully evaluated its filter.
 
   void evaluate_listener_filter (TAO_Notify_Event* event,
                                  TAO_Notify_EventListener* event_listener,
-                                 CORBA::Boolean eval_parent,
-                                 CORBA::Environment &ACE_TRY_ENV);
+                                 CORBA::Boolean eval_parent
+                                 TAO_ENV_ARG_DECL);
   // This method is called by the subscription lookup command asking
   // that <event> be delivered to <event_listener>.
 
   void dispatch_event (TAO_Notify_Event* event,
-                       TAO_Notify_EventListener* event_listener,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       TAO_Notify_EventListener* event_listener
+                       TAO_ENV_ARG_DECL);
   // This method is called by an Event_Listener after it has
-  // successfully evaluated its filter. 
+  // successfully evaluated its filter.
 
 protected:
   // = Data Members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
index 55084b3aeb3..3f6e3be9953 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
@@ -14,7 +14,7 @@ TAO_Notify_FilterAdmin_i::~TAO_Notify_FilterAdmin_i (void)
 }
 
 CORBA::Boolean
-TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
@@ -32,7 +32,7 @@ TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environme
 
   for (; iter.next (entry); iter.advance ())
     {
-      ret_val = event.do_match (entry->int_id_.in (), ACE_TRY_ENV);
+      ret_val = event.do_match (entry->int_id_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (ret_val == 1)
@@ -44,8 +44,8 @@ TAO_Notify_FilterAdmin_i::match (const TAO_Notify_Event &event, CORBA::Environme
 
 CosNotifyFilter::FilterID
 TAO_Notify_FilterAdmin_i::add_filter (
-    CosNotifyFilter::Filter_ptr new_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::Filter_ptr new_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -69,7 +69,7 @@ TAO_Notify_FilterAdmin_i::add_filter (
     }
 }
 
-void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id, CORBA::Environment &ACE_TRY_ENV)
+void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -83,8 +83,8 @@ void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_i
 
 CosNotifyFilter::Filter_ptr
 TAO_Notify_FilterAdmin_i::get_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -102,28 +102,28 @@ TAO_Notify_FilterAdmin_i::get_filter (
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_FilterAdmin_i::get_all_filters (CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_FilterAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_ids_.get_sequence(ACE_TRY_ENV);
+  return this->filter_ids_.get_sequence(TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_FilterAdmin_i::remove_all_filters (CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_FilterAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyFilter::FilterIDSeq* id_list =
-    this->get_all_filters (ACE_TRY_ENV);
+    this->get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < id_list->length (); ++i)
     {
       CosNotifyFilter::FilterID id = (*id_list)[i];
-      this->remove_filter (id, ACE_TRY_ENV);
+      this->remove_filter (id TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
index 9f4977b7d04..6e0d892e30f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
@@ -42,7 +42,7 @@ public:
   // Destructor
 
   // = match operation on all the filters
-  CORBA::Boolean match (const TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Boolean match (const TAO_Notify_Event &event TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
@@ -50,16 +50,16 @@ public:
   // see if any of the filters match.
 
   virtual CosNotifyFilter::FilterID add_filter (
-    CosNotifyFilter::Filter_ptr new_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::Filter_ptr new_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void remove_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -67,8 +67,8 @@ public:
   ));
 
   virtual CosNotifyFilter::Filter_ptr get_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -76,14 +76,14 @@ public:
   ));
 
   virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void remove_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp
index fd0975de45d..44c2fb19ce9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp
@@ -16,11 +16,11 @@ TAO_Notify_FilterFactory_i::~TAO_Notify_FilterFactory_i (void)
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_FilterFactory_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_FilterFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyFilter::FilterFactory_var filterfactory;
 
-  filterfactory = _this (ACE_TRY_ENV);
+  filterfactory = _this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
 
   return filterfactory._retn ();
@@ -28,8 +28,8 @@ TAO_Notify_FilterFactory_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
 
 CosNotifyFilter::Filter_ptr
 TAO_Notify_FilterFactory_i::create_filter (
-    const char *constraint_grammar,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *constraint_grammar
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -46,14 +46,14 @@ TAO_Notify_FilterFactory_i::create_filter (
                     TAO_Notify_Filter_i,
                     CORBA::NO_MEMORY ());
 
-  return filter->get_ref (ACE_TRY_ENV);
+  return filter->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_FilterFactory_i::create_mapping_filter (
                                                    const char * /*constraint_grammar*/,
-                                                   const CORBA::Any & /*default_value*/,
-                                                   CORBA::Environment & //ACE_TRY_ENV
+                                                   const CORBA::Any & /*default_value*/
+                                                   TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER
                                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
index c0f411a7b2d..d6b57eb7794 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
@@ -46,12 +46,12 @@ public:
   // Destructor
 
   CosNotifyFilter::FilterFactory_ptr
-  get_ref (CORBA::Environment &ACE_TRY_ENV);
+  get_ref (TAO_ENV_SINGLE_ARG_DECL);
   // Activate with the default POA
 
   virtual CosNotifyFilter::Filter_ptr create_filter (
-    const char * constraint_grammar,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * constraint_grammar
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -60,8 +60,8 @@ public:
 
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (
     const char * constraint_grammar,
-    const CORBA::Any & default_value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & default_value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
index 2b2baf9738b..d91924e58ad 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
@@ -17,8 +17,8 @@ TAO_Notify_Filter_i::TAO_Notify_Filter_i (void)
 // Implementation skeleton destructor
 TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->remove_all_constraints (ACE_TRY_ENV);
+  TAO_ENV_DECLARE_NEW_ENV;
+  this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (TAO_debug_level > 0)
@@ -26,26 +26,26 @@ TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void)
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_Filter_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var my_POA = _default_POA ();
 
   PortableServer::ServantBase_var filter_var (this);
 
   PortableServer::ObjectId_var oid =
-    my_POA->activate_object (this, ACE_TRY_ENV);
+    my_POA->activate_object (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
 
   CORBA::Object_var obj =
-    my_POA->id_to_reference (oid.in (), ACE_TRY_ENV);
+    my_POA->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
 
-  return CosNotifyFilter::Filter::_narrow (obj.in (), ACE_TRY_ENV);
+  return CosNotifyFilter::Filter::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
 }
 
 char*
 TAO_Notify_Filter_i::constraint_grammar (
-    CORBA::Environment & /* ACE_TRY_ENV */
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -57,8 +57,8 @@ TAO_Notify_Filter_i::constraint_grammar (
 
 void
 TAO_Notify_Filter_i::add_constraints_i (
-    const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -81,8 +81,8 @@ TAO_Notify_Filter_i::add_constraints_i (
             constraint_info_seq[index].constraint_expression;
 
           notify_constr_expr->interpreter.
-            build_tree (expr.constraint_expr.in (),
-                        ACE_TRY_ENV);
+            build_tree (expr.constraint_expr.in ()
+                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           notify_constr_expr->constr_expr = expr;
@@ -108,8 +108,8 @@ TAO_Notify_Filter_i::add_constraints_i (
 
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Filter_i::add_constraints (
-    const CosNotifyFilter::ConstraintExpSeq& constraint_list,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotifyFilter::ConstraintExpSeq& constraint_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -144,8 +144,8 @@ TAO_Notify_Filter_i::add_constraints (
                     constraint_expr.in ()));
     }
 
-  this->add_constraints_i (*infoseq,
-                           ACE_TRY_ENV);
+  this->add_constraints_i (*infoseq
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   auto_infoseq.release ();
@@ -156,8 +156,8 @@ TAO_Notify_Filter_i::add_constraints (
 void
 TAO_Notify_Filter_i::modify_constraints (
     const CosNotifyFilter::ConstraintIDSeq & del_list,
-    const CosNotifyFilter::ConstraintInfoSeq & modify_list,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotifyFilter::ConstraintInfoSeq & modify_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -199,8 +199,8 @@ TAO_Notify_Filter_i::modify_constraints (
 
   ACE_TRY
     {
-      this->add_constraints_i (modify_list,
-                               ACE_TRY_ENV);
+      this->add_constraints_i (modify_list
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -239,8 +239,8 @@ TAO_Notify_Filter_i::modify_constraints (
 }
 
 CosNotifyFilter::ConstraintInfoSeq*
-TAO_Notify_Filter_i::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list,
-                                      CORBA::Environment &ACE_TRY_ENV
+TAO_Notify_Filter_i::get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list
+                                      TAO_ENV_ARG_DECL
                                       )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -276,7 +276,7 @@ TAO_Notify_Filter_i::get_constraints (const CosNotifyFilter::ConstraintIDSeq & i
 }
 
 CosNotifyFilter::ConstraintInfoSeq*
-TAO_Notify_Filter_i::get_all_constraints (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -315,7 +315,7 @@ TAO_Notify_Filter_i::get_all_constraints (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_Filter_i::remove_all_constraints (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -336,12 +336,12 @@ TAO_Notify_Filter_i::remove_all_constraints (CORBA::Environment &/*ACE_TRY_ENV*/
 }
 
 void
-TAO_Notify_Filter_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->remove_all_constraints (ACE_TRY_ENV);
+  this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var my_POA = _default_POA ();
@@ -353,8 +353,8 @@ TAO_Notify_Filter_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
@@ -364,8 +364,9 @@ TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */,
 }
 
 CORBA::Boolean
-TAO_Notify_Filter_i::match_structured (const CosNotification::StructuredEvent & filterable_data, CORBA::Environment & //ACE_TRY_ENV
-                                       )
+TAO_Notify_Filter_i::match_structured
+   (const CosNotification::StructuredEvent & filterable_data
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
@@ -390,7 +391,9 @@ TAO_Notify_Filter_i::match_structured (const CosNotification::StructuredEvent &
 }
 
 CORBA::Boolean
-TAO_Notify_Filter_i::match_typed (const CosNotification::PropertySeq & /*filterable_data */,CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_Filter_i::match_typed
+   (const CosNotification::PropertySeq & /*filterable_data */
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
@@ -400,8 +403,9 @@ TAO_Notify_Filter_i::match_typed (const CosNotification::PropertySeq & /*filtera
 }
 
 CosNotifyFilter::CallbackID
-TAO_Notify_Filter_i::attach_callback (CosNotifyComm::NotifySubscribe_ptr /*callback */, CORBA::Environment & ACE_TRY_ENV
-                                      )
+TAO_Notify_Filter_i::attach_callback
+   (CosNotifyComm::NotifySubscribe_ptr /*callback */
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -410,8 +414,8 @@ TAO_Notify_Filter_i::attach_callback (CosNotifyComm::NotifySubscribe_ptr /*callb
 }
 
 void
-TAO_Notify_Filter_i::detach_callback (CosNotifyFilter::CallbackID /*callback*/,
-                                      CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_Filter_i::detach_callback (CosNotifyFilter::CallbackID /*callback*/
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::CallbackNotFound
@@ -421,7 +425,7 @@ TAO_Notify_Filter_i::detach_callback (CosNotifyFilter::CallbackID /*callback*/,
 }
 
 CosNotifyFilter::CallbackIDSeq*
-TAO_Notify_Filter_i::get_callbacks (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Filter_i::get_callbacks (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
index 5656ccf8617..4a6fe16808c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
@@ -53,19 +53,19 @@ public:
   virtual ~TAO_Notify_Filter_i (void);
 
   CosNotifyFilter::Filter_ptr
-  get_ref (CORBA::Environment &ACE_TRY_ENV);
+  get_ref (TAO_ENV_SINGLE_ARG_DECL);
   // Activate with the default POA
 
 virtual char * constraint_grammar (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (
-    const CosNotifyFilter::ConstraintExpSeq & constraint_list,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotifyFilter::ConstraintExpSeq & constraint_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -74,8 +74,8 @@ virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (
 
 virtual void modify_constraints (
     const CosNotifyFilter::ConstraintIDSeq & del_list,
-    const CosNotifyFilter::ConstraintInfoSeq & modify_list,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotifyFilter::ConstraintInfoSeq & modify_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -84,8 +84,8 @@ virtual void modify_constraints (
   ));
 
 virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (
-    const CosNotifyFilter::ConstraintIDSeq & id_list,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotifyFilter::ConstraintIDSeq & id_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -93,29 +93,29 @@ virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (
   ));
 
 virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_all_constraints (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void destroy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CORBA::Boolean match (
-    const CORBA::Any & filterable_data,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & filterable_data
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -123,8 +123,8 @@ virtual CORBA::Boolean match (
   ));
 
 virtual CORBA::Boolean match_structured (
-    const CosNotification::StructuredEvent & filterable_data,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::StructuredEvent & filterable_data
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -132,8 +132,8 @@ virtual CORBA::Boolean match_structured (
   ));
 
 virtual CORBA::Boolean match_typed (
-    const CosNotification::PropertySeq & filterable_data,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::PropertySeq & filterable_data
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -141,16 +141,16 @@ virtual CORBA::Boolean match_typed (
   ));
 
 virtual CosNotifyFilter::CallbackID attach_callback (
-    CosNotifyComm::NotifySubscribe_ptr callback,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyComm::NotifySubscribe_ptr callback
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void detach_callback (
-    CosNotifyFilter::CallbackID callback,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::CallbackID callback
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -158,7 +158,7 @@ virtual void detach_callback (
   ));
 
 virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -167,8 +167,8 @@ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (
 
 private:
   void add_constraints_i (
-    const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp
index e05ab096455..1e75f974275 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp
@@ -26,15 +26,15 @@ TAO_Notify_Listener_Filter_Eval_Command::~TAO_Notify_Listener_Filter_Eval_Comman
 }
 
 int
-TAO_Notify_Listener_Filter_Eval_Command::execute (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Listener_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean result =
-    this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_, ACE_TRY_ENV);
+    this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == 1)
     {
-      this->event_processor_->dispatch_event (this->event_, this->event_listener_, ACE_TRY_ENV);
+      this->event_processor_->dispatch_event (this->event_, this->event_listener_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
index 2424c8db0af..bb15333aaff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
@@ -70,19 +70,19 @@ class  TAO_Notify_Export TAO_Notify_EventListener : virtual public TAO_Notify_Re
   //
 
 public:
-  virtual void dispatch_event (TAO_Notify_Event &event,
-                               CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void dispatch_event (TAO_Notify_Event &event
+                               TAO_ENV_ARG_DECL) = 0;
   // Callback methods to supply the event to the listener.
 
   virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event,
-                                          CORBA::Boolean eval_parent,
-                                          CORBA::Environment &ACE_TRY_ENV) = 0;
+                                          CORBA::Boolean eval_parent
+                                          TAO_ENV_ARG_DECL) = 0;
   // Evaluates true if this event is acceptable by the listener.
   // The <eval_parent> is a hint to the listener to help it determine
   // if its wise to evaluate the parents filter too. This helps in
   // implementing the "interfilter group operator" logic.
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0;
   // Ask the listener to relinquish any bindings and prepare to be
   // disposed.
 
@@ -106,8 +106,8 @@ class TAO_Notify_Export TAO_Notify_EventSource : virtual public TAO_Notify_RefCo
  public:
   // TODO: add a shutdown method to this interface!!
 
-  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event,
-                                          CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event
+                                          TAO_ENV_ARG_DECL) = 0;
   // Evaluates true if this event is acceptable by the Source.
 
   virtual TAO_Notify_Worker_Task* filter_eval_task (void) = 0;
@@ -129,8 +129,8 @@ class TAO_Notify_Export TAO_Notify_UpdateListener : virtual public TAO_Notify_Re
 
  public:
   virtual void dispatch_update (TAO_Notify_EventType_List& added,
-                                TAO_Notify_EventType_List& removed,
-                                CORBA::Environment &ACE_TRY_ENV) = 0;
+                                TAO_Notify_EventType_List& removed
+                                TAO_ENV_ARG_DECL) = 0;
   // Callback method to supply updates.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp
index 275be23fff7..b2f1b14b23d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp
@@ -23,7 +23,7 @@ TAO_Notify_Lookup_Command::~TAO_Notify_Lookup_Command ()
 }
 
 int
-TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 {
   // If the event is *not* the special event
   // send it to the list that matches it.
@@ -42,7 +42,7 @@ TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV)
       if (event_map_->find (this->event_->event_type (),
                            listener_list) == 0)
         {
-          listener_list->for_each (this, ACE_TRY_ENV);
+          listener_list->for_each (this TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
     }
@@ -50,7 +50,7 @@ TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV)
   // if (this->default_subscription_list_->is_empty () == 0)
   // @@ can't do this test - is_empty is not impl.
   {
-    event_map_->default_subscription_list ()->for_each (this, ACE_TRY_ENV);
+    event_map_->default_subscription_list ()->for_each (this TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
   }
 
@@ -58,9 +58,9 @@ TAO_Notify_Lookup_Command::execute (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener
+                                  TAO_ENV_ARG_DECL)
 {
-  this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1, ACE_TRY_ENV);
+  this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 TAO_ENV_ARG_PARAMETER);
   // Note the last parameter, we want the parent filter to be evaluated.
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h
index 6c01563fda3..07a769906e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h
@@ -46,11 +46,11 @@ class TAO_Notify_Export TAO_Notify_Lookup_Command : public TAO_Notify_Command, p
 
   ~TAO_Notify_Lookup_Command ();
 
-  virtual int execute (CORBA::Environment&);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Command callback
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener, CORBA::Environment &ACE_TRY_ENV);
+  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
  protected:
   // = Data member
   TAO_Notify_Event_Map* event_map_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
index 8598e656c6f..4307663f309 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
@@ -49,7 +49,7 @@ TAO_Notify_MT_Worker_Task::init_task (TAO_Notify_AdminProperties* const admin_pr
 }
 
 void
-TAO_Notify_MT_Worker_Task::shutdown (CORBA::Environment& /*ACE_TRY_ENV*/)
+TAO_Notify_MT_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // Put a shutdown message in the task queue and wait here till all
   // threads exit.
@@ -64,8 +64,8 @@ TAO_Notify_MT_Worker_Task::close (u_long)
 
   TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->process_event (mb, ACE_TRY_ENV);
+  TAO_ENV_DECLARE_NEW_ENV;
+  this->process_event (mb TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We can not wait for ourselves to quit
@@ -83,10 +83,10 @@ TAO_Notify_MT_Worker_Task::close (u_long)
 }
 
 int
-TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv)
+TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv)
 {
   // Execute the buffering strategy.
-  this->buffering_strategy_->execute (this->msg_queue (), mb, ACE_TRY_ENV, tv);
+  this->buffering_strategy_->execute (this->msg_queue (), mb TAO_ENV_ARG_PARAMETER, tv);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -122,7 +122,7 @@ TAO_Notify_MT_Worker_Task::svc (void)
               continue;
             }
 
-          int result = command->execute (ACE_TRY_ENV);
+          int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Message_Block::release (mb);
@@ -148,7 +148,7 @@ TAO_Notify_Shutdown_Command::TAO_Notify_Shutdown_Command (void)
 }
 
 int
-TAO_Notify_Shutdown_Command::execute (CORBA::Environment& /*ACE_TRY_ENV*/)
+TAO_Notify_Shutdown_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   return -1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h
index b7927d5acd0..1c5e790e59f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h
@@ -56,10 +56,10 @@ public:
   virtual int init_task (TAO_Notify_AdminProperties* const admin_properties);
   // Init the task
 
-  virtual void shutdown (CORBA::Environment& ACE_TRY_ENV);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // shutdown this task.
 
-  virtual int process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv = 0);
+  virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0);
   // Process the command.
 
  protected:
@@ -97,7 +97,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Command : public TAO_Notify_Command
 
   TAO_Notify_Shutdown_Command (void);
 
-  virtual int execute (CORBA::Environment& ACE_TRY_ENV);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
   // Returns -1. This signals worker threads to finish servicing requests.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h
index f74a05bd8a0..6160260a456 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h
@@ -42,41 +42,41 @@ class TAO_Notify_Export TAO_Notify_POA_Factory : public ACE_Service_Object
   //
  public:
   // = POA creation methods.
-  virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) = 0;
   // Create the POA to activate Event Channels in.
 
-  virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
   // Create the POA to activate SA's in.
 
-  virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
   // Create the POA to activate CA's in.
 
-  virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
   // Create the POA to activate proxy push consumers in.
 
-  virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
   // Create the POA to activate proxy push suppliers in.
 
   // = Object activation and POA methods
-  virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0;
   // Converts <id> to an ObjectId and registers with the POA <poa>.
 
-  virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0;
   // Registers with the POA <poa>.
 
-  virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0;
   // Registers with the POA <poa>.
 
-  virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0;
   // Look for the Object with id <id> in <poa>.
 
-  virtual void destroy_POA (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0;
   // Destroy the <poa>
 
-  virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0;
   // Deactivate the object.
 
-  virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL) = 0;
   // Deactivate the object.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
index 8e392fa0c53..9a6297559b5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
@@ -23,14 +23,14 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::TAO_Notify_ProxyConsumer (TAO_Notify_Sup
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
   this->proxy_id_ = proxy_id;
 
   TAO_Notify_CO_Factory* cof =
     TAO_Notify_Factory::get_channel_objects_factory ();
 
-  this->lock_ = cof->create_proxy_consumer_lock (ACE_TRY_ENV);
+  this->lock_ = cof->create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the task to forward filtering commands to:
@@ -39,7 +39,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
     this->event_manager_->resource_factory ();
 
   this->filter_eval_task_ =
-    event_manager_objects_factory->create_source_eval_task (ACE_TRY_ENV);
+    event_manager_objects_factory->create_source_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -56,8 +56,8 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  this->event_manager_->unregister_from_subscription_updates (this,
-                                                              ACE_TRY_ENV);
+  this->event_manager_->unregister_from_subscription_updates (this
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   delete this->lock_;
@@ -66,7 +66,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void)
   supplier_admin_->_remove_ref ();
 
   // @@: Move this to on_disconnected
-  this->filter_eval_task_->shutdown (ACE_TRY_ENV);
+  this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -76,27 +76,27 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void)
 }
 
 template <class SERVANT_TYPE> CORBA::Boolean
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
 {
   // check if it passes the parent filter.
   CORBA::Boolean bval =
-    this->supplier_admin_->get_filter_admin ().match (event,
-                                                      ACE_TRY_ENV);
+    this->supplier_admin_->get_filter_admin ().match (event
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean ret_val;
 
-  ret_val = this->supplier_admin_->MyOperator (ACE_TRY_ENV);
+  ret_val = this->supplier_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (ret_val == CosNotifyChannelAdmin::AND_OP)
     {
-      ret_val = bval && this->filter_admin_.match (event, ACE_TRY_ENV);
+      ret_val = bval && this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
     {
-      ret_val = bval || this->filter_admin_.match (event, ACE_TRY_ENV);
+      ret_val = bval || this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -110,7 +110,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::filter_eval_task (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get hold of the admin properties.
   TAO_Notify_AdminProperties* const admin_properties =
@@ -123,14 +123,14 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR
       supplier_count->value () >= admin_properties->max_suppliers ())
     ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of suppliers connected.
 
-  this->event_manager_->register_for_subscription_updates (this, ACE_TRY_ENV);
+  this->event_manager_->register_for_subscription_updates (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   (*supplier_count)++;
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // Get hold of the admin properties.
   TAO_Notify_AdminProperties* const admin_properties =
@@ -140,17 +140,17 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (CORBA::Environment &/*A
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
                    ))
 {
-  this->event_manager_->update_publication_list (added, removed, ACE_TRY_ENV);
+  this->event_manager_->update_publication_list (added, removed TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -168,27 +168,27 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChan
     {
       // if updates are currently off, switch them on.
       if (this->updates_on_ == 0)
-        this->event_manager_->register_for_subscription_updates (this,
-                                                                 ACE_TRY_ENV);
+        this->event_manager_->register_for_subscription_updates (this
+                                                                 TAO_ENV_ARG_PARAMETER);
     }
   else
     {
       // if updates are currently on, switch them off.
       if (this->updates_on_ == 1)
-        this->event_manager_->unregister_from_subscription_updates (this,
-                                                                    ACE_TRY_ENV);
+        this->event_manager_->unregister_from_subscription_updates (this
+                                                                    TAO_ENV_ARG_PARAMETER);
     }
 
   return event_type_seq;
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->supplier_admin_->get_ref (ACE_TRY_ENV);
+  return this->supplier_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* TAO_NOTIFY_PROXYCONSUMER_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
index 6cdafeaf614..fec0b60e2f2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
@@ -52,24 +52,24 @@ public:
   virtual ~TAO_Notify_ProxyConsumer (void);
   // Destructor
 
-  void init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment &ACE_TRY_ENV);
+  void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL);
   // Init the Proxy.
 
   // = TAO_Notify_EventSource methods.
-  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
   // Evaluates true if this event is acceptable by the Source.
 
   TAO_Notify_Worker_Task* filter_eval_task (void);
   // The Worker task associated with the event listener for filter evaluation.
 
-  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (CORBA::Environment &ACE_TRY_ENV)
+  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
-    CosNotifyChannelAdmin::ObtainInfoMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ObtainInfoMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -77,8 +77,8 @@ public:
 
 virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::EventTypeSeq & removed
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -87,10 +87,10 @@ virtual void offer_change (
 
 protected:
   // = Helper methods
-  void on_connected (CORBA::Environment &ACE_TRY_ENV);
+  void on_connected (TAO_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their suppliers connect.
 
-  void on_disconnected (CORBA::Environment &ACE_TRY_ENV);
+  void on_disconnected (TAO_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their suppliers disconnect.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp
index f8a77362d7c..009798f4939 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp
@@ -21,7 +21,7 @@ TAO_Notify_ProxyPushConsumer_i::~TAO_Notify_ProxyPushConsumer_i (void)
 }
 
 void
-TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected
@@ -39,7 +39,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup
         CosEventComm::PushSupplier::_duplicate (push_supplier);
 
       this->notify_push_supplier_ =
-        CosNotifyComm::PushSupplier::_narrow (push_supplier, ACE_TRY_ENV);
+        CosNotifyComm::PushSupplier::_narrow (push_supplier TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!CORBA::is_nil (this->notify_push_supplier_.in ()))
@@ -60,7 +60,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup
                             CORBA::INTERNAL ());
         ACE_TRY_CHECK;
 
-        this->on_connected (ACE_TRY_ENV);
+        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -80,7 +80,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup
 }
 
 void
-TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
@@ -93,8 +93,8 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq
 
   ACE_TRY
     {
-      this->notify_push_supplier_->subscription_change (added, removed,
-                                                        ACE_TRY_ENV);
+      this->notify_push_supplier_->subscription_change (added, removed
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -105,7 +105,7 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq
 }
 
 void
-TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -125,7 +125,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data, CORBA::Environmen
 
   TAO_Notify_Any* notify_event = new TAO_Notify_Any(data_copy);
 
-  this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV);
+  this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   notify_event->_decr_refcnt ();
@@ -133,7 +133,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data, CORBA::Environmen
 
 void
 TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -141,10 +141,10 @@ TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer (
 {
   // ask our parent to deactivate us.
   this->supplier_admin_->
-    deactivate_proxy_pushconsumer (this, ACE_TRY_ENV);
+    deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->on_disconnected (ACE_TRY_ENV);
+  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // = TAO_Notify_CosEC_ProxyPushConsumer_i
@@ -161,32 +161,32 @@ TAO_Notify_CosEC_ProxyPushConsumer_i::~TAO_Notify_CosEC_ProxyPushConsumer_i (voi
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::init (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_CosEC_ProxyPushConsumer_i::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Pass the default id.
-  this->notify_proxy_.init (0, ACE_TRY_ENV);
+  this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->notify_proxy_.push (data, ACE_TRY_ENV);
+  this->notify_proxy_.push (data TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->notify_proxy_.disconnect_push_consumer (ACE_TRY_ENV);
+  this->notify_proxy_.disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected))
 {
-  this->notify_proxy_.connect_any_push_supplier (push_supplier, ACE_TRY_ENV);
+  this->notify_proxy_.connect_any_push_supplier (push_supplier TAO_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
index dda47b67941..81c2a6a3d64 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
@@ -55,15 +55,15 @@ public:
   // Destructor
 
   // = Interface methods
-  void push (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV)
+  void push (const CORBA::Any & data TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
                    ));
 
   virtual void connect_any_push_supplier (
-    CosEventComm::PushSupplier_ptr push_supplier,
-    CORBA::Environment &ACE_TRY_ENV
+    CosEventComm::PushSupplier_ptr push_supplier
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -71,7 +71,7 @@ public:
   ));
 
 virtual void disconnect_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -79,7 +79,7 @@ virtual void disconnect_push_consumer (
 
  protected:
 // = Helper methods
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
 
  // = Data members
  CORBA::Boolean notify_style_supplier_;
@@ -113,20 +113,20 @@ public:
   virtual ~TAO_Notify_CosEC_ProxyPushConsumer_i (void);
   // Destructor.
 
-  void init (CORBA::Environment &ACE_TRY_ENV);
+  void init (TAO_ENV_SINGLE_ARG_DECL);
     // init.
 
-  virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void push (const CORBA::Any &data
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the supplier from the event communication.
 
-  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier,
-                                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier
+                                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   // Connects a push supplier.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
index 77dc6a501a0..7c45f284d4c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
@@ -20,24 +20,24 @@ TAO_Notify_ProxyPushSupplier_i::~TAO_Notify_ProxyPushSupplier_i (void)
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      event.do_push (this->cosec_push_consumer_.in (), ACE_TRY_ENV);
+      event.do_push (this->cosec_push_consumer_.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
     {
       ACE_DEBUG ((LM_DEBUG, "Exception dispatching any event\n"));
       // misbehaving client,
-      this->shutdown (ACE_TRY_ENV);  // FUZZ: ignore check_for_ace_check
+      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   ACE_ENDTRY;
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
 {
   {
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
@@ -47,7 +47,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq
 
   ACE_TRY
     {
-      this->notify_push_consumer_->offer_change (added, removed, ACE_TRY_ENV);
+      this->notify_push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -58,7 +58,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -79,7 +79,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon
         CosEventComm::PushConsumer::_duplicate (push_consumer);
 
       this->notify_push_consumer_ =
-        CosNotifyComm::PushConsumer::_narrow (push_consumer, ACE_TRY_ENV);
+        CosNotifyComm::PushConsumer::_narrow (push_consumer TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!CORBA::is_nil (this->notify_push_consumer_.in ()))
@@ -101,7 +101,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon
                             CORBA::INTERNAL ());
         ACE_CHECK;
 
-        this->on_connected (ACE_TRY_ENV);
+        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -117,31 +117,31 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::shutdown_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->on_disconnected (ACE_TRY_ENV);
+  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ask our parent to deactivate us.
   this->consumer_admin_->
-    deactivate_proxy_pushsupplier (this, ACE_TRY_ENV);
+    deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // unregister with CA
-  this->consumer_admin_->unregister_listener (this, ACE_TRY_ENV);
+  this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_i (ACE_TRY_ENV);
+  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Tell the consumer that we're going away ...
   // @@ Later, lookup a "notify_on_disconnect" option.
@@ -153,12 +153,12 @@ TAO_Notify_ProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
       return;
   }
 
-  this->shutdown_i (ACE_TRY_ENV);
+  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
-      this->cosec_push_consumer_->disconnect_push_consumer (ACE_TRY_ENV);
+      this->cosec_push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -181,25 +181,25 @@ TAO_Notify_CosEC_ProxyPushSupplier_i::~TAO_Notify_CosEC_ProxyPushSupplier_i (voi
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier_i::init (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_CosEC_ProxyPushSupplier_i::init (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->notify_proxy_.init (0, ACE_TRY_ENV);
+  this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->notify_proxy_.disconnect_push_supplier (ACE_TRY_ENV);
+  this->notify_proxy_.disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError))
 {
-  this->notify_proxy_.connect_any_push_consumer (push_consumer, ACE_TRY_ENV);
+  this->notify_proxy_.connect_any_push_consumer (push_consumer TAO_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
index c3c6252d93c..97f2fdde840 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
@@ -54,8 +54,8 @@ public:
 
   // = Interface methods
   virtual void connect_any_push_consumer (
-    CosEventComm::PushConsumer_ptr push_consumer,
-    CORBA::Environment &ACE_TRY_ENV
+    CosEventComm::PushConsumer_ptr push_consumer
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -64,23 +64,23 @@ public:
   ));
 
 virtual void disconnect_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown.
 
  protected:
-  void shutdown_i (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown_i (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown
 
- virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV);
+ virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
   // Deliver the event to the consumer.
 
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
   // Deliver the update to the consumer.
 
   // = Data Members.
@@ -114,14 +114,14 @@ public:
   ~TAO_Notify_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  void init (CORBA::Environment &ACE_TRY_ENV);
+  void init (TAO_ENV_SINGLE_ARG_DECL);
   // Init.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Ends the event communication and disposes this object.
 
-  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV)
+  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
index 2fd49c7ce7b..6b0651d1f63 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
@@ -25,9 +25,9 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::TAO_Notify_ProxySupplier (TAO_Notify_Con
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
-  consumer_admin_->_add_ref (ACE_TRY_ENV);
+  consumer_admin_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_id_ = proxy_id;
@@ -35,7 +35,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
   TAO_Notify_CO_Factory* cof =
     TAO_Notify_Factory::get_channel_objects_factory ();
 
-  this->lock_ = cof->create_proxy_supplier_lock (ACE_TRY_ENV);
+  this->lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -43,11 +43,11 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
 
   // Create the task to forward filtering/dispatching commands to:
   this->dispatching_task_ =
-    event_manager_objects_factory->create_dispatching_task (ACE_TRY_ENV);
+    event_manager_objects_factory->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->filter_eval_task_ =
-    event_manager_objects_factory->create_listener_eval_task (ACE_TRY_ENV);
+    event_manager_objects_factory->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -64,8 +64,8 @@ template <class SERVANT_TYPE>
 TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  this->event_manager_->unregister_from_publication_updates (this,
-                                                             ACE_TRY_ENV);
+  this->event_manager_->unregister_from_publication_updates (this
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // unsubscribe it to our current subscriptions.
@@ -76,13 +76,13 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
   added.length (0);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed, ACE_TRY_ENV);
+                                              added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   delete this->lock_;
 
   this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_);
-  consumer_admin_->_remove_ref (ACE_TRY_ENV);
+  consumer_admin_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -93,23 +93,23 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
 }
 
 template <class SERVANT_TYPE> CORBA::Boolean
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL)
 {
   if (eval_parent == 1)
     {
       CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator =
-        consumer_admin_->MyOperator (ACE_TRY_ENV);
+        consumer_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       // Inter-filter group operator.
 
       CORBA::Boolean bval =
-        this->consumer_admin_->get_filter_admin ().match (event, ACE_TRY_ENV);
+        this->consumer_admin_->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if ((bval == 1 && filter_operator == CosNotifyChannelAdmin::AND_OP) ||
           (bval == 0 && filter_operator == CosNotifyChannelAdmin::OR_OP))
         {
-          bval = this->filter_admin_.match (event, ACE_TRY_ENV);
+          bval = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
           return bval;
         }
@@ -119,11 +119,11 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event
         return 0;
     }
   else
-    return this->filter_admin_.match (event, ACE_TRY_ENV);
+    return this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
 {
   if (this->is_connected_ == 0)
     {
@@ -141,7 +141,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event,
       this->event_list_.enqueue_tail (event.clone ());
     }
   else
-    this->dispatch_event_i (event, ACE_TRY_ENV);
+    this->dispatch_event_i (event TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> TAO_Notify_Worker_Task*
@@ -157,7 +157,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::filter_eval_task (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -166,7 +166,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati
   if (this->is_connected_ == 1)
     {
       this->event_manager_->subscribe_for_events (this,
-                                                  added, removed, ACE_TRY_ENV);
+                                                  added, removed TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -182,7 +182,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get hold of the admin properties.
   TAO_Notify_AdminProperties* const admin_properties =
@@ -196,7 +196,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR
     ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected.
 
   // register with CA
-  this->consumer_admin_->register_listener (this, ACE_TRY_ENV);
+  this->consumer_admin_->register_listener (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::EventTypeSeq added;
@@ -210,17 +210,17 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (CORBA::Environment &ACE_TR
   this->subscription_list_.populate (added);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed, ACE_TRY_ENV);
+                                              added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_manager_->register_for_publication_updates (this, ACE_TRY_ENV);
+  this->event_manager_->register_for_publication_updates (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   (*consumer_count)++;
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
@@ -244,18 +244,18 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE
   this->subscription_list_.populate (removed);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed, ACE_TRY_ENV);
+                                              added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_manager_->unregister_from_publication_updates (this, ACE_TRY_ENV);
+  this->event_manager_->unregister_from_publication_updates (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // shutdown the tasks.
 
-  this->dispatching_task_->shutdown (ACE_TRY_ENV);
+  this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->filter_eval_task_->shutdown (ACE_TRY_ENV);
+  this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -266,7 +266,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (CORBA::Environment &ACE
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyInactive,
@@ -277,7 +277,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (CORBA::Environment &
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyActive,
@@ -295,7 +295,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &A
 
     while (this->event_list_.dequeue_head (event) == 0)
       {
-        this->dispatch_event_i (*event, ACE_TRY_ENV);
+        this->dispatch_event_i (*event TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         delete event;
@@ -304,16 +304,16 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (CORBA::Environment &A
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->consumer_admin_->get_ref (ACE_TRY_ENV);
+  return this->consumer_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -323,7 +323,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CORBA::Environment &ACE
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -332,7 +332,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mappin
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -342,7 +342,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CORBA::Environment &ACE
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -351,7 +351,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mappin
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -369,15 +369,15 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAd
     {
       // if updates are currently off, switch them on.
       if (this->updates_on_ == 0)
-        this->event_manager_->register_for_publication_updates (this,
-                                                                ACE_TRY_ENV);
+        this->event_manager_->register_for_publication_updates (this
+                                                                TAO_ENV_ARG_PARAMETER);
     }
   else
     {
       // if updates are currently on, switch them off.
       if (this->updates_on_ == 1)
-        this->event_manager_->unregister_from_publication_updates (this,
-                                                                   ACE_TRY_ENV);
+        this->event_manager_->unregister_from_publication_updates (this
+                                                                   TAO_ENV_ARG_PARAMETER);
     }
   return event_type_seq;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
index a44601f32d6..63c79c3fe72 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
@@ -47,13 +47,13 @@ public:
   virtual ~TAO_Notify_ProxySupplier (void);
   // Destructor
 
-  void init (CosNotifyChannelAdmin::ProxyID myID, CORBA::Environment &ACE_TRY_ENV);
+  void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL);
   // Init the Proxy.
 
   // = Notify_Event_Listener methods
-  virtual void dispatch_event (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV);
+  virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
 
-  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL);
 
   virtual TAO_Notify_Worker_Task* event_dispatch_task (void);
   // The Worker task associated with the event listener for event dispatching
@@ -63,14 +63,14 @@ public:
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void suspend_connection (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -79,7 +79,7 @@ public:
   ));
 
   virtual void resume_connection (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -88,38 +88,38 @@ public:
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void priority_filter (
-    CosNotifyFilter::MappingFilter_ptr priority_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::MappingFilter_ptr priority_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void lifetime_filter (
-    CosNotifyFilter::MappingFilter_ptr lifetime_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::MappingFilter_ptr lifetime_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosNotification::EventTypeSeq * obtain_offered_types (
-    CosNotifyChannelAdmin::ObtainInfoMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ObtainInfoMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -127,8 +127,8 @@ public:
 
   virtual void subscription_change (
     const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::EventTypeSeq & removed
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -137,13 +137,13 @@ public:
 
  protected:
   // = Helper methods
-  virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) = 0;
   // Derived classes should implement this.
 
-  void on_connected (CORBA::Environment &ACE_TRY_ENV);
+  void on_connected (TAO_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their consumers connect.
 
-  void on_disconnected (CORBA::Environment &ACE_TRY_ENV);
+  void on_disconnected (TAO_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their consumers disconnect.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
index a5fdf0e9b87..8baaa806b5b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
@@ -50,19 +50,19 @@ TAO_Notify_Proxy<SERVANT_TYPE>::_decr_refcnt (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (CORBA_Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_incr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (CORBA_Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_decr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL)
 {
   CosNotification::EventTypeSeq added (added_list.size ());
   CosNotification::EventTypeSeq removed (removed_list.size ());
@@ -70,11 +70,11 @@ TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& adde
   added_list.populate (added);
   removed_list.populate (removed);
 
-  this->dispatch_update_i (added, removed, ACE_TRY_ENV);
+  this->dispatch_update_i (added, removed TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ProxyType
-TAO_Notify_Proxy<SERVANT_TYPE>::MyType (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_Proxy<SERVANT_TYPE>::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -83,7 +83,7 @@ TAO_Notify_Proxy<SERVANT_TYPE>::MyType (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
@@ -93,86 +93,86 @@ TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSPr
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
-TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (ACE_TRY_ENV);
+  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos, ACE_TRY_ENV);
+  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy<SERVANT_TYPE>::validate_qos (
     const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out available_qos
+    TAO_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV);
+  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterID
-TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter, ACE_TRY_ENV);
+  return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy<SERVANT_TYPE>::remove_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter, ACE_TRY_ENV);
+  this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr
-TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter, ACE_TRY_ENV);
+  return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
-TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (ACE_TRY_ENV);
+  return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (ACE_TRY_ENV);
+  this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* TAO_NOTIFY_PROXY_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
index fe980a752aa..0a968b0eefa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
@@ -68,14 +68,14 @@ public:
   // Increment and decrement the reference count.
 
   // = The Servant methods
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV);
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV);
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
 
   // = Notify_Update_Listener methods
-  virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list, CORBA::Environment &ACE_TRY_ENV);
+  virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL);
 
   virtual CosNotifyChannelAdmin::ProxyType MyType (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -83,8 +83,8 @@ public:
 
 virtual void validate_event_qos (
     const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out available_qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -92,15 +92,15 @@ virtual void validate_event_qos (
   ));
 
  virtual CosNotification::QoSProperties * get_qos (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void set_qos (
-    const CosNotification::QoSProperties & qos,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::QoSProperties & qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -109,8 +109,8 @@ virtual void set_qos (
 
 virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out available_qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -118,16 +118,16 @@ virtual void validate_qos (
   ));
 
 virtual CosNotifyFilter::FilterID add_filter (
-    CosNotifyFilter::Filter_ptr new_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::Filter_ptr new_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -135,8 +135,8 @@ virtual void remove_filter (
   ));
 
 virtual CosNotifyFilter::Filter_ptr get_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -144,21 +144,21 @@ virtual CosNotifyFilter::Filter_ptr get_filter (
   ));
 
 virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
  protected:
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV) = 0;
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) = 0;
  // Derived types should implement this to deliver the update.
 
  // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
index 01d329da0ba..555f4bee2e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
@@ -26,7 +26,7 @@ TAO_Notify_QoSAdmin_i::~TAO_Notify_QoSAdmin_i (void)
 }
 
 CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos (
-    CORBA::Environment & ///ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
        CORBA::SystemException
@@ -37,8 +37,8 @@ CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos (
 }
 
 void
-TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos,
-    CORBA::Environment & ACE_TRY_ENV
+TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -112,8 +112,8 @@ TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos,
 void
 TAO_Notify_QoSAdmin_i::validate_qos (
     const CosNotification::QoSProperties & /*required_qos*/,
-    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/,
-    CORBA::Environment & //ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
+    TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
index ba4c6b30f2d..fcd0adb9084 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
@@ -44,15 +44,15 @@ public:
   // Destructor
 
   virtual CosNotification::QoSProperties * get_qos (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void set_qos (
-    const CosNotification::QoSProperties & qos,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::QoSProperties & qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -61,8 +61,8 @@ public:
 
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out available_qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp
index 4d006a94b60..391cd38a631 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp
@@ -19,7 +19,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::~TAO_Notify_SequenceProxyPushConsumer_i
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected
@@ -50,7 +50,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif
                             CORBA::INTERNAL ());
         ACE_TRY_CHECK;
 
-        this->on_connected (ACE_TRY_ENV);
+        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -65,12 +65,12 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->push_supplier_->subscription_change (added, removed,
-                                                        ACE_TRY_ENV);
+      this->push_supplier_->subscription_change (added, removed
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -81,7 +81,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::Even
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -106,7 +106,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific
       TAO_Notify_StructuredEvent* notify_event =
         new TAO_Notify_StructuredEvent(notification_copy);
 
-      this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV);
+      this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       notify_event->_decr_refcnt ();
@@ -114,17 +114,17 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // ask our parent to deaactivate us.
   this->supplier_admin_->
-    deactivate_proxy_pushconsumer (this, ACE_TRY_ENV);
+    deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->on_disconnected (ACE_TRY_ENV);
+  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
index 0ae006072e4..c89f90c755f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
@@ -51,8 +51,8 @@ public:
 
   // = interface methods
   virtual void connect_sequence_push_supplier (
-    CosNotifyComm::SequencePushSupplier_ptr push_supplier,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyComm::SequencePushSupplier_ptr push_supplier
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -60,8 +60,8 @@ public:
   ));
 
   virtual void push_structured_events (
-    const CosNotification::EventBatch & notifications,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::EventBatch & notifications
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -69,7 +69,7 @@ public:
   ));
 
   virtual void disconnect_sequence_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -77,7 +77,7 @@ public:
 
 protected:
   // = Helper methods
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
   // Sends updates to the supplier.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp
index 450ac08e61d..90e58bbc9a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp
@@ -18,7 +18,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::~TAO_Notify_SequenceProxyPushSupplier_i
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -50,7 +50,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif
                             CORBA::INTERNAL ());
         ACE_CHECK;
 
-        this->on_connected (ACE_TRY_ENV);
+        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -64,7 +64,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &/*event*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &/*event*/ TAO_ENV_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // Later:
   // Collect events into a sequence till the QoS property
@@ -73,11 +73,11 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &/*ev
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->push_consumer_->offer_change (added, removed, ACE_TRY_ENV);
+      this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -88,22 +88,22 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::Even
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->on_disconnected (ACE_TRY_ENV);
+  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ask our parent to deactivate us.
   this->consumer_admin_->
-    deactivate_proxy_pushsupplier (this, ACE_TRY_ENV);
+    deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
 }
 
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Tell the consumer that we're going away ...
   // @@ Later, lookup a "notify_on_disconnect" option.
@@ -115,12 +115,12 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_EN
       return;
   }
 
-  this->disconnect_sequence_push_supplier (ACE_TRY_ENV);
+  this->disconnect_sequence_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
-      this->push_consumer_->disconnect_sequence_push_consumer (ACE_TRY_ENV);
+      this->push_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
index 2bdc1d164e0..7784b2acaed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
@@ -48,8 +48,8 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Noti
   // Destructor
 
   virtual void connect_sequence_push_consumer (
-    CosNotifyComm::SequencePushConsumer_ptr push_consumer,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyComm::SequencePushConsumer_ptr push_consumer
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -59,24 +59,24 @@ class TAO_Notify_Export TAO_Notify_SequenceProxyPushSupplier_i : public TAO_Noti
 
   // @@ Pradeep: more indentation problems....
   virtual void disconnect_sequence_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown.
 
   // @@ Pradeep: please setup your editor to start 'protected',
   // 'public' and 'private' on the first column
 
  protected:
-  virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV);
+  virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
   // Deliver the event to the consumer.
 
-  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV);
+  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
   // Deliver the update to the consumer.
 
   CosNotifyComm::SequencePushConsumer_var push_consumer_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp
index ee701550b85..48619250ed9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp
@@ -24,16 +24,16 @@ TAO_Notify_Source_Filter_Eval_Command::~TAO_Notify_Source_Filter_Eval_Command ()
 }
 
 int
-TAO_Notify_Source_Filter_Eval_Command::execute (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Source_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean result =
-    this->event_source_->evaluate_filter (*this->event_, ACE_TRY_ENV);
+    this->event_source_->evaluate_filter (*this->event_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == 1)
     {
       this->event_processor_->
-        lookup_subscriptions (this->event_, this->event_source_, ACE_TRY_ENV);
+        lookup_subscriptions (this->event_, this->event_source_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp
index 9d3029e90a6..c5a6f80b12f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp
@@ -19,7 +19,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::~TAO_Notify_StructuredProxyPushConsume
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected
@@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN
                             CORBA::INTERNAL ());
         ACE_TRY_CHECK;
 
-        this->on_connected (ACE_TRY_ENV);
+        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -61,12 +61,12 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->push_supplier_->subscription_change (added, removed,
-                                                        ACE_TRY_ENV);
+      this->push_supplier_->subscription_change (added, removed
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -77,7 +77,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::Ev
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -100,24 +100,24 @@ TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotifi
   TAO_Notify_StructuredEvent* notify_event =
     new TAO_Notify_StructuredEvent (notification_copy);
 
-  this->event_manager_->process_event (notify_event, this, ACE_TRY_ENV);
+  this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   notify_event->_decr_refcnt ();
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // ask our parent to deactivate us.
   this->supplier_admin_->
-    deactivate_proxy_pushconsumer (this, ACE_TRY_ENV);
+    deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->on_disconnected (ACE_TRY_ENV);
+  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
index 9f0a12e3cad..6f166c499e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
@@ -57,8 +57,8 @@ public:
 
   // = interface methods
   virtual void connect_structured_push_supplier (
-    CosNotifyComm::StructuredPushSupplier_ptr push_supplier,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyComm::StructuredPushSupplier_ptr push_supplier
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -66,8 +66,8 @@ public:
   ));
 
 virtual void push_structured_event (
-    const CosNotification::StructuredEvent & notification,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::StructuredEvent & notification
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -75,7 +75,7 @@ virtual void push_structured_event (
   ));
 
   virtual void disconnect_structured_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -83,7 +83,7 @@ virtual void push_structured_event (
 
 protected:
   // = Helper methods
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
   // dispatch updates to the supplier.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp
index 5f09e0ec93d..ab811b694d9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp
@@ -18,7 +18,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::~TAO_Notify_StructuredProxyPushSupplie
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -53,7 +53,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN
                             CORBA::INTERNAL ());
         ACE_CHECK;
 
-        this->on_connected (ACE_TRY_ENV);
+        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -70,28 +70,28 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      event.do_push (this->push_consumer_.in (), ACE_TRY_ENV);
+      event.do_push (this->push_consumer_.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
     {
       ACE_DEBUG ((LM_DEBUG, "Exception dispatching structured event\n"));
-      // misbehaving client, 
-      this->shutdown (ACE_TRY_ENV);  // FUZZ: ignore check_for_ace_check
+      // misbehaving client,
+      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);  // FUZZ: ignore check_for_ace_check
     }
   ACE_ENDTRY;
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->push_consumer_->offer_change (added, removed, ACE_TRY_ENV);
+      this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -104,31 +104,31 @@ TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::Ev
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->on_disconnected (ACE_TRY_ENV);
+  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ask our parent to deactivate us.
   this->consumer_admin_->
-    deactivate_proxy_pushsupplier (this, ACE_TRY_ENV);
+    deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // unregister with CA
-  this->consumer_admin_->unregister_listener (this, ACE_TRY_ENV);
+  this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_i (ACE_TRY_ENV);
+  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Tell the consumer that we're going away ...
   // @@ Later, lookup a "notify_on_disconnect" option.
@@ -140,12 +140,12 @@ TAO_Notify_StructuredProxyPushSupplier_i::shutdown (CORBA::Environment &ACE_TRY_
       return;
   }
 
-  this->shutdown_i (ACE_TRY_ENV);
+  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
-      this->push_consumer_->disconnect_structured_push_consumer (ACE_TRY_ENV);
+      this->push_consumer_->disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
index f3d62fb03b0..0e578846a02 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
@@ -53,8 +53,8 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No
   // Destructor
 
   virtual void connect_structured_push_consumer (
-    CosNotifyComm::StructuredPushConsumer_ptr push_consumer,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyComm::StructuredPushConsumer_ptr push_consumer
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -63,24 +63,24 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No
   ));
 
   virtual void disconnect_structured_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown.
 
  protected:
   // = Helper methods
-  void shutdown_i (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown_i (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown
 
-  virtual void dispatch_event_i (TAO_Notify_Event &event, CORBA::Environment &ACE_TRY_ENV);
+  virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
   // Deliver the event to the consumer.
 
-  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed, CORBA::Environment &ACE_TRY_ENV);
+  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
   // Deliver the update to the consumer.
 
   // = Data Members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
index 91a1cd6bca8..59bf538b2a3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
@@ -34,7 +34,7 @@ TAO_Notify_SupplierAdmin_i::~TAO_Notify_SupplierAdmin_i ()
     ACE_DEBUG ((LM_DEBUG,"in SA dtor\n"));
   // Cleanup all resources..
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   delete this->lock_;
 
@@ -51,8 +51,8 @@ TAO_Notify_SupplierAdmin_i::proxy_pushconsumer_destroyed (CosNotifyChannelAdmin:
 void
 TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
                                   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator,
-                                  PortableServer::POA_ptr my_POA,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  PortableServer::POA_ptr my_POA
+                                  TAO_ENV_ARG_DECL)
 {
   this->my_POA_ = PortableServer::POA::_duplicate (my_POA);
 
@@ -62,12 +62,12 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
   this->poa_factory_ = TAO_Notify_Factory::get_poa_factory ();
 
   this->lock_ = this->channel_objects_factory_->
-    create_supplier_admin_lock (ACE_TRY_ENV);
+    create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_pushconsumer_POA_ = this->poa_factory_->
-    create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id,
-                                   ACE_TRY_ENV);
+    create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   my_id_ = my_id;
@@ -75,14 +75,14 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_SupplierAdmin_i::get_ref (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
   // @@ Pradeep: if you get a chance to quantify this stuff you will
   // notice that this is a very expensive operation, you may want to
   // cache the result if it is invoked very often...
 
   CORBA::Object_var obj = this->poa_factory_->
-    servant_to_reference (this->my_POA_.in (), this, ACE_TRY_ENV);
+    servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ());
@@ -104,15 +104,15 @@ TAO_Notify_SupplierAdmin_i::get_filter_admin (void)
 }
 
 void
-TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant TAO_ENV_ARG_DECL)
 {
   this->poa_factory_->
-    deactivate_object (servant, this->proxy_pushconsumer_POA_.in (),
-                       ACE_TRY_ENV);
+    deactivate_object (servant, this->proxy_pushconsumer_POA_.in ()
+                       TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_SupplierAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -121,16 +121,16 @@ TAO_Notify_SupplierAdmin_i::MyID (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_SupplierAdmin_i::MyChannel (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return event_channel_->get_ref (ACE_TRY_ENV);
+  return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_SupplierAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -139,7 +139,7 @@ TAO_Notify_SupplierAdmin_i::MyOperator (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin_i::push_consumers (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -148,11 +148,11 @@ TAO_Notify_SupplierAdmin_i::push_consumers (CORBA::Environment &ACE_TRY_ENV)
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return this->proxy_pushconsumer_ids_.get_sequence (ACE_TRY_ENV);
+  return this->proxy_pushconsumer_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ProxyNotFound
@@ -160,75 +160,75 @@ TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID p
 {
   CORBA::Object_var obj =
     this->poa_factory_->id_to_reference (proxy_id,
-                                         proxy_pushconsumer_POA_.in (),
-                                         ACE_TRY_ENV);
+                                         proxy_pushconsumer_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
 
   return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushConsumer_i* seq_proxy_pushconsumer =
-    this->channel_objects_factory_->create_seq_proxy_pushconsumer (this,
-                                                                   ACE_TRY_ENV);
+    this->channel_objects_factory_->create_seq_proxy_pushconsumer (this
+                                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushconsumer_var (seq_proxy_pushconsumer);
 
-  seq_proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV);
+  seq_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushconsumer_POA_.in (),
-                             seq_proxy_pushconsumer,
-                             ACE_TRY_ENV);
+                             seq_proxy_pushconsumer
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushConsumer_i* struct_proxy_pushconsumer =
-    this->channel_objects_factory_->create_struct_proxy_pushconsumer (this,
-                                                                      ACE_TRY_ENV);
+    this->channel_objects_factory_->create_struct_proxy_pushconsumer (this
+                                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushconsumer_var (struct_proxy_pushconsumer);
 
-  struct_proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV);
+  struct_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushconsumer_POA_.in (),
-                             struct_proxy_pushconsumer,
-                             ACE_TRY_ENV);
+                             struct_proxy_pushconsumer
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushConsumer_i* proxy_pushconsumer =
-    this->channel_objects_factory_->create_proxy_pushconsumer (this,
-                                                               ACE_TRY_ENV);
+    this->channel_objects_factory_->create_proxy_pushconsumer (this
+                                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushconsumer_var (proxy_pushconsumer);
 
-  proxy_pushconsumer->init (proxy_id, ACE_TRY_ENV);
+  proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushconsumer_POA_.in (),
-                             proxy_pushconsumer,
-                             ACE_TRY_ENV);
+                             proxy_pushconsumer
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminLimitExceeded
@@ -248,23 +248,23 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
-        obj = this->obtain_proxy_pushconsumer_i (proxy_id, ACE_TRY_ENV);
+        obj = this->obtain_proxy_pushconsumer_i (proxy_id TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
       }
       break;
 
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
-        obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id,
-                                                        ACE_TRY_ENV);
+        obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id
+                                                        TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
       }
       break;
 
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
-        obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id,
-                                                          ACE_TRY_ENV);
+        obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id
+                                                          TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
       }
       break;
@@ -275,114 +275,114 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA
     }
 
   this->proxy_pushconsumer_ids_.next (); // commit the current id.
-  return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in (),
-                                                        ACE_TRY_ENV);
+  return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destory_child_POAs_ = 1;
   if (this->destory_child_POAs_ == 1)
-    this->poa_factory_->destroy_POA (this->proxy_pushconsumer_POA_.in (),
-                                     ACE_TRY_ENV);
+    this->poa_factory_->destroy_POA (this->proxy_pushconsumer_POA_.in ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate ourselves
-  this->poa_factory_->deactivate_object (this, this->my_POA_.in (),
-                                         ACE_TRY_ENV);
+  this->poa_factory_->deactivate_object (this, this->my_POA_.in ()
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_SupplierAdmin_i::get_qos (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (ACE_TRY_ENV);
+  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos, ACE_TRY_ENV);
+  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos, ACE_TRY_ENV);
+  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
                    ))
 {
   this->get_event_manager ()->update_publication_list (added,
-                                                       removed, ACE_TRY_ENV);
+                                                       removed TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter, ACE_TRY_ENV);
+  return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter, ACE_TRY_ENV);
+  this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter, ACE_TRY_ENV);
+  return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_SupplierAdmin_i::get_all_filters (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (ACE_TRY_ENV);
+  return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::remove_all_filters (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (ACE_TRY_ENV);
+  this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -395,14 +395,14 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_EN
 
   PortableServer::ServantBase_var proxy_var (cosec_proxy);
 
-  cosec_proxy->init (ACE_TRY_ENV);
+  cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ());
 
   PortableServer::POA_var def_poa =
     this->event_channel_->get_default_POA ();
 
   CORBA::Object_var obj = this->poa_factory_->
-    activate_object (def_poa.in (), cosec_proxy, ACE_TRY_ENV);
+    activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ());
 
   return CosEventChannelAdmin::ProxyPushConsumer::_narrow (obj.in ());
@@ -410,7 +410,7 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment& ACE_TRY_EN
 
 // = Pull Methods.
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin_i::pull_consumers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -423,7 +423,7 @@ TAO_Notify_SupplierAdmin_i::pull_consumers (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminLimitExceeded
@@ -434,7 +434,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelA
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
index 2d0adaf19d0..0bf4940fbb9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
@@ -63,8 +63,8 @@ public:
 
   void init (CosNotifyChannelAdmin::AdminID myID,
              CosNotifyChannelAdmin::InterFilterGroupOperator myOperator,
-             PortableServer::POA_ptr my_POA,
-             CORBA::Environment &ACE_TRY_ENV);
+             PortableServer::POA_ptr my_POA
+             TAO_ENV_ARG_DECL);
   //Initialize the Supplier Admin.
 
   // @@ Pradeep: could this method be const?  Try to use const
@@ -72,8 +72,8 @@ public:
   TAO_Notify_FilterAdmin_i& get_filter_admin (void);
   // Get our filter admin.
 
-  void deactivate_proxy_pushconsumer (PortableServer::Servant servant,
-                                      CORBA::Environment &ACE_TRY_ENV);
+  void deactivate_proxy_pushconsumer (PortableServer::Servant servant
+                                      TAO_ENV_ARG_DECL);
   // Deactivate servant from <proxy_pushconsumer_POA_>.
 
   void proxy_pushconsumer_destroyed (CosNotifyChannelAdmin::ProxyID proxyID);
@@ -81,13 +81,13 @@ public:
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::AdminID MyID (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
-  CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (CORBA::Environment &ACE_TRY_ENV);
+  CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
   // Return the CORBA object for this servant.
 
   TAO_Notify_Event_Manager* get_event_manager (void);
@@ -96,36 +96,36 @@ public:
   // @@ Pradeep: Don't forget to indent this stuff, at the very least
   // it should not start in the first column!
   virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-      CORBA::Environment &ACE_TRY_ENV
+      TAO_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
 virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
-    CosNotifyChannelAdmin::ProxyID proxy_id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ProxyID proxy_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -134,8 +134,8 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
 
 virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID_out proxy_id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ProxyID_out proxy_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -144,8 +144,8 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consum
 
 virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer (
     CosNotifyChannelAdmin::ClientType ctype,
-    CosNotifyChannelAdmin::ProxyID_out proxy_id,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyChannelAdmin::ProxyID_out proxy_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -153,22 +153,22 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consum
   ));
 
 virtual void destroy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotification::QoSProperties * get_qos (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void set_qos (
-    const CosNotification::QoSProperties & qos,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::QoSProperties & qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -177,8 +177,8 @@ virtual void set_qos (
 
 virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotification::NamedPropertyRangeSeq_out available_qos
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -187,8 +187,8 @@ virtual void validate_qos (
 
 virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed,
-    CORBA::Environment &ACE_TRY_ENV
+    const CosNotification::EventTypeSeq & removed
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -196,16 +196,16 @@ virtual void offer_change (
   ));
 
 virtual CosNotifyFilter::FilterID add_filter (
-    CosNotifyFilter::Filter_ptr new_filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::Filter_ptr new_filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -213,8 +213,8 @@ virtual void remove_filter (
   ));
 
 virtual CosNotifyFilter::Filter_ptr get_filter (
-    CosNotifyFilter::FilterID filter,
-    CORBA::Environment &ACE_TRY_ENV
+    CosNotifyFilter::FilterID filter
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -222,28 +222,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter (
   ));
 
 virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_all_filters (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -251,13 +251,13 @@ virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
 
 protected:
   // = Helper methods
-  CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
   // Obtain a proxy pushconsumer object
 
-  CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
   // Obtain a structured proxy pushconsumer object.
 
-  CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id, CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
   // Obtain a sequence pushconsumer object
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp
index 0a94673baa2..bd6586314b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp
@@ -22,10 +22,10 @@ TAO_Notify_Update_Dispatch_Command::~TAO_Notify_Update_Dispatch_Command ()
 }
 
 int
-TAO_Notify_Update_Dispatch_Command::execute (CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Update_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->update_listener_->dispatch_update (this->added_, this->removed_,
-                                           ACE_TRY_ENV);
+  this->update_listener_->dispatch_update (this->added_, this->removed_
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp
index e973b1c2fc0..d17cd92c9ee 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp
@@ -20,14 +20,14 @@ TAO_Notify_Worker_Task::init_task (TAO_Notify_AdminProperties* const)
 }
 
 void
-TAO_Notify_Worker_Task::shutdown (CORBA::Environment&)
+TAO_Notify_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
 int
-TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value * /*tv*/)
+TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value * /*tv*/)
 {
-  int result = mb->execute (ACE_TRY_ENV);
+  int result = mb->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_Message_Block::release (mb);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
index bcc3c2aba92..9145232c6c5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
@@ -52,10 +52,10 @@ public:
   virtual int init_task (TAO_Notify_AdminProperties* const admin_properties);
   // Init the task
 
-  virtual void shutdown (CORBA::Environment& ACE_TRY_ENV);
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // shutdown this task.
 
-  virtual int process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv = 0);
+  virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0);
   // Process the command.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 82f8d825146..8a2eee3b877 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -98,7 +98,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
 // things.
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySet.
@@ -109,7 +109,7 @@ TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV)
   size_t cur_len = this->propertyset_products_.length ();
   this->propertyset_products_.length (cur_len + 1);
   this->propertyset_products_[cur_len] = new_set;
-  return new_set->_this (ACE_TRY_ENV);
+  return new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Allows a client to create a new TAO_PropertySet with specific
@@ -117,8 +117,8 @@ TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV)
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                                        const CosPropertyService::Properties &allowed_properties,
-                                                        CORBA::Environment &ACE_TRY_ENV)
+                                                        const CosPropertyService::Properties &allowed_properties
+                                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
@@ -130,8 +130,8 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       // New a TAO_PropertySet using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (allowed_property_types,
-                                       allowed_properties,
-                                       ACE_TRY_ENV),
+                                       allowed_properties
+                                       TAO_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -141,7 +141,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       this->propertyset_products_[products_len] = new_set;
 
       // All done.
-      propset_ptr = new_set->_this (ACE_TRY_ENV);
+      propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
@@ -170,8 +170,8 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
 // constraints. "All the properties will have *fixed-normal* modes".
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
-                                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties
+                                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -182,8 +182,8 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
     {
       // New a TAO_PropertySet.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySet (initial_properties,
-                                       ACE_TRY_ENV),
+                      TAO_PropertySet (initial_properties
+                                       TAO_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -193,7 +193,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
       this->propertyset_products_[products_len] = new_set;
 
       // All done.
-      propset_ptr = new_set->_this (ACE_TRY_ENV);
+      propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
@@ -241,7 +241,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 // delete all these New'ed things.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySetDef.
@@ -254,7 +254,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_EN
   this->propertysetdef_products_[cur_len] = new_set;
 
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr =
-    new_set->_this (ACE_TRY_ENV);
+    new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return propsetdef_ptr;
@@ -262,8 +262,8 @@ TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_EN
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                                              const CosPropertyService::PropertyDefs &allowed_property_defs,
-                                                              CORBA::Environment &ACE_TRY_ENV)
+                                                              const CosPropertyService::PropertyDefs &allowed_property_defs
+                                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
@@ -275,8 +275,8 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       // New a TAO_PropertySetDef using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (allowed_property_types,
-                                          allowed_property_defs,
-                                          ACE_TRY_ENV),
+                                          allowed_property_defs
+                                          TAO_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -286,7 +286,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       this->propertysetdef_products_[products_len] = new_set;
 
       // All done. Return the pointer.
-      propsetdef_ptr = new_set->_this (ACE_TRY_ENV);
+      propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
@@ -315,8 +315,8 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
 // initital constraints.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
-                                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
+                                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -327,8 +327,8 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
     {
       // New a TAO_PropertySet using these lengths.
       ACE_NEW_RETURN (new_set,
-                      TAO_PropertySetDef (initial_property_defs,
-                                          ACE_TRY_ENV),
+                      TAO_PropertySetDef (initial_property_defs
+                                          TAO_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -338,7 +338,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
       this->propertysetdef_products_[products_len] = new_set;
 
       // All done.
-      propsetdef_ptr = new_set->_this (ACE_TRY_ENV);
+      propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
@@ -378,8 +378,8 @@ TAO_PropertySet::TAO_PropertySet (void)
 
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CosPropertyService::Properties allowed_properties,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      const CosPropertyService::Properties allowed_properties
+                                      TAO_ENV_ARG_DECL)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (allowed_properties.length ())
 {
@@ -396,8 +396,8 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
   // Define the allowed properties in the hash table.
   ACE_TRY
     {
-      this->define_properties (allowed_properties,
-                               ACE_TRY_ENV);
+      this->define_properties (allowed_properties
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -413,8 +413,8 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
 // allowed properties' sequence withe just the maximum length.
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CORBA::ULong number_of_allowed_properties,
-                                      CORBA::Environment &)
+                                      const CORBA::ULong number_of_allowed_properties
+                                      TAO_ENV_ARG_DECL_NOT_USED)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (number_of_allowed_properties)
 {
@@ -424,15 +424,15 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
 // properies with *normal* modes.
 
 
-TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties
+                                  TAO_ENV_ARG_DECL)
 {
   // Define all the initial properties in the Property Set. All take
   // *normal* modes.
   ACE_TRY
     {
-      this->define_properties (initial_properties,
-                               ACE_TRY_ENV);
+      this->define_properties (initial_properties
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -460,8 +460,8 @@ TAO_PropertySet::~TAO_PropertySet (void)
 
 void
 TAO_PropertySet::define_property (const char *property_name,
-                                  const CORBA::Any &property_value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const CORBA::Any &property_value
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -544,7 +544,7 @@ TAO_PropertySet::define_property (const char *property_name,
 CORBA::Boolean
 TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // If the sequence is empty, no constraints.
   if (this->allowed_property_types_.length () == 0)
@@ -558,8 +558,8 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
     {
       ACE_TRY
         {
-          ret_val = this->allowed_property_types_[ti]->equal (type,
-                                                              ACE_TRY_ENV);
+          ret_val = this->allowed_property_types_[ti]->equal (type
+                                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (ret_val == 1)
@@ -607,8 +607,8 @@ TAO_PropertySet::is_property_allowed (const char* property_name)
 
 
 void
-TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -624,8 +624,8 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
         {
           // Define this property.
           this->define_property (nproperties [pi].property_name.in (),
-                                 nproperties [pi].property_value,
-                                 ACE_TRY_ENV);
+                                 nproperties [pi].property_value
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
@@ -691,7 +691,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
 
 CORBA::ULong
-TAO_PropertySet::get_number_of_properties (CORBA::Environment &)
+TAO_PropertySet::get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->hash_table_.current_size ();
@@ -706,8 +706,8 @@ TAO_PropertySet::get_number_of_properties (CORBA::Environment &)
 void
 TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
                                              CosPropertyService::PropertyNames_out property_names,
-                                             CosPropertyService::PropertyNamesIterator_out rest,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             CosPropertyService::PropertyNamesIterator_out rest
+                                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocating storage is a must.
@@ -715,7 +715,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
            CosPropertyService::PropertyNames);
 
   size_t num_of_properties =
-    this->get_number_of_properties (ACE_TRY_ENV);
+    this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (num_of_properties == 0)
@@ -773,13 +773,13 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
       // Get the Interface ptr.
       CosPropertyService::PropertyNamesIterator_ptr iterator_ptr =
-        names_iterator->_this (ACE_TRY_ENV);
+        names_iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // POA stuff todo here, since we have <destroy> method in the
       // <NamesIterator> interface.
       // Give ownership of this servant to the POA.
-      names_iterator->_remove_ref (ACE_TRY_ENV);
+      names_iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Init the out parameter.
@@ -791,8 +791,8 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
 
 CORBA::Any *
-TAO_PropertySet::get_property_value (const char *property_name,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet::get_property_value (const char *property_name
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -828,8 +828,8 @@ TAO_PropertySet::get_property_value (const char *property_name,
 
 CORBA::Boolean
 TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
-                                 CosPropertyService::Properties_out nproperties,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CosPropertyService::Properties_out nproperties
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -852,8 +852,8 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
 
   for (size_t i = 0; i < n; i++)
     {
-      any_ptr = get_property_value (property_names [i],
-                                    ACE_TRY_ENV);
+      any_ptr = get_property_value (property_names [i]
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (any_ptr != 0)
@@ -884,8 +884,8 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
 void
 TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
                                      CosPropertyService::Properties_out nproperties,
-                                     CosPropertyService::PropertiesIterator_out rest,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CosPropertyService::PropertiesIterator_out rest
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -960,13 +960,13 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
       // Get the interface ptr.
       CosPropertyService::PropertiesIterator_ptr iterator_ptr =
-        iterator->_this (ACE_TRY_ENV);
+        iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // POA stuff todo here, since we have <destroy> method in the
       // <NamesIterator> interface.
       // Give ownership of this servant to the POA.
-      iterator->_remove_ref (ACE_TRY_ENV);
+      iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Init the out parameter.
@@ -978,8 +978,8 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
 
 void
-TAO_PropertySet::delete_property (const char *property_name,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet::delete_property (const char *property_name
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName,
@@ -1018,8 +1018,8 @@ TAO_PropertySet::delete_property (const char *property_name,
 
 
 void
-TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1036,8 +1036,8 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
       ACE_TRY
         {
           // Delete this property.
-          this->delete_property (property_names[pi],
-                                 ACE_TRY_ENV);
+          this->delete_property (property_names[pi]
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
@@ -1089,7 +1089,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
 
 CORBA::Boolean
-TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get all the property names in a names' sequence.
@@ -1101,13 +1101,13 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
   CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr);
   CosPropertyService::PropertyNamesIterator_var iter;
 
-  CORBA::ULong size = this->get_number_of_properties (ACE_TRY_ENV);
+  CORBA::ULong size = this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   this->get_all_property_names (size,
                                 names_out,
-                                iter_out,
-                                ACE_TRY_ENV);
+                                iter_out
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the out values on to the var varibles.
@@ -1115,8 +1115,8 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
   iter = iter_out.ptr ();
 
   // Delete all these properties.
-  this->delete_properties (names.in (),
-                           ACE_TRY_ENV);
+  this->delete_properties (names.in ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // All properties deleted.
@@ -1127,8 +1127,8 @@ TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
 
 
 CORBA::Boolean
-TAO_PropertySet::is_property_defined (const char *property_name,
-                                      CORBA::Environment &)
+TAO_PropertySet::is_property_defined (const char *property_name
+                                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName))
 {
@@ -1158,11 +1158,11 @@ TAO_PropertySetDef::TAO_PropertySetDef (void)
 // Constructor that the factory uses.
 
 TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
-                                        const CosPropertyService::PropertyDefs allowed_property_defs,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const CosPropertyService::PropertyDefs allowed_property_defs
+                                        TAO_ENV_ARG_DECL)
   : TAO_PropertySet(allowed_property_types,
-                    allowed_property_defs.length (),
-                    ACE_TRY_ENV)
+                    allowed_property_defs.length ()
+                    TAO_ENV_ARG_PARAMETER)
 {
   // Set the length of the allowed property names.
   this->allowed_property_names_.length (allowed_property_defs.length ());
@@ -1175,8 +1175,8 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
   // Define the allowed properties in the hash table.
   ACE_TRY
     {
-      this->define_properties_with_modes (allowed_property_defs,
-                                          ACE_TRY_ENV);
+      this->define_properties_with_modes (allowed_property_defs
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1189,11 +1189,11 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
 
 // Constructor that the factory uses.
 
-TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
+                                        TAO_ENV_ARG_DECL)
 {
-  this->define_properties_with_modes (initial_property_defs,
-                                      ACE_TRY_ENV);
+  this->define_properties_with_modes (initial_property_defs
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1205,8 +1205,8 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void)
 
 // Return the sequence that is there in side.
 void
-TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
-                                                CORBA::Environment &)
+TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
+                                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Copy contents of the sequence.
@@ -1215,8 +1215,8 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType
 }
 
 void
-TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
-                                            CORBA::Environment &)
+TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
+                                            TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We have all the names, get the values and the modes from the Hash
@@ -1239,8 +1239,8 @@ TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out
 void
 TAO_PropertySetDef::define_property_with_mode (const char *property_name,
                                                const CORBA::Any &property_value,
-                                               CosPropertyService::PropertyModeType property_mode,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               CosPropertyService::PropertyModeType property_mode
+                                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -1321,8 +1321,8 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 // Define one by one. If any excceptions raised, build
 // MultipleExceptions sequence and raise that.
 void
-TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
+                                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1340,8 +1340,8 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           // Define the property.
           this->define_property_with_mode (property_defs[i].property_name,
                                            property_defs[i].property_value,
-                                           property_defs[i].property_mode,
-                                           ACE_TRY_ENV);
+                                           property_defs[i].property_mode
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
@@ -1414,8 +1414,8 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
 // Get the mode of a property. Raises InvalidpropertyName,
 // PropertyNotFound exceptions.
 CosPropertyService::PropertyModeType
-TAO_PropertySetDef::get_property_mode (const char *property_name,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetDef::get_property_mode (const char *property_name
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -1452,8 +1452,8 @@ TAO_PropertySetDef::get_property_mode (const char *property_name,
 // Nil or no, before doing something with it.
 CORBA::Boolean
 TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                        CosPropertyService::PropertyModes_out property_modes,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CosPropertyService::PropertyModes_out property_modes
+                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1480,8 +1480,8 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
       ACE_TRY
         {
           // Invoke get_property_mode for this name.
-          mode = this->get_property_mode (property_names[i],
-                                          ACE_TRY_ENV);
+          mode = this->get_property_mode (property_names[i]
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Store the mode in the out sequence.
@@ -1512,8 +1512,8 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
 // "Fixed-Readonly" to anything is *not* possible.
 void
 TAO_PropertySetDef::set_property_mode (const char *property_name,
-                                       CosPropertyService::PropertyModeType property_mode,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CosPropertyService::PropertyModeType property_mode
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::PropertyNotFound,
@@ -1606,8 +1606,8 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 // sequence and return.
 
 void
-TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes
+                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1623,8 +1623,8 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
       ACE_TRY
         {
           this->set_property_mode (property_modes[i].property_name,
-                                   property_modes[i].property_mode,
-                                   ACE_TRY_ENV);
+                                   property_modes[i].property_mode
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
@@ -1689,7 +1689,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
 // one exists.
 
 void
-TAO_PropertyNamesIterator::reset (CORBA::Environment &)
+TAO_PropertyNamesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
@@ -1701,8 +1701,8 @@ TAO_PropertyNamesIterator::reset (CORBA::Environment &)
 // iterator.
 
 CORBA::Boolean
-TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name,
-                                     CORBA::Environment &)
+TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name
+                                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1720,8 +1720,8 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name,
 
 CORBA::Boolean
 TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
-                                   CosPropertyService::PropertyNames_out property_names,
-                                   CORBA::Environment &)
+                                   CosPropertyService::PropertyNames_out property_names
+                                   TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1754,22 +1754,22 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertyNamesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertyNamesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
   // on this servant are complete.
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1785,15 +1785,15 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
 }
 
 void
-TAO_PropertiesIterator::reset (CORBA::Environment &)
+TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
 }
 
 CORBA::Boolean
-TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty,
-                                  CORBA::Environment &)
+TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty
+                                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1815,8 +1815,8 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty,
 
 CORBA::Boolean
 TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
-                                CosPropertyService::Properties_out nproperties,
-                                CORBA::Environment &)
+                                CosPropertyService::Properties_out nproperties
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1857,22 +1857,22 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertiesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertiesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
   // on this servant are complete.
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index fcb5d0550f1..2e55d30489e 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -126,26 +126,23 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (CORBA::Environment &ACE_TRY_ENV =
-		                         TAO_default_environment ())
+  create_propertyset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a  new TAO_PropertySet object. "The property set returned
   // will *not* have any initial properties."
 
   virtual CosPropertyService::PropertySet_ptr
   create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                  const CosPropertyService::Properties &allowed_properties,
-                                  CORBA::Environment &ACE_TRY_ENV = 
-				                     TAO_default_environment())
+                                  const CosPropertyService::Properties &allowed_properties
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
     // Allows a client to create a new TAO_PropertySet with specific
     // constraints. "All the properties will have *fixed-normal* modes".
 
   virtual CosPropertyService::PropertySet_ptr
-  create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
-                              CORBA::Environment &ACE_TRY_ENV =
-			                         TAO_default_environment() )
+  create_initial_propertyset (const CosPropertyService::Properties &initial_properties
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySet with specific
@@ -182,24 +179,22 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new TAO_PropertySetDef object.
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
-                                     const CosPropertyService::PropertyDefs &allowed_property_defs,
-                                     CORBA::Environment &ACE_TRY_ENV =
-				                         TAO_default_environment())
+                                     const CosPropertyService::PropertyDefs &allowed_property_defs
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
   // Allows a client to create a new TAO_PropertySetDef with specific
   // constraints.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
-                                 CORBA::Environment &ACE_TRY_ENV =
-				                    TAO_default_environment() )
+  create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySetDef with specific
@@ -231,29 +226,25 @@ public:
   // Default constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CosPropertyService::Properties allowed_properties,
-                   CORBA::Environment &ACE_TRY_ENV =
-		                      TAO_default_environment() );
+                   const CosPropertyService::Properties allowed_properties
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Init values that the PropertySetFactory will want to specify.
 
-  TAO_PropertySet (const CosPropertyService::Properties initial_properties,
-                   CORBA::Environment &ACE_TRY_ENV =
-		                      TAO_default_environment() );
+  TAO_PropertySet (const CosPropertyService::Properties initial_properties
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // PropertySetFactory needs this constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                   const CORBA::ULong number_of_allowed_propertydefs,
-                   CORBA::Environment &ACE_TRY_ENV =
-		                       TAO_default_environment() );
+                   const CORBA::ULong number_of_allowed_propertydefs
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // PropertySetDef's construction needs this.
 
   virtual ~TAO_PropertySet (void);
   // Destructor function.
 
   virtual void define_property (const char *property_name,
-                                const CORBA::Any &property_value,
-                                CORBA::Environment &ACE_TRY_ENV =
-				       TAO_default_environment() )
+                                const CORBA::Any &property_value
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -264,75 +255,67 @@ public:
   // Store the property in the hash after checking for validity of the
   // property name, duplicate name, type code over writing etc.
 
-  virtual void define_properties (const CosPropertyService::Properties &nproperties,
-                                  CORBA::Environment &ACE_TRY_ENV =
-				         TAO_default_environment() )
+  virtual void define_properties (const CosPropertyService::Properties &nproperties
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (CORBA::Environment &ACE_TRY_ENV =
-		                                 TAO_default_environment() )
+  virtual CORBA::ULong get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the number of properties that are currently defined in the
   // PropertySet.
 
   virtual void get_all_property_names (CORBA::ULong how_many,
                                        CosPropertyService::PropertyNames_out property_names,
-                                       CosPropertyService::PropertyNamesIterator_out rest,
-                                       CORBA::Environment &ACE_TRY_ENV =
-				                TAO_default_environment() )
+                                       CosPropertyService::PropertyNamesIterator_out rest
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the names of all the properties that are currently defined in
   // the property set.
 
-  virtual CORBA::Any *get_property_value (const char *property_name,
-                                          CORBA::Environment &ACE_TRY_ENV =
-					  TAO_default_environment() )
+  virtual CORBA::Any *get_property_value (const char *property_name
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
   // Get the value of the property, given the name.
 
   virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
-                                         CosPropertyService::Properties_out nproperties,
-                                         CORBA::Environment &ACE_TRY_ENV =
-					       TAO_default_environment() )
+                                         CosPropertyService::Properties_out nproperties
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get all names and their property values.
 
   virtual void get_all_properties (CORBA::ULong how_many,
                                    CosPropertyService::Properties_out nproperties,
-                                   CosPropertyService::PropertiesIterator_out rest,
-                                   CORBA::Environment &ACE_TRY_ENV =
-				            TAO_default_environment() )
+                                   CosPropertyService::PropertiesIterator_out rest
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns all of the property names currently defined in the
   // PropertySet. If the PropertySet contains more than how_many
   // property names, then the remaining property names are put into the PropertyNamesIterator.
 
-  virtual void delete_property (const char *property_name,
-                                CORBA::Environment &ACE_TRY_ENV =
-				     TAO_default_environment() )
+  virtual void delete_property (const char *property_name
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::FixedProperty));
   // Delete a property given a name.
 
-  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                  CORBA::Environment &ACE_TRY_ENV = 
-				  TAO_default_environment())
+  virtual void delete_properties (const CosPropertyService::PropertyNames &property_names
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual CORBA::Boolean delete_all_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Delete everything from this property set.
 
-  virtual CORBA::Boolean is_property_defined (const char *property_name,
-                                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual CORBA::Boolean is_property_defined (const char *property_name
+                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName));
   // Tell whether this property is defined or no. Forget about the
@@ -398,19 +381,19 @@ public:
   // Constructor.
 
   TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
-                      const CosPropertyService::PropertyDefs allowed_property,
-                      CORBA::Environment &_env);
+                      const CosPropertyService::PropertyDefs allowed_property
+                      TAO_ENV_ARG_DECL);
   // The factory uses this constructor.
 
-  TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs,
-                      CORBA::Environment &_env);
+  TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
+                      TAO_ENV_ARG_DECL);
   // This is also for the factory.
 
   virtual ~TAO_PropertySetDef (void);
   // Destructor.
 
-  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types,
-                                           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
+                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Indicates which types of properties are supported by this
   // PropertySet. If the output sequence is empty, then there is no
@@ -418,8 +401,8 @@ public:
   // field of a Property in this PropertySet, unless the
   // get_allowed_properties output sequence is not empty.
 
-  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs,
-                                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Indicates which properties are supported by this PropertySet. If
@@ -429,8 +412,8 @@ public:
 
   virtual void define_property_with_mode (const char *property_name,
                                           const CORBA::Any &property_value,
-                                          CosPropertyService::PropertyModeType property_mode,
-                                          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+                                          CosPropertyService::PropertyModeType property_mode
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -446,15 +429,15 @@ public:
   // PropertySet. If type or mode is violated, ConflictingProperty
   // exception is thrown.
 
-  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // This operation will modify or add each of the properties in the
   // Properties parameter to the PropertySet.
 
-  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name,
-                                                                  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name
+                                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
@@ -462,8 +445,8 @@ public:
   // PropertyNotFound exceptions.
 
   virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
-                                             CosPropertyService::PropertyModes_out property_modes,
-                                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+                                             CosPropertyService::PropertyModes_out property_modes
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Batch operation for getting the property. Invoke
   // get_property_mode for each name.  Return value False indicates
@@ -474,8 +457,8 @@ public:
   // doing something with it.
 
   virtual void set_property_mode (const char *property_name,
-                                  CosPropertyService::PropertyModeType property_mode,
-                                  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+                                  CosPropertyService::PropertyModeType property_mode
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::PropertyNotFound,
@@ -491,8 +474,8 @@ public:
   // all illegal set_mode attempts, UnsupportedMode exception is
   // raised.
 
-  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Batch operation for setting the property. Raises
@@ -522,13 +505,13 @@ public:
   virtual ~TAO_PropertyNamesIterator (void);
   // Destructor.
 
-  virtual void reset (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
-  virtual CORBA::Boolean next_one (CORBA::String_out property_name,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual CORBA::Boolean next_one (CORBA::String_out property_name
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -536,8 +519,8 @@ public:
 
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::PropertyNames_out property_names,
-                                 CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+                                 CosPropertyService::PropertyNames_out property_names
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -545,7 +528,7 @@ public:
   // with at most the how_many number of names. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys the iterator.
 private:
@@ -585,12 +568,12 @@ public:
   virtual ~TAO_PropertiesIterator (void);
   // Destructor.
 
-  virtual void reset (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Resets the position in an iterator to the first property, if one exists.
 
-  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -598,8 +581,8 @@ public:
   // iterator.
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::Properties_out nproperties,
-                                 CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+                                 CosPropertyService::Properties_out nproperties
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -607,7 +590,7 @@ public:
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp
index 03686e655bc..66a03582d03 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp
@@ -23,13 +23,11 @@ TAO_LB_ReplicaLocator::preinvoke (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   if (this->load_balancer_ == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   CORBA::Object_var replica =
-    this->load_balancer_->replica (ACE_TRY_ENV);
+    this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Throw a forward exception to force the client to redirect its
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
index 8dc15cbde74..bfc9d025ba7 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
@@ -22,8 +22,8 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void)
 }
 
 void
-TAO_LB_ReplicaProxy::current_load (CORBA::Float load,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_ReplicaProxy::current_load (CORBA::Float load
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama: this is the point were the load dampening should
@@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load,
   this->current_load_ = load;
   // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load));
 
-  this->balancer_->load_changed (this, ACE_TRY_ENV);
+  this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                    CORBA::SystemException))
 {
@@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->connected_)
     {
-      this->balancer_->disconnect (this, ACE_TRY_ENV);
+      this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->connected_ = 0;
@@ -63,8 +63,8 @@ TAO_LB_ReplicaProxy::disconnect (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
                               LoadBalancing::ReplicaControl_ptr control,
-                              CORBA::Object_ptr replica,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Object_ptr replica
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
index a4f60a41a06..9eb629ea29f 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
+++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
@@ -54,8 +54,8 @@ public:
   CORBA::Object_ptr replica (void);
   // Return a reference to the Replica.
 
-  virtual void current_load (CORBA::Float load,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void current_load (CORBA::Float load
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send the value of the current load on the Object being load
   // balanced, where the definition of "load" is load balancing
@@ -69,7 +69,7 @@ public:
   // without affecting the client, or detect rapid raises in load and
   // react proactively to those...
 
-  virtual void disconnect (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                      CORBA::SystemException));
   // Send a request to disconnect from the LoadBalancer.
@@ -92,8 +92,8 @@ private:
 
   void connect (TAO_LB_LoadBalancer *balancer,
                 LoadBalancing::ReplicaControl_ptr control,
-                CORBA::Object_ptr replica,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Object_ptr replica
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 5fd8f5a9e17..1faa1a245f8 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -28,8 +28,8 @@ ACE_Runtime_Scheduler (int config_count,
 // it's not present.
 
 RtecScheduler::handle_t
-ACE_Runtime_Scheduler::create (const char *entry_point,
-                               CORBA::Environment &)
+ACE_Runtime_Scheduler::create (const char *entry_point
+                               TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -47,19 +47,19 @@ ACE_Runtime_Scheduler::create (const char *entry_point,
 // value if it's not present.
 
 RtecScheduler::handle_t
-ACE_Runtime_Scheduler::lookup (const char * entry_point,
-                               CORBA::Environment &ACE_TRY_ENV)
+ACE_Runtime_Scheduler::lookup (const char * entry_point
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return create (entry_point, ACE_TRY_ENV);
+  return create (entry_point TAO_ENV_ARG_PARAMETER);
 }
 
 
 // Return a pointer to the RT_Info corresponding to the passed handle.
 
 RtecScheduler::RT_Info *
-ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
-                            CORBA::Environment &ACE_TRY_ENV)
+ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle
+                            TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -109,8 +109,8 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
                                  RtecScheduler::Importance_t importance,
                                  RtecScheduler::Quantum_t quantum,
                                  CORBA::Long threads,
-                                 RtecScheduler::Info_Type_t info_type,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 RtecScheduler::Info_Type_t info_type
+                                 TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -146,8 +146,8 @@ void
 ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::OS_Priority& o_priority,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                 RtecScheduler::Preemption_Priority_t& p_priority,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 RtecScheduler::Preemption_Priority_t& p_priority
+                                 TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -169,23 +169,23 @@ void
 ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::OS_Priority& priority,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                             RtecScheduler::Preemption_Priority_t& p_priority,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             RtecScheduler::Preemption_Priority_t& p_priority
+                                             TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
-  RtecScheduler::handle_t handle = lookup (entry_point, ACE_TRY_ENV);
+  RtecScheduler::handle_t handle = lookup (entry_point TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (handle < -1)
-    // The exception was thrown or is in ACE_TRY_ENV already.
+    // The exception was thrown or is in TAO_ENV_SINGLE_ARG_PARAMETER already.
     return;
   this->priority (handle,
                   priority,
                   subpriority,
-                  p_priority,
-                  ACE_TRY_ENV);
+                  p_priority
+                  TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -196,8 +196,8 @@ void
 ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        RtecScheduler::handle_t /* dependency */,
                                        CORBA::Long /* number_of_calls */,
-                                       RtecScheduler::Dependency_Type_t /* dependency_type */,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       RtecScheduler::Dependency_Type_t /* dependency_type */
+                                       TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -231,8 +231,8 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
                                            CORBA::Long /* maximum_priority */,
                                            RtecScheduler::RT_Info_Set_out /* infos */,
                                            RtecScheduler::Config_Info_Set_out /* configs */,
-                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */,
-                                           CORBA::Environment &)
+                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */
+                                           TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -250,8 +250,8 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
 void
 ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                RtecScheduler::OS_Priority& priority,
-                                               RtecScheduler::Dispatching_Type_t & d_type,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               RtecScheduler::Dispatching_Type_t & d_type
+                                               TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -284,7 +284,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 // to the number returned, inclusive.
 
 RtecScheduler::Preemption_Priority_t
-ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV)
+ACE_Runtime_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 411f6064363..61c7f6de038 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -39,22 +39,22 @@ public:
                          ACE_Scheduler_Factory::POD_RT_Info rt_info[]);
   // Constructor. Initialize the data from the POD_RT_Info array.
 
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-                                          CORBA::Environment &_env)
+  virtual RtecScheduler::handle_t create (const char * entry_point
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME));
   // Create an RT_Info.  In the config run scheduler this actually constructs
   // a new RT_Info.  Here, we just return its handle, or an error value if
   // it's not present.
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-                                          CORBA::Environment &_env)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-                                       CORBA::Environment &_env)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Return a pointer to the RT_Info corresponding to the passed handle.
@@ -68,8 +68,8 @@ public:
                     RtecScheduler::Importance_t importance,
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type,
-                    CORBA::Environment &_env)
+                    RtecScheduler::Info_Type_t info_type
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Set characteristics of the RT_Info corresponding to the passed handle.
@@ -77,8 +77,8 @@ public:
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority,
-                         CORBA::Environment &_env)
+                         RtecScheduler::Preemption_Priority_t& p_priority
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -88,8 +88,8 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority,
-                                     CORBA::Environment &_env)
+                                     RtecScheduler::Preemption_Priority_t& p_priority
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -99,8 +99,8 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type,
-                               CORBA::Environment &_env)
+                               RtecScheduler::Dependency_Type_t dependency_type
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the config run scheduler, this method registers a dependency between
@@ -110,8 +110,8 @@ public:
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                                   CORBA::Environment &_env)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -122,14 +122,14 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type,
-                                       CORBA::Environment &_env)
+                                       RtecScheduler::Dispatching_Type_t & d_type
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // Provides the thread priority and queue type for the given priority level.
 
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index 6f7eb803a6b..5742ba7d84f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -118,8 +118,8 @@ TAO_IIOP_SSL_Connector::close (void)
 int
 TAO_IIOP_SSL_Connector::connect (
   TAO_GIOP_Invocation *invocation,
-  TAO_Transport_Descriptor_Interface *desc,
-  CORBA::Environment &)
+  TAO_Transport_Descriptor_Interface *desc
+  TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index 29cdb1686a6..e4e999675f5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -52,8 +52,8 @@ public:
   int open (TAO_ORB_Core *orb_core);
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
-               TAO_Transport_Descriptor_Interface *desc,
-               CORBA::Environment &ACE_TRY_ENV);
+               TAO_Transport_Descriptor_Interface *desc
+               TAO_ENV_ARG_DECL);
 
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 06d86ea2d2a..e76a2a69a44 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -123,8 +123,8 @@ TAO_SSLIOP_Connector::close (void)
 
 int
 TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
-                               TAO_Transport_Descriptor_Interface *desc,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               TAO_Transport_Descriptor_Interface *desc
+                               TAO_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -150,13 +150,13 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
   // Check if the user overrode the default establishment of trust
   // policy for the current object.
   CORBA::Policy_var policy =
-    invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy,
-                                     ACE_TRY_ENV);
+    invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   SecurityLevel2::EstablishTrustPolicy_var trust_policy =
-    SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in (),
-                                                   ACE_TRY_ENV);
+    SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We use a pointer and temporary to make it obvious to determine
@@ -167,7 +167,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
   Security::EstablishTrust tmp_trust = { 0 , 0 };
   if (!CORBA::is_nil (trust_policy.in ()))
     {
-      tmp_trust = trust_policy->trust (ACE_TRY_ENV);
+      tmp_trust = trust_policy->trust (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       trust = &tmp_trust;
@@ -196,13 +196,13 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
 
   // Check if the user overrode the default Quality-of-Protection for
   // the current object.
-  policy = invocation->stub ()->get_policy (Security::SecQOPPolicy,
-                                            ACE_TRY_ENV);
+  policy = invocation->stub ()->get_policy (Security::SecQOPPolicy
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   SecurityLevel2::QOPPolicy_var qop_policy =
-    SecurityLevel2::QOPPolicy::_narrow (policy.in (),
-                                        ACE_TRY_ENV);
+    SecurityLevel2::QOPPolicy::_narrow (policy.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Temporary variable used to avoid overwriting the default value
@@ -211,7 +211,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
 
   if (!CORBA::is_nil (qop_policy.in ()))
     {
-      Security::QOP qop = qop_policy->qop (ACE_TRY_ENV);
+      Security::QOP qop = qop_policy->qop (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (qop == Security::SecQOPNoProtection)
@@ -251,8 +251,8 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
           int result = this->ssliop_connect (ssl_endpoint,
                                              trust,
                                              invocation,
-                                             desc,
-                                             ACE_TRY_ENV);
+                                             desc
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           if (result != 0)
@@ -260,15 +260,15 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
         }
 
       return this->iiop_connect (ssl_endpoint,
-                                 invocation,
-                                 ACE_TRY_ENV);
+                                 invocation
+                                 TAO_ENV_ARG_PARAMETER);
     }
 
   return this->ssliop_connect (ssl_endpoint,
                                trust,
                                invocation,
-                               desc,
-                               ACE_TRY_ENV);
+                               desc
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -291,7 +291,7 @@ TAO_SSLIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SSLIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV)
+TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -314,8 +314,8 @@ TAO_SSLIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV)
 
 int
 TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
-                                    TAO_GIOP_Invocation *invocation,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    TAO_GIOP_Invocation *invocation
+                                    TAO_ENV_ARG_DECL)
 {
   const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();
 
@@ -349,16 +349,16 @@ TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
 
   // Note that the IIOP-only transport descriptor is used!
   return this->TAO_IIOP_SSL_Connector::connect (invocation,
-                                                &iiop_desc,
-                                                ACE_TRY_ENV);
+                                                &iiop_desc
+                                                TAO_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
                                       Security::EstablishTrust *trust,
                                       TAO_GIOP_Invocation *invocation,
-                                      TAO_Transport_Descriptor_Interface *desc,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      TAO_Transport_Descriptor_Interface *desc
+                                      TAO_ENV_ARG_DECL)
 {
   TAO_Transport *&transport = invocation->transport ();
   ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 9b3d1e64315..5c11930cfc4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -58,8 +58,8 @@ public:
   virtual int open (TAO_ORB_Core *orb_core);
   virtual int close (void);
   virtual int connect (TAO_GIOP_Invocation *invocation,
-                       TAO_Transport_Descriptor_Interface *desc,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       TAO_Transport_Descriptor_Interface *desc
+                       TAO_ENV_ARG_DECL);
   virtual TAO_Profile *create_profile (TAO_InputCDR& cdr);
   //@}
 
@@ -70,22 +70,22 @@ protected:
    *
    * Please check the documentation in Pluggable.h.
    */
-  virtual TAO_Profile * make_profile (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL);
 
   /// IIOP-specific connection establishment.
   /**
    * @note The IIOP endpoint is extracted from the SSLIOP endpoint.
    */
   int iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
-                    TAO_GIOP_Invocation *invocation,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    TAO_GIOP_Invocation *invocation
+                    TAO_ENV_ARG_DECL);
 
   /// SSLIOP-specific connection establishment.
   int ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
                       Security::EstablishTrust *trust,
                       TAO_GIOP_Invocation *invocation,
-                      TAO_Transport_Descriptor_Interface *desc,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      TAO_Transport_Descriptor_Interface *desc
+                      TAO_ENV_ARG_DECL);
 
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 2a27a9d3476..896c4041c50 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -29,7 +29,7 @@ TAO_SSLIOP_Current::~TAO_SSLIOP_Current (void)
 
 SSLIOP::ASN_1_Cert *
 TAO_SSLIOP_Current::get_peer_certificate (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -63,7 +63,7 @@ TAO_SSLIOP_Current::get_peer_certificate (
 
 SSLIOP::SSL_Cert *
 TAO_SSLIOP_Current::get_peer_certificate_chain (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -96,7 +96,7 @@ TAO_SSLIOP_Current::get_peer_certificate_chain (
 }
 
 CORBA::Boolean
-TAO_SSLIOP_Current::no_context (CORBA::Environment &)
+TAO_SSLIOP_Current::no_context (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (this->implementation () == 0 ? 1 : 0);
@@ -131,16 +131,16 @@ TAO_SSLIOP_Current::teardown (TAO_SSLIOP_Current_Impl *prev_impl,
 
 TAO_SSLIOP_Current_ptr
 TAO_SSLIOP_Current::_narrow (
-  CORBA::Object_ptr obj,
-  CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr obj
+  TAO_ENV_ARG_DECL)
 {
-  return TAO_SSLIOP_Current::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return TAO_SSLIOP_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_SSLIOP_Current_ptr
 TAO_SSLIOP_Current::_unchecked_narrow (
-  CORBA::Object_ptr obj,
-  CORBA::Environment &)
+  CORBA::Object_ptr obj
+  TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return TAO_SSLIOP_Current::_nil ();
@@ -246,11 +246,11 @@ tao_TAO_SSLIOP_Current_nil (
 
 TAO_SSLIOP_Current_ptr
 tao_TAO_SSLIOP_Current_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO_SSLIOP_Current::_narrow (p, ACE_TRY_ENV);
+  return TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -374,11 +374,11 @@ TAO_SSLIOP_Current_var::tao_nil (void)
 
 ::TAO_SSLIOP_Current_ptr
 TAO_SSLIOP_Current_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::TAO_SSLIOP_Current::_narrow (p, ACE_TRY_ENV);
+  return ::TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index afdedfac893..7c27bf20d1d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -63,7 +63,7 @@ public:
   /// Return the peer certificate associated with the current
   /// request.
   virtual SSLIOP::ASN_1_Cert * get_peer_certificate (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      SSLIOP::Current::NoContext));
 
@@ -75,7 +75,7 @@ public:
   /// certficate.  However, the certificate chain on the server side
   /// does NOT contain the peer (client) certificate.
   virtual SSLIOP::SSL_Cert * get_peer_certificate_chain (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      SSLIOP::Current::NoContext));
 
@@ -84,7 +84,7 @@ public:
   /// means of determining whether or not SSL session state is
   /// available.
   virtual CORBA::Boolean no_context (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the TSS slot ID assigned to this object.
@@ -117,16 +117,14 @@ public:
   static TAO_SSLIOP_Current_ptr _duplicate (TAO_SSLIOP_Current_ptr obj);
 
   static TAO_SSLIOP_Current_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static TAO_SSLIOP_Current_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static TAO_SSLIOP_Current_ptr _nil (void)
     {
@@ -198,8 +196,8 @@ public:
   static void tao_release (TAO_SSLIOP_Current_ptr);
   static TAO_SSLIOP_Current_ptr tao_nil (void);
   static TAO_SSLIOP_Current_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index 81912bd200e..cfcb9edebab 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -21,8 +21,8 @@ TAO_SSLIOP_Current_Impl::~TAO_SSLIOP_Current_Impl (void)
 
 Security::AttributeList *
 TAO_SSLIOP_Current_Impl::get_attributes (
-    const Security::AttributeTypeList &attributes,
-    CORBA::Environment &ACE_TRY_ENV)
+    const Security::AttributeTypeList &attributes
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong len = attributes.length ();
@@ -129,7 +129,7 @@ TAO_SSLIOP_Current_Impl::get_attributes (
 
 SecurityLevel2::ReceivedCredentials_ptr
 TAO_SSLIOP_Current_Impl::received_credentials (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index 1db58a68033..db6de036f3d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -49,14 +49,14 @@ public:
   /// SSLIOP-specific version of the
   /// SecurityLevel1::Current::get_attributes() method.
   virtual Security::AttributeList * get_attributes (
-      const Security::AttributeTypeList &attributes,
-    CORBA::Environment &ACE_TRY_ENV)
+      const Security::AttributeTypeList &attributes
+    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// SSLIOP-specific version of the
   /// SecurityLevel2::Current::received_credentials() method.
   virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the SSL peer certificate associated with the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index be2dac6c7fb..ddba949a6b3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -165,7 +165,7 @@ TAO_SSLIOP_Protocol_Factory::init (int argc,
 int
 TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // @todo: This hard-coding should be fixed once SECIOP is
@@ -183,8 +183,8 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void)
 
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the SSLIOP ORB initializer.
@@ -201,8 +201,8 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void)
       //PortableInterceptor::ORBInitializer_var initializer = tmp;
       initializer = tmp;
 
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 7959cc18bfd..56ced5f918f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -46,8 +46,6 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   // The current upcall is not being performed through an SSL
   // connection.  If server is configured to disallow insecure
   // invocations then throw a CORBA::NO_PERMISSION exception.
@@ -58,7 +56,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
   //          accept or reject requests on a per-object basis
   //          instead on a per-endpoint basis.
   CORBA::Boolean no_ssl =
-    this->ssliop_current_->no_context (ACE_TRY_ENV);
+    this->ssliop_current_->no_context (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (no_ssl && this->no_protection_ == 0)
@@ -72,7 +70,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
       // exception.  Otherwise, it will return a DER encoded X509
       // certificate.
       SSLIOP::ASN_1_Cert_var cert =
-        this->ssliop_current_->get_peer_certificate (ACE_TRY_ENV);
+        this->ssliop_current_->get_peer_certificate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ The following debugging code works but I don't think that
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 121b72f975f..e570784bbad 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -30,11 +30,9 @@ TAO_SSLIOP_ORBInitializer::pre_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info,
-                              ACE_TRY_ENV);
+    TAO_ORBInitInfo::_narrow (info
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
@@ -64,8 +62,8 @@ TAO_SSLIOP_ORBInitializer::pre_init (
 
   // Register the SSLIOP::Current object reference with the ORB.
   info->register_initial_reference ("SSLIOPCurrent",
-                                    ssliop_current.in (),
-                                    ACE_TRY_ENV);
+                                    ssliop_current.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -75,8 +73,6 @@ TAO_SSLIOP_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   // Note we do not store the SSLIOP::Current as a class member since
   // we need to avoid potential problems where the same
   // SSLIOP::Current object is shared between ORBs.  Each ORB should
@@ -88,11 +84,11 @@ TAO_SSLIOP_ORBInitializer::post_init (
   // pre_init() method.
 
   CORBA::Object_var obj =
-    info->resolve_initial_references ("SSLIOPCurrent", ACE_TRY_ENV);
+    info->resolve_initial_references ("SSLIOPCurrent" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   SSLIOP::Current_var ssliop_current =
-    SSLIOP::Current::_narrow (obj.in (), ACE_TRY_ENV);
+    SSLIOP::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (ssliop_current.in ()))
@@ -103,7 +99,7 @@ TAO_SSLIOP_ORBInitializer::post_init (
 
       if (tao_current != 0)
         {
-          size_t slot = this->get_tss_slot_id (info, ACE_TRY_ENV);
+          size_t slot = this->get_tss_slot_id (info TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           tao_current->tss_slot (slot);
@@ -131,26 +127,26 @@ TAO_SSLIOP_ORBInitializer::post_init (
 
   // Register the SSLIOP secure invocation server request interceptor
   // with the ORB.
-  info->add_server_request_interceptor (si_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (si_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 size_t
 TAO_SSLIOP_ORBInitializer::get_tss_slot_id (
-  PortableInterceptor::ORBInitInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
   // Obtain the Security Service TSS slot ID from the SecurityCurrent
   // object.
   CORBA::Object_var obj =
-    info->resolve_initial_references ("SecurityCurrent",
-                                      ACE_TRY_ENV);
+    info->resolve_initial_references ("SecurityCurrent"
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   SecurityLevel2::Current_var current =
-    SecurityLevel2::Current::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+    SecurityLevel2::Current::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Security_Current *security_current =
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 9820576dc41..85df8334ac2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -62,8 +62,8 @@ private:
 
   // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object.
   size_t get_tss_slot_id (
-    PortableInterceptor::ORBInitInfo_ptr info,
-    CORBA::Environment &ACE_TRY_ENV);
+    PortableInterceptor::ORBInitInfo_ptr info
+    TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 5da641d7c2f..17f3c2aa201 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -19,7 +19,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core,
                                       TAO_IIOP_Properties *tcp_properties,
                                       TAO_SSLIOP_Connection_Handler_State &s)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Go straight to the object_ref_table in the ORB Core to avoid
@@ -28,21 +28,21 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core,
       // (happens on the client side).
       CORBA::Object_var obj =
         orb_core->object_ref_table ().resolve_initial_references (
-          "SSLIOPCurrent",
-          ACE_TRY_ENV);
+          "SSLIOPCurrent"
+          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SSLIOP::Current_var current =
-        SSLIOP::Current::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+        SSLIOP::Current::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (current.in ()))
         ACE_TRY_THROW (CORBA::INV_OBJREF ());
 
       TAO_SSLIOP_Current_var tao_current =
-        TAO_SSLIOP_Current::_narrow (current.in (),
-                                     ACE_TRY_ENV);
+        TAO_SSLIOP_Current::_narrow (current.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (tao_current.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index bafa3df4aaa..8fdf9cde9ee 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -33,8 +33,8 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::create (const char * entry_point,
-                              CORBA::Environment &)
+ACE_Config_Scheduler::create (const char * entry_point
+                              TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -85,8 +85,8 @@ ACE_Config_Scheduler::create (const char * entry_point,
 }
 
 RtecScheduler::handle_t
-ACE_Config_Scheduler::lookup (const char * entry_point,
-                              CORBA::Environment &)
+ACE_Config_Scheduler::lookup (const char * entry_point
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -107,8 +107,8 @@ ACE_Config_Scheduler::lookup (const char * entry_point,
 }
 
 RtecScheduler::RT_Info*
-ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
-                           CORBA::Environment &)
+ACE_Config_Scheduler::get (RtecScheduler::handle_t handle
+                           TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -143,8 +143,8 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 RtecScheduler::Importance_t importance,
                                 RtecScheduler::Quantum_t quantum,
                                 CORBA::Long threads,
-                                RtecScheduler::Info_Type_t info_type,
-                                CORBA::Environment &)
+                                RtecScheduler::Info_Type_t info_type
+                                TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -175,14 +175,12 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
 void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority,
-                                     CORBA::Environment &TAO_IN_ENV)
+                                     RtecScheduler::Preemption_Priority_t& p_priority
+                                     TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
-  ACE_UNUSED_ARG (TAO_IN_ENV);
-
   if (impl->priority (handle, priority, p_subpriority, p_priority) == -1)
     {
       ACE_ERROR ((LM_ERROR,
@@ -194,28 +192,26 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
 void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::OS_Priority& priority,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                                 RtecScheduler::Preemption_Priority_t& p_priority,
-                                                 CORBA::Environment &TAO_IN_ENV)
+                                                 RtecScheduler::Preemption_Priority_t& p_priority
+                                                 TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED))
 {
-  this->priority (lookup (entry_point, TAO_IN_ENV),
-                  priority, p_subpriority, p_priority,
-                  TAO_IN_ENV);
+  this->priority (lookup (entry_point TAO_ENV_ARG_PARAMETER),
+                  priority, p_subpriority, p_priority
+                  TAO_ENV_ARG_PARAMETER);
 }
 
 void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::handle_t dependency,
                                            CORBA::Long number_of_calls,
                                            RtecScheduler::Dependency_Type_t
-                                             dependency_type,
-                                           CORBA::Environment &TAO_IN_ENV)
+                                             dependency_type
+                                           TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
-  ACE_UNUSED_ARG (TAO_IN_ENV);
-
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->lookup_rt_info (handle, rt_info))
     {
@@ -247,15 +243,13 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                CORBA::Long maximum_priority,
                                                RtecScheduler::RT_Info_Set_out infos,
                                                RtecScheduler::Config_Info_Set_out configs,
-                                               RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                                               CORBA::Environment &TAO_IN_ENV)
+                                               RtecScheduler::Scheduling_Anomaly_Set_out anomalies
+                                               TAO_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                       RtecScheduler::TASK_COUNT_MISMATCH))
 {
-  ACE_UNUSED_ARG (TAO_IN_ENV);
-
   // Initialize the scheduler implementation.
   impl->init (minimum_priority, maximum_priority);
 
@@ -450,14 +444,12 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 
 void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                    RtecScheduler::OS_Priority& priority,
-                                                   RtecScheduler::Dispatching_Type_t & d_type,
-                                                   CORBA::Environment &TAO_IN_ENV)
+                                                   RtecScheduler::Dispatching_Type_t & d_type
+                                                   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
-  ACE_UNUSED_ARG (TAO_IN_ENV);
-
   if (impl->dispatch_configuration (p_priority, priority, d_type) == -1)
     {
       ACE_ERROR ((LM_ERROR,
@@ -470,12 +462,10 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 
 RtecScheduler::Preemption_Priority_t
-ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
+ACE_Config_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
-  ACE_UNUSED_ARG (TAO_IN_ENV);
-
   RtecScheduler::Preemption_Priority_t priority = impl->minimum_priority_queue ();
 
   if (priority < 0)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index aca68a7f3e5..ab2efe18810 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -36,16 +36,16 @@ public:
   ACE_Config_Scheduler (void);
   virtual ~ACE_Config_Scheduler (void);
 
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-                                          CORBA::Environment &_env)
+  virtual RtecScheduler::handle_t create (const char * entry_point
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-                                          CORBA::Environment &_env)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-                                       CORBA::Environment &_env)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
@@ -57,15 +57,15 @@ public:
                     RtecScheduler::Importance_t importance,
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type,
-                    CORBA::Environment &_env)
+                    RtecScheduler::Info_Type_t info_type
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority,
-                         CORBA::Environment &_env)
+                         RtecScheduler::Preemption_Priority_t& p_priority
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -73,8 +73,8 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority,
-                                     CORBA::Environment &_env)
+                                     RtecScheduler::Preemption_Priority_t& p_priority
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -82,8 +82,8 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type,
-                               CORBA::Environment &_env)
+                               RtecScheduler::Dependency_Type_t dependency_type
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
 
@@ -91,8 +91,8 @@ public:
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                                   CORBA::Environment &_env)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -100,15 +100,15 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type,
-                                       CORBA::Environment &_env)
+                                       RtecScheduler::Dispatching_Type_t & d_type
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // provide the thread priority and queue type for the given priority level
 
   virtual RtecScheduler::Preemption_Priority_t
-      last_scheduled_priority (CORBA::Environment &_env)
+      last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index c9b727cc3e3..22449341278 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -88,7 +88,7 @@ TAO_Reconfig_Scheduler (int config_count,
       this->init (config_count, config_infos,
                   rt_info_count, rt_infos,
                   dependency_count, dependency_infos,
-                  stability_flags, ACE_TRY_ENV);
+                  stability_flags TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, corba_sysex)
@@ -109,8 +109,8 @@ init (int config_count,
       ACE_Scheduler_Factory::POD_RT_Info rt_info[],
       int dependency_count,
       ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-      u_long stability_flags,
-      CORBA::Environment &ACE_TRY_ENV)
+      u_long stability_flags
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -124,7 +124,7 @@ init (int config_count,
   int result = 0;
 
   // Clear out the previous entries, if any.
-  this->close (ACE_TRY_ENV);
+  this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // (Re)initialize using the new settings.
@@ -184,8 +184,8 @@ init (int config_count,
   for (int num_rt_infos = 0; num_rt_infos < rt_info_count; ++num_rt_infos)
     {
       new_rt_info = create_i (rt_info [num_rt_infos].entry_point,
-                              rt_info [num_rt_infos].handle,
-                              ACE_TRY_ENV);
+                              rt_info [num_rt_infos].handle
+                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // Fill in the portions to which the user has access.
@@ -217,8 +217,8 @@ init (int config_count,
           add_dependency_i (dependency_info [dependency_count_].info_that_depends,
                             dependency_info [dependency_count_].info_depended_on,
                             dependency_info [dependency_count_].number_of_calls,
-                            dependency_info [dependency_count_].dependency_type,
-                            ACE_TRY_ENV);
+                            dependency_info [dependency_count_].dependency_type
+                            TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
 
@@ -233,7 +233,7 @@ init (int config_count,
 
 // Closes the scheduler, releasing all current resources.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (CORBA::Environment &ACE_TRY_ENV)
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -305,8 +305,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (CORBA::Environ
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-create (const char *entry_point,
-        CORBA::Environment &ACE_TRY_ENV)
+create (const char *entry_point
+        TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME,
                       RtecScheduler::INTERNAL,
@@ -317,7 +317,7 @@ create (const char *entry_point,
   ACE_CHECK_RETURN (0);
 
   RtecScheduler::handle_t handle = next_handle_;
-  create_i (entry_point, handle, ACE_TRY_ENV);
+  create_i (entry_point, handle TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (handle);
 
   // Set affected stability flags.
@@ -334,8 +334,8 @@ create (const char *entry_point,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup (const char * entry_point,
-        CORBA::Environment &ACE_TRY_ENV)
+lookup (const char * entry_point
+        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -345,7 +345,7 @@ lookup (const char * entry_point,
   ACE_CHECK_RETURN (0);
 
   RtecScheduler::handle_t handle;
-  handle = this->lookup_i (entry_point, ACE_TRY_ENV);
+  handle = this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (handle);
 
   return handle;
@@ -357,8 +357,8 @@ lookup (const char * entry_point,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::RT_Info *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-get (RtecScheduler::handle_t handle,
-     CORBA::Environment &ACE_TRY_ENV)
+get (RtecScheduler::handle_t handle
+     TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -401,8 +401,8 @@ set (RtecScheduler::handle_t handle,
      RtecScheduler::Importance_t importance,
      RtecScheduler::Quantum_t quantum,
      CORBA::Long threads,
-     RtecScheduler::Info_Type_t info_type,
-     CORBA::Environment &ACE_TRY_ENV)
+     RtecScheduler::Info_Type_t info_type
+     TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -505,8 +505,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 priority (RtecScheduler::handle_t handle,
           RtecScheduler::OS_Priority& o_priority,
           RtecScheduler::Preemption_Subpriority_t& subpriority,
-          RtecScheduler::Preemption_Priority_t& p_priority,
-          CORBA::Environment &ACE_TRY_ENV)
+          RtecScheduler::Preemption_Priority_t& p_priority
+          TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -544,8 +544,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 entry_point_priority (const char * entry_point,
                       RtecScheduler::OS_Priority& priority,
                       RtecScheduler::Preemption_Subpriority_t& subpriority,
-                      RtecScheduler::Preemption_Priority_t& p_priority,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      RtecScheduler::Preemption_Priority_t& p_priority
+                      TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -556,14 +556,14 @@ entry_point_priority (const char * entry_point,
   ACE_CHECK;
 
   RtecScheduler::handle_t handle =
-    this->lookup_i (entry_point, ACE_TRY_ENV);
+    this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->priority_i (handle,
                   priority,
                   subpriority,
-                  p_priority,
-                  ACE_TRY_ENV);
+                  p_priority
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -576,8 +576,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
                 RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                 CORBA::Long number_of_calls,
-                RtecScheduler::Dependency_Type_t dependency_type,
-                CORBA::Environment &ACE_TRY_ENV)
+                RtecScheduler::Dependency_Type_t dependency_type
+                TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -588,7 +588,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc
 
   // Delegate to the internal method.
   add_dependency_i (handle, dependency, number_of_calls,
-                    dependency_type, ACE_TRY_ENV);
+                    dependency_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Since the call graph topology has changed, set *all*
@@ -610,8 +610,8 @@ compute_scheduling (CORBA::Long minimum_priority,
                     CORBA::Long maximum_priority,
                     RtecScheduler::RT_Info_Set_out infos,
                     RtecScheduler::Config_Info_Set_out configs,
-                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies
+                    TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -640,16 +640,16 @@ compute_scheduling (CORBA::Long minimum_priority,
   if (this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE)
     {
       // Traverse dependency graph, assigning a topological ordering and identifying threads.
-      dfs_traverse_i (ACE_TRY_ENV);
+      dfs_traverse_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Sort an array of RT_info handles in topological order, check
       // for loops using the strongly connected components algorithm.
-      detect_cycles_i (ACE_TRY_ENV);
+      detect_cycles_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Propagate effective execution time and period, set total frame size.
-      propagate_characteristics_i (ACE_TRY_ENV);
+      propagate_characteristics_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -658,14 +658,14 @@ compute_scheduling (CORBA::Long minimum_priority,
       // Sort operations by urgency (done by strategy), then
       // assign priorities and subpriorities in one pass.
       // Sets last scheduled priority.
-      assign_priorities_i (ACE_TRY_ENV);
+      assign_priorities_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE)
     {
       // Compute utilization, set last feasible priority.
-      compute_utilization_i (ACE_TRY_ENV);
+      compute_utilization_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -736,8 +736,8 @@ void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                         RtecScheduler::OS_Priority& t_priority,
-                        RtecScheduler::Dispatching_Type_t & d_type,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        RtecScheduler::Dispatching_Type_t & d_type
+                        TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -773,7 +773,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::Preemption_Priority_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-last_scheduled_priority (CORBA::Environment &ACE_TRY_ENV)
+last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::NOT_SCHEDULED))
@@ -802,8 +802,8 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::RT_Info *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 create_i (const char *entry_point,
-          RtecScheduler::handle_t handle,
-          CORBA::Environment &ACE_TRY_ENV)
+          RtecScheduler::handle_t handle
+          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL))
@@ -985,8 +985,8 @@ set_i (RtecScheduler::RT_Info *rt_info,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-lookup_i (const char * entry_point,
-          CORBA::Environment &ACE_TRY_ENV)
+lookup_i (const char * entry_point
+          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -1008,8 +1008,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 priority_i (RtecScheduler::handle_t handle,
             RtecScheduler::OS_Priority& o_priority,
             RtecScheduler::Preemption_Subpriority_t& subpriority,
-            RtecScheduler::Preemption_Priority_t& p_priority,
-            CORBA::Environment &ACE_TRY_ENV)
+            RtecScheduler::Preemption_Priority_t& p_priority
+            TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -1040,8 +1040,8 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the dependency */,
                   RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                   CORBA::Long number_of_calls,
-                  RtecScheduler::Dependency_Type_t dependency_type,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  RtecScheduler::Dependency_Type_t dependency_type
+                  TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1064,8 +1064,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         dependency,                    // called handle
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
+                        dependency_type
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Add the called dependency map entry
@@ -1073,8 +1073,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         handle,                        // calling handle
                         called_dependency_set_map_,    // called map
                         number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
+                        dependency_type
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       break;
@@ -1088,8 +1088,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         handle,                        // called handle
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
+                        dependency_type
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Add the called dependency map entry
@@ -1097,8 +1097,8 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         dependency,                    // calling handle
                         called_dependency_set_map_,    // called map
                         number_of_calls,
-                        dependency_type,
-                        ACE_TRY_ENV);
+                        dependency_type
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       break;
@@ -1123,8 +1123,8 @@ map_dependency_i (RtecScheduler::handle_t key,
                                           ACE_Equal_To<RtecScheduler::handle_t>,
                                           ACE_LOCK> & map,
                   CORBA::Long number_of_calls,
-                  RtecScheduler::Dependency_Type_t dependency_type,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  RtecScheduler::Dependency_Type_t dependency_type
+                  TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -1162,7 +1162,7 @@ map_dependency_i (RtecScheduler::handle_t key,
 // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV)
+dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
@@ -1197,7 +1197,7 @@ dfs_traverse_i (CORBA::Environment &ACE_TRY_ENV)
 // checks for loops, marks unresolved remote dependencies.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-detect_cycles_i (CORBA::Environment &ACE_TRY_ENV)
+detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::CYCLIC_DEPENDENCIES))
@@ -1237,7 +1237,7 @@ detect_cycles_i (CORBA::Environment &ACE_TRY_ENV)
 // Propagates effective execution time and period, sets total frame size.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_characteristics_i (CORBA::Environment &ACE_TRY_ENV)
+propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
@@ -1275,7 +1275,7 @@ propagate_characteristics_i (CORBA::Environment &ACE_TRY_ENV)
 // Sets last scheduled priority.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-assign_priorities_i (CORBA::Environment &ACE_TRY_ENV)
+assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::DUPLICATE_NAME))
@@ -1383,7 +1383,7 @@ assign_priorities_i (CORBA::Environment &ACE_TRY_ENV)
 // Compute utilization, set last feasible priority.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_utilization_i (CORBA::Environment &ACE_TRY_ENV)
+compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index d7d93f12caa..3d5e7c090fd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -93,8 +93,8 @@ public:
             ACE_Scheduler_Factory::POD_RT_Info rt_info[],
             int dependency_count,
             ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-            u_long stability_flags,
-            CORBA::Environment &_env)
+            u_long stability_flags
+            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -102,14 +102,14 @@ public:
                      RtecScheduler::INTERNAL));
   // Initializes the scheduler with the passed information.
 
-  void close (CORBA::Environment &_env)
+  void close (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Closes the scheduler, releasing all current resources.
 
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-                                          CORBA::Environment &_env)
+  virtual RtecScheduler::handle_t create (const char * entry_point
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL,
@@ -119,16 +119,16 @@ public:
   // RT_Info is returned.  If the RT_Info already exists, an exception
   // is thrown.
 
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-                                          CORBA::Environment &_env)
+  virtual RtecScheduler::handle_t lookup (const char * entry_point
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK,
                     RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-                                       CORBA::Environment &_env)
+  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
@@ -143,8 +143,8 @@ public:
                     RtecScheduler::Importance_t importance,
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type,
-                    CORBA::Environment &_env)
+                    RtecScheduler::Info_Type_t info_type
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -154,8 +154,8 @@ public:
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority,
-                         CORBA::Environment &_env)
+                         RtecScheduler::Preemption_Priority_t& p_priority
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -166,8 +166,8 @@ public:
   virtual void entry_point_priority (const char * entry_point,
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority,
-                                     CORBA::Environment &_env)
+                                     RtecScheduler::Preemption_Priority_t& p_priority
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -178,8 +178,8 @@ public:
   virtual void add_dependency (RtecScheduler::handle_t handle,
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type,
-                               CORBA::Environment &_env)
+                               RtecScheduler::Dependency_Type_t dependency_type
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -189,8 +189,8 @@ public:
                                    CORBA::Long maximum_priority,
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                                   CORBA::Environment &_env)
+                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -205,15 +205,15 @@ public:
 
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type,
-                                       CORBA::Environment &_env)
+                                       RtecScheduler::Dispatching_Type_t & d_type
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::NOT_SCHEDULED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // Provides the thread priority and queue type for the given priority level.
 
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::NOT_SCHEDULED));
@@ -287,8 +287,8 @@ protected:
   // Flags indicating stability conditions of schedule.
 
   virtual RtecScheduler::RT_Info * create_i (const char * entry_point,
-                                             RtecScheduler::handle_t handle,
-                                             CORBA::Environment &_env)
+                                             RtecScheduler::handle_t handle
+                                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL));
@@ -309,8 +309,8 @@ protected:
                       RtecScheduler::Info_Type_t info_type);
   // Internal method to set characteristics of the passed RT_Info.
 
-  virtual RtecScheduler::handle_t lookup_i (const char * entry_point,
-                                            CORBA::Environment &_env)
+  virtual RtecScheduler::handle_t lookup_i (const char * entry_point
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK));
   // Internal method to look up a handle for an RT_Info, and return
@@ -319,8 +319,8 @@ protected:
   virtual void priority_i (RtecScheduler::handle_t handle,
                            RtecScheduler::OS_Priority& o_priority,
                            RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                           RtecScheduler::Preemption_Priority_t& p_priority,
-                           CORBA::Environment &_env)
+                           RtecScheduler::Preemption_Priority_t& p_priority
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -330,8 +330,8 @@ protected:
   virtual void add_dependency_i (RtecScheduler::handle_t handle,
                                  RtecScheduler::handle_t dependency,
                                  CORBA::Long number_of_calls,
-                                 RtecScheduler::Dependency_Type_t dependency_type,
-                                 CORBA::Environment &_env)
+                                 RtecScheduler::Dependency_Type_t dependency_type
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
@@ -348,34 +348,34 @@ protected:
                                           ACE_Equal_To<RtecScheduler::handle_t>,
                                           ACE_LOCK> &map,
                   CORBA::Long number_of_calls,
-                  RtecScheduler::Dependency_Type_t dependency_type,
-                  CORBA::Environment &env)
+                  RtecScheduler::Dependency_Type_t dependency_type
+                  TAO_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK));
   // This method installs a dependency in a dependency set map.
 
 
-  virtual void dfs_traverse_i (CORBA::Environment &_env)
+  virtual void dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Traverses dependency graph, assigning a topological ordering.
   // Resets DFS map entries, do DFS traversal, constructs DFS map.
 
-  virtual void detect_cycles_i (CORBA::Environment &_env)
+  virtual void detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::CYCLIC_DEPENDENCIES));
   // Sorts an array of RT_info handles in topological order, then
   // checks for loops, marks unresolved remote dependencies.
 
-  virtual void propagate_characteristics_i (CORBA::Environment &_env)
+  virtual void propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
                       RtecScheduler::THREAD_SPECIFICATION));
   // Propagates effective execution time and period, sets total frame size.
 
-  virtual void assign_priorities_i (CORBA::Environment &_env)
+  virtual void assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::DUPLICATE_NAME));
@@ -383,7 +383,7 @@ protected:
   // assign priorities and subpriorities in one pass.
   // Sets last scheduled priority.
 
-  virtual void compute_utilization_i (CORBA::Environment &_env)
+  virtual void compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Compute utilization, set last feasible priority.
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index e0fb7c9008b..7c83d45c13d 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -86,10 +86,10 @@ static_server (void)
                        ACE_Null_Mutex>::instance ()) == 0)
         return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      server_ = ace_scheduler_factory_data->scheduler_._this (ACE_TRY_ENV);
+      server_ = ace_scheduler_factory_data->scheduler_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -122,20 +122,20 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
     // config runs.
     return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (name);
       CORBA::Object_var objref =
-        naming->resolve (schedule_name,
-                         ACE_TRY_ENV);
+        naming->resolve (schedule_name
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server_ =
-        RtecScheduler::Scheduler::_narrow(objref.in (),
-                                          ACE_TRY_ENV);
+        RtecScheduler::Scheduler::_narrow(objref.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 6e6335855d0..bccb5842a4d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -25,8 +25,8 @@ TAO_Security_Current::~TAO_Security_Current (void)
 
 Security::AttributeList *
 TAO_Security_Current::get_attributes (
-    const Security::AttributeTypeList &attributes,
-    CORBA::Environment &ACE_TRY_ENV)
+    const Security::AttributeTypeList &attributes
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Security_Current_Impl *impl = this->implementation ();
@@ -37,12 +37,12 @@ TAO_Security_Current::get_attributes (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->get_attributes (attributes, ACE_TRY_ENV);
+  return impl->get_attributes (attributes TAO_ENV_ARG_PARAMETER);
 }
 
 SecurityLevel2::ReceivedCredentials_ptr
 TAO_Security_Current::received_credentials (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Security_Current_Impl *impl = this->implementation ();
@@ -53,7 +53,7 @@ TAO_Security_Current::received_credentials (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->received_credentials (ACE_TRY_ENV);
+  return impl->received_credentials (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -61,15 +61,15 @@ TAO_Security_Current::init (void)
 {
   int result = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       int argc = 0;
       char **argv = 0;
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            this->orb_id_.in (),
-                                            ACE_TRY_ENV);
+                                            this->orb_id_.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->orb_core_ = orb.in ()->orb_core ();
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index b0b0087fb9c..2dd683bf77c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -62,8 +62,8 @@ public:
   /// Return the security attributes corresponding to the types in the
   /// given attribute type list associated with the current request.
   virtual Security::AttributeList * get_attributes (
-      const Security::AttributeTypeList & attributes,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const Security::AttributeTypeList & attributes
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -77,7 +77,7 @@ public:
   /// Return the Credentials received from the client associate with
   /// the current request.
   virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      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/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index bbce76103c2..a911373a459 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -52,8 +52,8 @@ public:
   /// Return the security attributes corresponding to the types in the
   /// given attribute type list associated with the current request.
   virtual Security::AttributeList * get_attributes (
-      const Security::AttributeTypeList & attributes,
-      CORBA::Environment &ACE_TRY_ENV)
+      const Security::AttributeTypeList & attributes
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   //@}
 
@@ -67,7 +67,7 @@ public:
   /// Return the Credentials received from the client associate with
   /// the current request.
   virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index c63a5257c58..991c107ac90 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -19,14 +19,12 @@ TAO_Security_ORBInitializer::pre_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   // @@ This is busted.  TAO_ORBInitInfo should do proper reference
   //    counting.
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // allocate_tss_slot_id() TAO extension.
-  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info,
-                                                           ACE_TRY_ENV);
+  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
@@ -43,11 +41,11 @@ TAO_Security_ORBInitializer::pre_init (
 
   // Reserve a TSS slot in the ORB core internal TSS resources for the
   // thread-specific portion of Security::Current.
-  size_t tss_slot = tao_info->allocate_tss_slot_id (0,
-                                                    ACE_TRY_ENV);
+  size_t tss_slot = tao_info->allocate_tss_slot_id (0
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var orb_id = info->orb_id (ACE_TRY_ENV);
+  CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the SecurityLevel2::Current object.
@@ -66,8 +64,8 @@ TAO_Security_ORBInitializer::pre_init (
   // Register the SecurityLevel2::Current object reference with the
   // ORB.
   info->register_initial_reference ("SecurityCurrent",
-                                    security_current.in (),
-                                    ACE_TRY_ENV);
+                                    security_current.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -77,17 +75,15 @@ TAO_Security_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
-  this->register_policy_factories (info,
-                                   ACE_TRY_ENV);
+  this->register_policy_factories (info
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Security_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
   // Register the security policy factories.
 
@@ -101,41 +97,41 @@ TAO_Security_ORBInitializer::register_policy_factories (
   // the different types of security policies.
 
   CORBA::PolicyType type;
-  
+
   type = Security::SecQOPPolicy;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecMechanismsPolicy;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecInvocationCredentialsPolicy;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecFeaturePolicy;   // Deprecated
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecDelegationDirectivePolicy;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecEstablishTrustPolicy;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ----------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
index 0698058b90f..af1aecce473 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
@@ -59,8 +59,8 @@ private:
 
   /// Register Security policy factories.
   void register_policy_factories (
-         PortableInterceptor::ORBInitInfo_ptr info,
-         CORBA::Environment &ACE_TRY_ENV);
+         PortableInterceptor::ORBInitInfo_ptr info
+         TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 9a0a617f61e..6d69fbbcd95 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -19,8 +19,6 @@ TAO_Security_PolicyFactory::create_policy (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
-  TAO_ENV_ARG_DEFN;
-
   // Not all security policies can be created using the
   // ORB::create_policy() mechanism.  Only those that can be created
   // using that mechanism are supported by this factory.
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 5a539fd79a1..f1e64ebe556 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -19,7 +19,7 @@ TAO_TIO::~TAO_TIO (void)
 // This is the get method for the attribute time interval.
 
 TimeBase::IntervalT
-TAO_TIO::time_interval (CORBA::Environment &)
+TAO_TIO::time_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_time_interval;
@@ -33,8 +33,8 @@ TAO_TIO::time_interval (CORBA::Environment &)
 
 CosTime::OverlapType
 TAO_TIO::spans (CosTime::UTO_ptr uto,
-                CosTime::TIO_out overlap,
-                CORBA::Environment &ACE_TRY_ENV)
+                CosTime::TIO_out overlap
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
@@ -47,19 +47,19 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
       TimeBase::TimeT up1 =
         this->time_interval ().upper_bound;
 
-      TimeBase::TimeT tmp1 = uto->time (ACE_TRY_ENV);
+      TimeBase::TimeT tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TimeBase::TimeT tmp2 = uto->inaccuracy (ACE_TRY_ENV);
+      TimeBase::TimeT tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT lb2 = tmp1 - tmp2;
 
 
-      tmp1 = uto->time (ACE_TRY_ENV);
+      tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      tmp2 = uto->inaccuracy (ACE_TRY_ENV);
+      tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT up2 = tmp1 + tmp2;
@@ -154,8 +154,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 
 CosTime::OverlapType
 TAO_TIO::overlaps (CosTime::TIO_ptr tio,
-                   CosTime::TIO_out overlap,
-                   CORBA::Environment & ACE_TRY_ENV)
+                   CosTime::TIO_out overlap
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio_i = 0;
@@ -254,7 +254,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 }
 
 CosTime::UTO_ptr
-TAO_TIO::time (CORBA::Environment &ACE_TRY_ENV)
+TAO_TIO::time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index 84dfa4be786..a9ed61cf860 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -46,13 +46,13 @@ public:
   // Destructor.
 
   virtual TimeBase::IntervalT  time_interval (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This is the get method for the attribute time interval.
 
   virtual CosTime::OverlapType spans (CosTime::UTO_ptr time,
-                                      CosTime::TIO_out overlap,
-                                      CORBA::Environment &env)
+                                      CosTime::TIO_out overlap
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns a value of type OverlapType depending on
   // how the interval in the object and the time range represented by
@@ -62,8 +62,8 @@ public:
   // intervals.
 
   virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval,
-                                         CosTime::TIO_out overlap,
-                                         CORBA::Environment &env)
+                                         CosTime::TIO_out overlap
+                                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns a value of type OverlapType depending on
   // how the interval in the object and interval in the parameter TIO
@@ -71,7 +71,7 @@ public:
   // parameter overlap contains the overlap interval, otherwise the
   // out parameter contains the gap between the two intervals.
 
-  virtual CosTime::UTO_ptr time (CORBA::Environment &env)
+  virtual CosTime::UTO_ptr time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a UTO in which the inaccuracy interval is equal to the
   // time interval in the TIO and time value is the midpoint of the
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index bc059965f72..2f9616ef174 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -37,7 +37,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
 // in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Clerk::universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Clerk::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -71,8 +71,8 @@ TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &ACE_TRY_ENV)
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
                                             TimeBase::InaccuracyT inaccuracy,
-                                            TimeBase::TdfT tdf,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            TimeBase::TdfT tdf
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -89,8 +89,8 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
 // This creates a new UTO given a time in the UtcT form.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -115,8 +115,8 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc,
 
 CosTime::TIO_ptr
 TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
-                                      TimeBase::TimeT upper,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      TimeBase::TimeT upper
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 581ec0b2f7c..083f8a8c3b6 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -57,13 +57,13 @@ public:
   ~TAO_Time_Service_Clerk (void);
   // Destructor.
 
-  virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env)
+  virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the global time and an estimate of
   // inaccuracy in a UTO.
 
-  virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env)
+  virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the global time in a UTO only if the time
@@ -73,19 +73,19 @@ public:
 
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf,
-                                               CORBA::Environment &env)
+                                               TimeBase::TdfT tdf
+                                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO based on the given parameters.
 
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc,
-                                         CORBA::Environment &env)
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
+                                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO given a time in the UtcT form.
 
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper,
-                                         CORBA::Environment &env)
+                                         TimeBase::TimeT upper
+                                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new TIO with the given parameters.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index a9004975a4d..5ba026e5798 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -19,7 +19,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
 // inaccuracy in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Server::universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -31,7 +31,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
   // broadcast by the WWV radio station of the National Bureau of
   // Standards deliver time that is easier to handle in this
   // representation. UTC time is defined as :
-  // 
+  //
   //  Time Units : 100 nanosecs
   //  Base Time  : 15th October 1582 00:00:00
   //  Approximate range : AD 30,000
@@ -74,7 +74,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Server::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -86,8 +86,8 @@ TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &ACE_TRY_ENV)
 CosTime::UTO_ptr
 TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
                                              TimeBase::InaccuracyT inaccuracy,
-                                             TimeBase::TdfT tdf,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             TimeBase::TdfT tdf
+                                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -106,8 +106,8 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
 // This creates a new UTO given a time in the UtcT form.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -125,8 +125,8 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc,
 
 CosTime::TIO_ptr
 TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
-                                       TimeBase::TimeT upper,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       TimeBase::TimeT upper
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 459a01e6315..62215491365 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -45,13 +45,13 @@ public:
   ~TAO_Time_Service_Server (void);
   // Destructor.
 
-  virtual CosTime::UTO_ptr universal_time (CORBA::Environment &env)
+  virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the current system time and an estimate of
   // inaccuracy in a UTO.
 
-  virtual CosTime::UTO_ptr secure_universal_time (CORBA::Environment &env)
+  virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the current time in a UTO only if the time
@@ -60,19 +60,19 @@ public:
 
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
-                                               TimeBase::TdfT tdf,
-                                               CORBA::Environment &env)
+                                               TimeBase::TdfT tdf
+                                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO based on the given parameters.
 
-  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc,
-                                         CORBA::Environment &env)
+  virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
+                                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO given a time in the UtcT form.
 
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
-                                         TimeBase::TimeT upper,
-                                         CORBA::Environment &env)
+                                         TimeBase::TimeT upper
+                                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new TIO with the given parameters.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 642ad70baec..5b2595df2fd 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -42,7 +42,7 @@ TAO_UTO::~TAO_UTO (void)
 // Get Method for the readonly attribute time.
 
 TimeBase::TimeT
-TAO_UTO::time (CORBA::Environment &)
+TAO_UTO::time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.time;
@@ -51,7 +51,7 @@ TAO_UTO::time (CORBA::Environment &)
 // Get method for the readonly attribute inaccuracy.
 
 TimeBase::InaccuracyT
-TAO_UTO::inaccuracy (CORBA::Environment &)
+TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct the Inaccuracy from the
@@ -66,7 +66,7 @@ TAO_UTO::inaccuracy (CORBA::Environment &)
 // Get method for the readonly attribute tdf.
 
 TimeBase::TdfT
-TAO_UTO::tdf (CORBA::Environment &)
+TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.tdf;
@@ -75,7 +75,7 @@ TAO_UTO::tdf (CORBA::Environment &)
 // Get method for the readonly attribute utc_time.
 
 TimeBase::UtcT
-TAO_UTO::utc_time (CORBA::Environment &)
+TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_;
@@ -85,7 +85,7 @@ TAO_UTO::utc_time (CORBA::Environment &)
 // the Base Time, UTC and Distributed Time Sync. Algos. [3].
 
 CosTime::UTO_ptr
-TAO_UTO::absolute_time (CORBA::Environment &)
+TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -96,21 +96,21 @@ TAO_UTO::absolute_time (CORBA::Environment &)
 
 CosTime::TimeComparison
 TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
-                       CosTime::UTO_ptr uto,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CosTime::UTO_ptr uto
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      TimeBase::TimeT uto_time = uto->time (ACE_TRY_ENV);
+      TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
        TimeBase::InaccuracyT this_inaccuracy =
-         this->inaccuracy (ACE_TRY_ENV);
+         this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
        ACE_TRY_CHECK;
 
        TimeBase::InaccuracyT uto_inaccuracy =
-         uto->inaccuracy (ACE_TRY_ENV);
+         uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
        ACE_TRY_CHECK;
 
       if (comparison_type == CosTime::MidC)
@@ -171,15 +171,15 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
 // is meaningless if the base times of UTOs are different.
 
 CosTime::TIO_ptr
-TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
   ACE_TRY
     {
-      TimeBase::TimeT uto_time = uto->time (ACE_TRY_ENV);
+      TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->time () > uto_time)
@@ -216,7 +216,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
 // time value in the UTO.
 
 CosTime::TIO_ptr
-TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV)
+TAO_UTO::interval (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
@@ -224,7 +224,7 @@ TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV)
   ACE_TRY
     {
       TimeBase::TimeT this_inaccuracy =
-          this->inaccuracy (ACE_TRY_ENV);
+          this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT lower =
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index e1191227c14..4c57b221c4c 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -56,38 +56,38 @@ public:
   // Destructor.
 
   virtual TimeBase::TimeT time (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <time>.
 
-  virtual TimeBase::InaccuracyT  inaccuracy (CORBA::Environment &env)
+  virtual TimeBase::InaccuracyT  inaccuracy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <inaccuracy>.
 
-  virtual TimeBase::TdfT tdf (CORBA::Environment &env)
+  virtual TimeBase::TdfT tdf (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <tdf>, which is the "time displacement
   // factor".
 
-  virtual TimeBase::UtcT utc_time (CORBA::Environment &env)
+  virtual TimeBase::UtcT utc_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <utc_time>.
 
-  CosTime::UTO_ptr absolute_time (CORBA::Environment &env)
+  CosTime::UTO_ptr absolute_time (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Absolute time = Relative time + Base time.
   // ?? Find out more about the Base Time, UTC and
   //    Distributed Time Sync. Algos. [3
 
   CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type,
-                                        CosTime::UTO_ptr uto,
-                                        CORBA::Environment &env)
+                                        CosTime::UTO_ptr uto
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Compares the time contained in the object with the time in the
   // supplied uto according to the supplied comparison type.
 
-  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr,
-                                     CORBA::Environment &env)
+  CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a TIO representing the time interval between the time in
   // the object and the time in the UTO passed as a parameter. The
@@ -95,7 +95,7 @@ public:
   // two UTOs. Inaccuracies are ignored.  Note the result of this
   // operation is meaningless if the base times of UTOs are different.
 
-  CosTime::TIO_ptr interval (CORBA::Environment &env)
+  CosTime::TIO_ptr interval (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a TIO object representing the error interval around the
   // time value in the UTO.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 3cf68ace9fd..85267dc9f6c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -7,8 +7,8 @@ ACE_RCSID(Trader, Constraint_Interpreter, "$Id$")
 
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                            const char* constraints,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            const char* constraints
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
   : TAO_Interpreter ()
@@ -37,8 +37,8 @@ TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt
 
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
-                           const char* constraints,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           const char* constraints
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
 {
@@ -78,8 +78,8 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator)
 
 TAO_Preference_Interpreter::
 TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                           const char* preference,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           const char* preference
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
     : TAO_Interpreter ()
@@ -105,8 +105,8 @@ TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt
 
 TAO_Preference_Interpreter::
 TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
-                           const char* preference,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           const char* preference
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
     : TAO_Interpreter ()
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index ce4318fd183..e34d1af6cf1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -48,14 +48,14 @@ class TAO_Trading_Export TAO_Constraint_Interpreter : public TAO_Interpreter
 public:
   // = Initialization and termination methods.
   TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* constraints,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              const char* constraints
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
 
   TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* constraints,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              const char* constraints
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
   // This constructor builds an expression tree representing the
@@ -91,14 +91,14 @@ class TAO_Trading_Export TAO_Preference_Interpreter : public TAO_Interpreter
 public:
   // = Initialization and termination methods.
   TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
-                              const char* preference,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              const char* preference
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
   TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
-                              const char* preference,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              const char* preference
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index a4cc7792cdf..2a2dddd6077 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -507,14 +507,14 @@ sequence_does_contain (CORBA::Any* sequence,
   // wrapper uses the [] operator to locate the target element in the
   // sequence.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   CORBA::Boolean return_value = 0;
   CORBA::TypeCode_var type = sequence->type ();
   CORBA::TCKind sequence_type = CORBA::tk_void;
   ACE_TRY
     {
       sequence_type =
-        TAO_Sequence_Extracter_Base::sequence_type (type.in (), ACE_TRY_ENV);
+        TAO_Sequence_Extracter_Base::sequence_type (type.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -594,7 +594,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Short value = dyn_any.get_short (ACE_TRY_ENV);
+      CORBA::Short value = dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -613,7 +613,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::UShort value = dyn_any.get_ushort (ACE_TRY_ENV);
+      CORBA::UShort value = dyn_any.get_ushort (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -632,7 +632,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Long value = dyn_any.get_long (ACE_TRY_ENV);
+      CORBA::Long value = dyn_any.get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -651,7 +651,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::ULong value = dyn_any.get_ulong (ACE_TRY_ENV);
+      CORBA::ULong value = dyn_any.get_ulong (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -670,7 +670,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Float value = dyn_any.get_float (ACE_TRY_ENV);
+      CORBA::Float value = dyn_any.get_float (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -686,7 +686,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Double value = dyn_any.get_short (ACE_TRY_ENV);
+      CORBA::Double value = dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -702,7 +702,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (ACE_TRY_ENV);
+    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -718,7 +718,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      const char* value = dyn_any.get_string (ACE_TRY_ENV);
+      const char* value = dyn_any.get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (ACE_OS::strcmp (value, element) == 0);
     }
@@ -999,13 +999,13 @@ visit_in (TAO_Binary_Constraint* binary_in)
 
   if (right_type == TAO_SEQUENCE)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       CORBA::Boolean types_match = 0;
       CORBA::TCKind seq_type = CORBA::tk_void;
       ACE_TRY
         {
           seq_type =
-            TAO_Sequence_Extracter_Base::sequence_type (prop_type, ACE_TRY_ENV);
+            TAO_Sequence_Extracter_Base::sequence_type (prop_type TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 91f3f007af5..30781c68228 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -52,13 +52,13 @@ TAO_String_Hash_Key::~TAO_String_Hash_Key (void)
 
 CORBA::TCKind
 TAO_Sequence_Extracter_Base::
-sequence_type (CORBA::TypeCode* type_code,
-               CORBA::Environment& ACE_TRY_ENV)
+sequence_type (CORBA::TypeCode* type_code
+               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Seth, why do you use a comma to separate the two statements?
   CORBA::TCKind return_value = CORBA::tk_void,
-  type_kind = type_code->kind (ACE_TRY_ENV);
+  type_kind = type_code->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (return_value);
 
   if (type_kind == CORBA::tk_alias
@@ -68,27 +68,27 @@ sequence_type (CORBA::TypeCode* type_code,
 
       for (;;)
         {
-          CORBA::TCKind base_kind = base->kind (ACE_TRY_ENV);
+          CORBA::TCKind base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
 
           if (base_kind == CORBA::tk_alias)
             {
-              base = base->content_type (ACE_TRY_ENV);
+              base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK_RETURN (return_value);
             }
           else
             break;
         }
 
-      CORBA::TCKind base_kind = base->kind (ACE_TRY_ENV);
+      CORBA::TCKind base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (base_kind == CORBA::tk_sequence)
         {
-          base = base->content_type (ACE_TRY_ENV);
+          base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
 
-          base_kind = base->kind (ACE_TRY_ENV);
+          base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
           return_value = base_kind;
         }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index 7e4dce4b9ff..ed92c170db0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -57,8 +57,8 @@ class TAO_Sequence_Extracter_Base
 {
 public:
 
-  static CORBA::TCKind sequence_type (CORBA::TypeCode* code,
-                                      CORBA::Environment& env)
+  static CORBA::TCKind sequence_type (CORBA::TypeCode* code
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the sequence element type for the sequence whose typecode
   // is <code>.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index d192365207f..516f47b61a0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -17,11 +17,11 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      dyn_seq.init (sequence, ACE_TRY_ENV);
+      dyn_seq.init (sequence TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length =
-        dyn_seq.get_length (ACE_TRY_ENV);
+        dyn_seq.get_length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i < length && ! return_value; i++)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 94b42e23a9a..a6935170056 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -148,8 +148,8 @@ remove_offer (const char* type, CORBA::ULong id)
 
 template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
-remove_offer (const CosTrading::OfferId offer_id,
-              CORBA::Environment& ACE_TRY_ENV)
+remove_offer (const CosTrading::OfferId offer_id
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -158,8 +158,8 @@ remove_offer (const CosTrading::OfferId offer_id,
 
   this->parse_offer_id (offer_id,
                         stype,
-                        index,
-                        ACE_TRY_ENV);
+                        index
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->remove_offer (stype,
@@ -173,14 +173,14 @@ remove_offer (const CosTrading::OfferId offer_id,
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
-              char*& type_name,
-              CORBA::Environment& ACE_TRY_ENV)
+              char*& type_name
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
-  this->parse_offer_id (offer_id, type_name, index, ACE_TRY_ENV);
+  this->parse_offer_id (offer_id, type_name, index TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (offer);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
@@ -192,8 +192,8 @@ lookup_offer (const CosTrading::OfferId offer_id,
 
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
-lookup_offer (const CosTrading::OfferId offer_id,
-              CORBA::Environment& ACE_TRY_ENV)
+lookup_offer (const CosTrading::OfferId offer_id
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -201,7 +201,7 @@ lookup_offer (const CosTrading::OfferId offer_id,
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
 
-  this->parse_offer_id (offer_id, type_name, index, ACE_TRY_ENV);
+  this->parse_offer_id (offer_id, type_name, index TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (offer);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
@@ -274,8 +274,8 @@ template <class LOCK_TYPE> void
 TAO_Offer_Database<LOCK_TYPE>::
 parse_offer_id (const CosTrading::OfferId offer_id,
                 char*&service_type,
-                CORBA::ULong& id,
-                CORBA::Environment& ACE_TRY_ENV)
+                CORBA::ULong& id
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
   // Get service type: it is everything from 17th character to the end.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index cd3f10808dc..92a163b37f9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -64,21 +64,21 @@ public:
   // Add an offer of type <type> and generate a CosTrading::OfferId
   // for it. Returns 0 on failure.
 
-  int remove_offer (const CosTrading::OfferId offer_id,
-                    CORBA::Environment& _ACE_TRY_ENV)
+  int remove_offer (const CosTrading::OfferId offer_id
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
-  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-                                   CORBA::Environment& ACE_TRY_ENV)
+  CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose offer_id is <offer_id>, and return
   // it. Otherwise, throw the appropriate exception.
 
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
-                                   char*& type_name,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   char*& type_name
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose OfferId is <offer_id> and return in
@@ -130,8 +130,8 @@ private:
 
   static void parse_offer_id (const CosTrading::OfferId offer_id,
                               char* &service_type,
-                              CORBA::ULong& id,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              CORBA::ULong& id
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId));
   // Take in a previously generated offer id and return the type
   // and id that were used to generate the offer id.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 4be0bf71545..a6f0cf2d93e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -14,20 +14,20 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
 }
 
 void
-TAO_Offer_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Offer_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -50,7 +50,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
 }
 
 CORBA::ULong
-TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &)
+TAO_Query_Only_Offer_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC((CORBA::SystemException,
                  CosTrading::UnknownMaxLeft))
 {
@@ -59,8 +59,8 @@ TAO_Query_Only_Offer_Iterator::max_left (CORBA::Environment &)
 
 CORBA::Boolean
 TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
-                                       CosTrading::OfferSeq_out offers,
-                                                               CORBA::Environment &)
+                                       CosTrading::OfferSeq_out offers
+                                                               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   offers = new CosTrading::OfferSeq;
@@ -94,7 +94,7 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
 
       ACE_TRY_NEW_ENV
         {
-          offer_iter->destroy (ACE_TRY_ENV);
+          offer_iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::release (offer_iter);
@@ -118,8 +118,8 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter)
 
 CORBA::Boolean
 TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
-                                       CosTrading::OfferSeq_out offers,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CosTrading::OfferSeq_out offers
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong offers_left = n;
@@ -144,14 +144,14 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
       // Retrieve the set of offers.
       any_left =
         iter->next_n (offers_left,
-                      CosTrading::OfferSeq_out (out_offers.out ()),
-                      ACE_TRY_ENV);
+                      CosTrading::OfferSeq_out (out_offers.out ())
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       // If we've exhausted this iterator, destroy it.
       if (any_left == 0)
         {
-          iter->destroy (ACE_TRY_ENV);
+          iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
           CORBA::release (iter);
         }
@@ -175,7 +175,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
 }
 
 void
-TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Iterator_Collection::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy all iterators in the collection.
@@ -186,26 +186,26 @@ TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& ACE_TRY_ENV)
       CosTrading::OfferIterator** iter = 0;
 
       iters_iter.next (iter);
-      (*iter)->destroy (ACE_TRY_ENV);
+      (*iter)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::ULong
-TAO_Offer_Iterator_Collection::max_left (CORBA::Environment &ACE_TRY_ENV)
+TAO_Offer_Iterator_Collection::max_left (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::UnknownMaxLeft))
 {
@@ -233,7 +233,7 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
 }
 
 CORBA::ULong
-TAO_Offer_Id_Iterator::max_left (CORBA::Environment &)
+TAO_Offer_Id_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
@@ -241,28 +241,28 @@ TAO_Offer_Id_Iterator::max_left (CORBA::Environment &)
 }
 
 void
-TAO_Offer_Id_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Offer_Id_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Boolean
 TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
-                               CosTrading::OfferIdSeq_out _ids,
-                               CORBA::Environment &)
+                               CosTrading::OfferIdSeq_out _ids
+                               TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 611828503e2..d345fbcd38c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -32,7 +32,7 @@
   // TAO_Offer_Iterator
   // *************************************************************
 
-class TAO_Offer_Iterator : 
+class TAO_Offer_Iterator :
   public virtual POA_CosTrading::OfferIterator,
   public virtual PortableServer::RefCountServantBase
 {
@@ -56,7 +56,7 @@ public:
 
   virtual ~TAO_Offer_Iterator (void);
 
-  virtual void destroy (CORBA::Environment& ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // BEGIN SPEC
   // The destroy operation destroys the iterator. No further
@@ -69,7 +69,7 @@ public:
   // Add an offer to the collection of offers the iterator will
   // iterate over.
 
-  virtual CORBA::ULong max_left (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft)) = 0;
 
@@ -82,8 +82,8 @@ public:
   // END SPEC
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CosTrading::OfferSeq_out offers
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // BEGIN SPEC
   // The next_n operation returns a set of service offers in the
@@ -134,13 +134,13 @@ public:
   virtual ~TAO_Query_Only_Offer_Iterator (void);
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CosTrading::OfferSeq_out offers
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit at maximum n offers into the return sequence and return 1,
   // or return 0 if the iterator is done and no offers are returned.
 
-  virtual CORBA::ULong max_left (CORBA::Environment& ACE_TRY_ENV)
+  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // Return the number of items left in the iterator.
@@ -163,7 +163,7 @@ private:
   // TAO_Offer_Iterator_Collection
   // *************************************************************
 
-class TAO_Offer_Iterator_Collection : 
+class TAO_Offer_Iterator_Collection :
   public virtual POA_CosTrading::OfferIterator,
   public virtual PortableServer::RefCountServantBase
 // = TITLE
@@ -190,16 +190,16 @@ public:
   virtual ~TAO_Offer_Iterator_Collection (void);
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CosTrading::OfferSeq_out offers
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Retrieve n offers from the set of iterators.
 
-  virtual void destroy (CORBA::Environment& ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the collection of iterators.
 
-  virtual CORBA::ULong max_left (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
   // Determine how many offers are left in the collection.
@@ -222,7 +222,7 @@ private:
   // TAO_Offer_Id_Iterator
   // *************************************************************
 
-class TAO_Offer_Id_Iterator : 
+class TAO_Offer_Id_Iterator :
   public virtual POA_CosTrading::OfferIdIterator,
   public virtual PortableServer::RefCountServantBase
 // = TITLE
@@ -246,7 +246,7 @@ class TAO_Offer_Id_Iterator :
 
   ~TAO_Offer_Id_Iterator (void);
 
-  virtual CORBA::ULong max_left(CORBA::Environment& ACE_TRY_ENV)
+  virtual CORBA::ULong max_left(TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // The max_left operation returns the number of offer identifiers
@@ -255,15 +255,15 @@ class TAO_Offer_Id_Iterator :
   // identifiers (e.g., if the iterator determines its set of offer
   // identifiers through lazy evaluation).
 
-  virtual void destroy(CORBA::Environment& ACE_TRY_ENV)
+  virtual void destroy(TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The destroy operation destroys the iterator. No further
   // operations can be invoked on an iterator after it has been
   // destroyed.
 
   virtual CORBA::Boolean next_n(CORBA::ULong _n,
-                                CosTrading::OfferIdSeq_out _ids,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                CosTrading::OfferIdSeq_out _ids
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns a set of offer identifiers in the
   // output parameter "ids." The operation returns n offer identifiers
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index dc7688d1bb5..ee67777d024 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -39,7 +39,7 @@ add_offer (CosTrading::OfferId id,
 
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (CORBA::Environment&)
+max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
@@ -49,8 +49,8 @@ max_left (CORBA::Environment&)
 template <class MAP_LOCK_TYPE> CORBA::Boolean
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 next_n (CORBA::ULong n,
-        CosTrading::OfferSeq_out offers,
-        CORBA::Environment& ACE_TRY_ENV)
+        CosTrading::OfferSeq_out offers
+        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong ret_offers = 0;
@@ -77,7 +77,7 @@ next_n (CORBA::ULong n,
       this->offer_ids_.dequeue_head (id);
 
       CosTrading::OfferId_var offerid_var (id);
-      CosTrading::Offer* offer = this->db_.lookup_offer (id, ACE_TRY_ENV);
+      CosTrading::Offer* offer = this->db_.lookup_offer (id TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (offer != 0)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 477737113f1..fb3948efa72 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -52,13 +52,13 @@ public:
   // destructor.
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
-                                 CosTrading::OfferSeq_out offers,
-                                 CORBA::Environment &)
+                                 CosTrading::OfferSeq_out offers
+                                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit at maximum n offers into the return sequence and return 1,
   // or return 0 if the iterator is done and no offers are returned.
 
-  virtual CORBA::ULong max_left (CORBA::Environment &)
+  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
   // Throws CosTrading::UnknownMaxLeft since with the presence of
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index a0530aec8ac..5f0a3087c54 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -37,7 +37,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 }
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-TAO_Service_Type_Repository::incarnation (CORBA::Environment &)
+TAO_Service_Type_Repository::incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
@@ -62,8 +62,8 @@ TAO_Service_Type_Repository::
 add_type (const char *name,
           const char *if_name,
           const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-          CORBA::Environment &ACE_TRY_ENV)
+          const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
+          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -100,14 +100,14 @@ add_type (const char *name,
 
   // Make sure all property names are valid and appear only once.
   this->validate_properties (prop_map,
-                             props,
-                             ACE_TRY_ENV);
+                             props
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->incarnation_);
 
   // Check that all super_types exist, and none are duplicated.
   this->validate_supertypes (super_map,
-                             super_types,
-                             ACE_TRY_ENV);
+                             super_types
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->incarnation_);
 
   // NOTE: I don't really know a way to do this without an Interface
@@ -115,7 +115,7 @@ add_type (const char *name,
   // information about supertypes.
   //
   // make sure interface name is legal.
-  //  this->validate_interface (if_name, super_types, ACE_TRY_ENV);
+  //  this->validate_interface (if_name, super_types TAO_ENV_ARG_PARAMETER);
   //  ACE_CHECK_RETURN (this->incarnation);
   //
   // Instead, we do this:
@@ -128,8 +128,8 @@ add_type (const char *name,
   // type are compatible.  We can use prop_map and super_types_map for
   // the job.
   this->validate_inheritance (prop_map,
-                              super_types,
-                              ACE_TRY_ENV);
+                              super_types
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->incarnation_);
 
   // We can now use prop_map to construct a sequence of all properties
@@ -155,8 +155,8 @@ add_type (const char *name,
 }
 
 void
-TAO_Service_Type_Repository::remove_type (const char *name,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Service_Type_Repository::remove_type (const char *name
+                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -186,8 +186,8 @@ TAO_Service_Type_Repository::remove_type (const char *name,
 
 CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
 TAO_Service_Type_Repository::
-list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types,
-            CORBA::Environment &ACE_TRY_ENV)
+list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
+            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
@@ -232,8 +232,8 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
 
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
-describe_type (const char * name,
-               CORBA::Environment& ACE_TRY_ENV)
+describe_type (const char * name
+               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -282,8 +282,8 @@ describe_type (const char * name,
 
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
-fully_describe_type (const char *name,
-                     CORBA::Environment &ACE_TRY_ENV)
+fully_describe_type (const char *name
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -328,8 +328,8 @@ fully_describe_type (const char *name,
 
 void
 TAO_Service_Type_Repository::
-mask_type (const char *name,
-           CORBA::Environment &ACE_TRY_ENV)
+mask_type (const char *name
+           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -359,8 +359,8 @@ mask_type (const char *name,
 
 void
 TAO_Service_Type_Repository::
-unmask_type (const char *name,
-             CORBA::Environment &ACE_TRY_ENV)
+unmask_type (const char *name
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -496,8 +496,8 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ
 void
 TAO_Service_Type_Repository::
 validate_properties (Prop_Map &prop_map,
-                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
 {
@@ -525,8 +525,8 @@ validate_properties (Prop_Map &prop_map,
 void
 TAO_Service_Type_Repository::
 validate_supertypes (Service_Type_Map &super_map,
-                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
@@ -561,8 +561,8 @@ validate_supertypes (Service_Type_Map &super_map,
 void
 TAO_Service_Type_Repository::
 validate_inheritance (Prop_Map &prop_map,
-                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
@@ -610,8 +610,8 @@ validate_inheritance (Prop_Map &prop_map,
               ACE_TRY
                 {
                   compare =
-                    super_props[j].value_type->equal (prop_type,
-                                                      ACE_TRY_ENV);
+                    super_props[j].value_type->equal (prop_type
+                                                      TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
               ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index 40991128986..b70563d8c7f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -37,15 +37,15 @@ public:
   ~TAO_Service_Type_Repository (void);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (CORBA::Environment &)
+    incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
   add_type (const char *name,
             const char *if_name,
             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-            CORBA::Environment &)
+            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
+            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -98,8 +98,8 @@ public:
   // parameter, the DuplicateServiceTypeName exception is raised.
   // END SPEC
 
-  virtual void remove_type (const char  *name,
-                            CORBA::Environment &)
+  virtual void remove_type (const char  *name
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -114,8 +114,8 @@ public:
   // the HasSubTypes exception is raised.  END SPEC
 
   virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
-  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types,
-              CORBA::Environment &)
+  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
+              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -130,8 +130,8 @@ public:
   // END SPEC
 
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  describe_type (const char *name,
-                 CORBA::Environment &)
+  describe_type (const char *name
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -144,8 +144,8 @@ public:
   // END SPEC
 
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  fully_describe_type (const char *name,
-                       CORBA::Environment &)
+  fully_describe_type (const char *name
+                       TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -161,8 +161,8 @@ public:
   // the CosTrading::UnknownServiceType exception is raised.
   // END SPEC
 
-  virtual void mask_type (const char *name,
-                          CORBA::Environment &)
+  virtual void mask_type (const char *name
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -180,8 +180,8 @@ public:
   // exception is raised.
   // END SPEC
 
-  virtual void unmask_type (const char  *name,
-                            CORBA::Environment &)
+  virtual void unmask_type (const char  *name
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -243,31 +243,31 @@ public:
                                       TAO_String_Queue &target);
 
   void validate_properties (Prop_Map &prop_map,
-                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                            CORBA::Environment &)
+                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Confirm that the properties in props have valid names, and aren't
   // duplicated. Cram those properties into the prop_map.
 
   void validate_supertypes (Service_Type_Map &super_map,
-                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                            CORBA::Environment &)
+                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
   // Confirm that the each super type exists, and cram them into super_map.
 
   void validate_inheritance (Prop_Map &prop_map,
-                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                             CORBA::Environment &)
+                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
   // Ensure that properties of a super_type aren't having their types
   // or retstrictions redefined.
 
   //  void validate_interface (const char *if_name,
   //                       Service_Type_Map &super_map,
-  //                       CORBA::Environment &_env)
+  //                       TAO_ENV_SINGLE_ARG_DECL)
   //    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
   // Ensure that the interface type derives from its superclasses'.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index b9c8e7f296d..436b6381e6a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -173,11 +173,11 @@ type_repos (CosTrading::TypeRepository_ptr new_value)
   // @@ Seth, There is no way to propagate the exception out.
   ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   this->type_repos_ = new_value;
   // @@ What can we do even if we catch this?
   this->service_type_repos_ =
-    CosTradingRepos::ServiceTypeRepository::_narrow (new_value, ACE_TRY_ENV);
+    CosTradingRepos::ServiceTypeRepository::_narrow (new_value TAO_ENV_ARG_PARAMETER);
 }
 
 CosTradingRepos::ServiceTypeRepository_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index fae8ab289e6..a7fb0f83e10 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -29,13 +29,13 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       CORBA::Any *value = 0;
       // Retrieve the value of the property from the Property_Evaluator
       ACE_TRY
         {
-          value = this->prop_eval_.property_value (prop_index, ACE_TRY_ENV);
+          value = this->prop_eval_.property_value (prop_index TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 8ec8825635b..9904d27b106 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -45,8 +45,8 @@ query (const char *type,
        CORBA::ULong how_many,
        CosTrading::OfferSeq_out returned_offers,
        CosTrading::OfferIterator_out returned_offer_iterator,
-       CosTrading::PolicyNameSeq_out returned_limits_applied,
-       CORBA::Environment& ACE_TRY_ENV)
+       CosTrading::PolicyNameSeq_out returned_limits_applied
+       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -60,13 +60,13 @@ query (const char *type,
                    CosTrading::DuplicatePolicyName))
 {
   // Instantiate a class to help interpret query policies.
-  TAO_Policies policies (this->trader_, in_policies, ACE_TRY_ENV);
+  TAO_Policies policies (this->trader_, in_policies TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If a federated query returns to us, ignore it to prevent
   // redundant results and infinite loops.
   CosTrading::Admin::OctetSeq* request_id = 0;
-  int check = this->seen_request_id (policies, request_id, ACE_TRY_ENV);
+  int check = this->seen_request_id (policies, request_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (check)
@@ -84,7 +84,7 @@ query (const char *type,
   // If the importer has specified a starting trader, foward the
   // query.
   CosTrading::TraderName* trader_name =
-    policies.starting_trader (ACE_TRY_ENV);
+    policies.starting_trader (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (! CORBA::is_nil (link_if) && trader_name != 0)
@@ -101,8 +101,8 @@ query (const char *type,
                            how_many,
                            returned_offers,
                            returned_offer_iterator,
-                           returned_limits_applied,
-                           ACE_TRY_ENV);
+                           returned_limits_applied
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
@@ -113,7 +113,7 @@ query (const char *type,
   CosTradingRepos::ServiceTypeRepository_ptr rep =
     support_attrs.service_type_repos ();
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type, ACE_TRY_ENV);
+    rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Should throw a NO_MEMORY exception here...
@@ -133,17 +133,17 @@ query (const char *type,
   // meets those constraints.  TAO_Preference_Interpreter -- parses
   // the preference string and orders offers according to those
   // constraints.
-  TAO_Offer_Filter offer_filter (policies,
-                                 ACE_TRY_ENV);
+  TAO_Offer_Filter offer_filter (policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   TAO_Trader_Constraint_Validator validator (type_struct.in ());
   TAO_Constraint_Interpreter constr_inter (validator,
-                                           constraint,
-                                           ACE_TRY_ENV);
+                                           constraint
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   TAO_Preference_Interpreter pref_inter (validator,
-                                         preferences,
-                                         ACE_TRY_ENV);
+                                         preferences
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Try to find the map of offers of desired service type.
@@ -154,7 +154,7 @@ query (const char *type,
                          pref_inter,
                          offer_filter);
 
-  CORBA::Boolean result = policies.exact_type_match (ACE_TRY_ENV);
+  CORBA::Boolean result = policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!result)
@@ -171,8 +171,8 @@ query (const char *type,
                                  rep,
                                  constr_inter,
                                  pref_inter,
-                                 offer_filter,
-                                 ACE_TRY_ENV);
+                                 offer_filter
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -187,8 +187,8 @@ query (const char *type,
                             policies,
                             pref_inter,
                             *returned_offers.ptr (),
-                            returned_offer_iterator,
-                            ACE_TRY_ENV);
+                            returned_offer_iterator
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The following steps are only appropriate for a linked trader.
@@ -200,8 +200,8 @@ query (const char *type,
       CORBA::Boolean should_follow =
         this->retrieve_links (policies,
                               offers_returned,
-                              CosTrading::LinkNameSeq_out (links.out ()),
-                              ACE_TRY_ENV);
+                              CosTrading::LinkNameSeq_out (links.out ())
+                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (should_follow && links->length () != 0)
@@ -218,8 +218,8 @@ query (const char *type,
                                  how_many,
                                  *returned_offers.ptr (),
                                  returned_offer_iterator.ptr (),
-                                 *returned_limits_applied.ptr (),
-                                 ACE_TRY_ENV);
+                                 *returned_limits_applied.ptr ()
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -286,8 +286,8 @@ lookup_all_subtypes (const char* type,
                      CosTradingRepos::ServiceTypeRepository_ptr rep,
                      TAO_Constraint_Interpreter& constr_inter,
                      TAO_Preference_Interpreter& pref_inter,
-                     TAO_Offer_Filter& offer_filter,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     TAO_Offer_Filter& offer_filter
+                     TAO_ENV_ARG_DECL)
 {
   // BEGIN SPEC
   // The trader may return a service offer of a subtype of the "type"
@@ -308,7 +308,7 @@ lookup_all_subtypes (const char* type,
   // types with lower incarnation numbers.
   sst.incarnation (inc_num);
 
-  all_types = rep->list_types (sst, ACE_TRY_ENV);
+  all_types = rep->list_types (sst TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Scan all types inserted after the super types. If the transitive
@@ -321,8 +321,8 @@ lookup_all_subtypes (const char* type,
        i++)
     {
       // Obtain a description of the prospective type.
-      type_struct = rep->fully_describe_type (all_types[i],
-                                              ACE_TRY_ENV);
+      type_struct = rep->fully_describe_type (all_types[i]
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq&
@@ -356,8 +356,8 @@ fill_receptacles (const char* /* type */,
                   TAO_Policies& policies,
                   TAO_Preference_Interpreter& pref_inter,
                   CosTrading::OfferSeq& offers,
-                  CosTrading::OfferIterator_ptr& offer_itr,
-                  CORBA::Environment& ACE_TRY_ENV)
+                  CosTrading::OfferIterator_ptr& offer_itr
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::DuplicatePropertyName))
 {
@@ -372,13 +372,13 @@ fill_receptacles (const char* /* type */,
   // "offer_itr" will be nil.
   // END SPEC
 
-  TAO_Property_Filter prop_filter (desired_props, ACE_TRY_ENV);
+  TAO_Property_Filter prop_filter (desired_props TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // RETURNING: Calculate how many offers go into the sequence
   //  Calculate how many go into the iterator
 
-  CORBA::ULong return_card = policies.return_card (ACE_TRY_ENV);
+  CORBA::ULong return_card = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
@@ -423,9 +423,9 @@ fill_receptacles (const char* /* type */,
         this->create_offer_iterator (prop_filter);
 
       // Register it with the POA.
-      offer_itr = oi->_this (ACE_TRY_ENV);
+      offer_itr = oi->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       // @@ Seth, ACE_CHECK_RETURN (what?);
-      oi->_remove_ref (ACE_TRY_ENV);
+      oi->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (total_offers - offers_in_iterator);
 
       // Add to the iterator
@@ -492,13 +492,13 @@ CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 retrieve_links (TAO_Policies& policies,
                 CORBA::ULong offers_returned,
-                CosTrading::LinkNameSeq_out links,
-                CORBA::Environment& ACE_TRY_ENV)
+                CosTrading::LinkNameSeq_out links
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean should_follow = 0;
-  CosTrading::FollowOption follow_rule = policies.link_follow_rule (ACE_TRY_ENV);
+  CosTrading::FollowOption follow_rule = policies.link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (should_follow);
 
   // Determine whether or not a federated query is warranted. A query
@@ -507,7 +507,7 @@ retrieve_links (TAO_Policies& policies,
   if ((follow_rule == CosTrading::always ||
        (follow_rule == CosTrading::if_no_local && offers_returned == 0)))
     {
-      CORBA::ULong hc = policies.hop_count (ACE_TRY_ENV);
+      CORBA::ULong hc = policies.hop_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (hc > 0)
@@ -521,7 +521,7 @@ retrieve_links (TAO_Policies& policies,
       CosTrading::Link_ptr link_if =
         this->trader_.trading_components ().link_if ();
 
-      links = link_if->list_links (ACE_TRY_ENV);
+      links = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Determine which of the links registered with the Link
@@ -533,12 +533,12 @@ retrieve_links (TAO_Policies& policies,
         {
           // Grab the link information.
           CosTrading::Link::LinkInfo_var
-            link_info (link_if->describe_link (links[i], ACE_TRY_ENV));
+            link_info (link_if->describe_link (links[i] TAO_ENV_ARG_PARAMETER));
           ACE_CHECK_RETURN (should_follow);
 
           // Compute the link follow rule.
           CosTrading::FollowOption link_rule =
-            policies.link_follow_rule (link_info.in (), ACE_TRY_ENV);
+            policies.link_follow_rule (link_info.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (should_follow);
 
           // Determine if the link follow rule applies.
@@ -574,8 +574,8 @@ federated_query (const CosTrading::LinkNameSeq& links,
                  CORBA::ULong how_many,
                  CosTrading::OfferSeq& offers,
                  CosTrading::OfferIterator_ptr& offer_iter,
-                 CosTrading::PolicyNameSeq& limits,
-                 CORBA::Environment& ACE_TRY_ENV)
+                 CosTrading::PolicyNameSeq& limits
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -624,13 +624,13 @@ federated_query (const CosTrading::LinkNameSeq& links,
         {
           // Obtain information about the link we're traversing.
           CosTrading::Link::LinkInfo_var link_info =
-            link_interface->describe_link (links[i], ACE_TRY_ENV);
+            link_interface->describe_link (links[i] TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Set the link follow policy for the query over the link.
           policies.copy_in_follow_option (policies_to_pass,
-                                          link_info.in (),
-                                          ACE_TRY_ENV);
+                                          link_info.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosTrading::Lookup_var remote_lookup =
@@ -645,8 +645,8 @@ federated_query (const CosTrading::LinkNameSeq& links,
                                 how_many - offers.length (),
                                 CosTrading::OfferSeq_out (out_offers),
                                 CosTrading::OfferIterator_out (out_offer_iter),
-                                CosTrading::PolicyNameSeq_out (out_limits),
-                                ACE_TRY_ENV);
+                                CosTrading::PolicyNameSeq_out (out_limits)
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULong j = 0;
@@ -687,10 +687,10 @@ federated_query (const CosTrading::LinkNameSeq& links,
   this->order_merged_sequence (pref_inter, offers);
 
   // Return the collection of offer iterators.
-  offer_iter = offer_iter_collection->_this (ACE_TRY_ENV);
+  offer_iter = offer_iter_collection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  offer_iter_collection->_remove_ref (ACE_TRY_ENV);
+  offer_iter_collection->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -743,8 +743,8 @@ forward_query (const char* next_hop,
                CORBA::ULong how_many,
                CosTrading::OfferSeq_out offers,
                CosTrading::OfferIterator_out offer_itr,
-               CosTrading::PolicyNameSeq_out limits_applied,
-               CORBA::Environment& ACE_TRY_ENV)
+               CosTrading::PolicyNameSeq_out limits_applied
+               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -764,17 +764,17 @@ forward_query (const char* next_hop,
   ACE_TRY
     {
       CosTrading::Link::LinkInfo_var link_info =
-        link_interface->describe_link (next_hop, ACE_TRY_ENV);
+        link_interface->describe_link (next_hop TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosTrading::Lookup_var remote_lookup =
         CosTrading::Lookup::_duplicate (link_info->target.in ());
 
-      CORBA::Object_var us = this->_this (ACE_TRY_ENV);
+      CORBA::Object_var us = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean self_loop =
-        remote_lookup->_is_equivalent (us.in (), ACE_TRY_ENV);
+        remote_lookup->_is_equivalent (us.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (! self_loop)
@@ -788,8 +788,8 @@ forward_query (const char* next_hop,
                                 how_many,
                                 offers,
                                 offer_itr,
-                                limits_applied,
-                                ACE_TRY_ENV);
+                                limits_applied
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -802,8 +802,8 @@ forward_query (const char* next_hop,
                        how_many,
                        offers,
                        offer_itr,
-                       limits_applied,
-                       ACE_TRY_ENV);
+                       limits_applied
+                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -822,21 +822,21 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 seen_request_id (TAO_Policies& policies,
-                 CosTrading::Admin::OctetSeq*& seq,
-                 CORBA::Environment& ACE_TRY_ENV)
+                 CosTrading::Admin::OctetSeq*& seq
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean return_value = 0;
 
-  seq = policies.request_id (ACE_TRY_ENV);
+  seq = policies.request_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (seq == 0)
     {
       CosTrading::Admin_ptr admin_if =
         this->trader_.trading_components ().admin_if ();
-      seq = admin_if->request_id_stem (ACE_TRY_ENV);
+      seq = admin_if->request_id_stem (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (1);
     }
   else
@@ -898,8 +898,8 @@ CosTrading::OfferId
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 _cxx_export (CORBA::Object_ptr reference,
              const char *type,
-             const CosTrading::PropertySeq &properties,
-             CORBA::Environment& ACE_TRY_ENV)
+             const CosTrading::PropertySeq &properties
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::InvalidObjectRef,
                   CosTrading::IllegalServiceType,
@@ -927,7 +927,7 @@ _cxx_export (CORBA::Object_ptr reference,
   // Yank our friend, the type struct, and confirm that the given
   // properties match the type definition.
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type, ACE_TRY_ENV);
+    rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Oops the type is masked, we shouldn't let exporters know the type
@@ -937,7 +937,7 @@ _cxx_export (CORBA::Object_ptr reference,
 
   // TAO-specific way to determine if an object is derived from or is
   // an interface type.
-  int check = (! reference->_is_a (type_struct->if_name, ACE_TRY_ENV));
+  int check = (! reference->_is_a (type_struct->if_name TAO_ENV_ARG_PARAMETER));
   ACE_CHECK_RETURN (0);
   if (check)
     ACE_THROW_RETURN (CosTrading::Register::
@@ -945,7 +945,7 @@ _cxx_export (CORBA::Object_ptr reference,
 
   // Validate that the properties defined for this offer are correct
   // to their types and strength.
-  this->validate_properties (type, type_struct.ptr (), properties, ACE_TRY_ENV);
+  this->validate_properties (type, type_struct.ptr (), properties TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // CORBA::ULong plength = properties.length ();
@@ -975,8 +975,8 @@ _cxx_export (CORBA::Object_ptr reference,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw (const char *id,
-          CORBA::Environment& ACE_TRY_ENV)
+withdraw (const char *id
+          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -984,14 +984,14 @@ withdraw (const char *id,
 {
   // Get service type map.
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
-  offer_database.remove_offer ((CosTrading::OfferId) id, ACE_TRY_ENV);
+  offer_database.remove_offer ((CosTrading::OfferId) id TAO_ENV_ARG_PARAMETER);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register::OfferInfo *
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-describe (const char *id,
-          CORBA::Environment& ACE_TRY_ENV)
+describe (const char *id
+          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1003,7 +1003,7 @@ describe (const char *id,
 
   // Perform a lookup to find the offer.
   CosTrading::Offer* offer =
-    offer_database.lookup_offer ((CosTrading::OfferId) id, type, ACE_TRY_ENV);
+    offer_database.lookup_offer ((CosTrading::OfferId) id, type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CosTrading::Register::OfferInfo *offer_info = 0;
@@ -1026,8 +1026,8 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify (const char *id,
         const CosTrading::PropertyNameSeq& del_list,
-        const CosTrading::PropertySeq& modify_list,
-        CORBA::Environment& ACE_TRY_ENV)
+        const CosTrading::PropertySeq& modify_list
+        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented,
                   CosTrading::IllegalOfferId,
@@ -1043,7 +1043,7 @@ modify (const char *id,
 {
   // Throw an exception if the trader is not configured
   // to support properties modification.
-  int check =  (! this->supports_modifiable_properties (ACE_TRY_ENV));
+  int check =  (! this->supports_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
 
   if (check)
@@ -1057,22 +1057,22 @@ modify (const char *id,
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
 
   CosTrading::Offer* offer = offer_database.
-    lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type, ACE_TRY_ENV);
+    lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (offer != 0)
     {
       // Yank our friend, the type struct.
       CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-        rep->fully_describe_type (type, ACE_TRY_ENV);
+        rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       TAO_Offer_Modifier offer_mod (type, type_struct.in (), offer);
 
       // Delete, add, and change properties of the offer.
-      offer_mod.delete_properties (del_list, ACE_TRY_ENV);
+      offer_mod.delete_properties (del_list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      offer_mod.merge_properties (modify_list, ACE_TRY_ENV);
+      offer_mod.merge_properties (modify_list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Alter our reference to the offer. We do this last, since the
@@ -1086,8 +1086,8 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_using_constraint (const char *type,
-                           const char *constr,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           const char *constr
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -1104,7 +1104,7 @@ withdraw_using_constraint (const char *type,
 
   // Retrieve the type struct
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type, ACE_TRY_ENV);
+    rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Try to find the map of offers of desired service type.
@@ -1123,7 +1123,7 @@ withdraw_using_constraint (const char *type,
 #endif /* _MSC_VER */
 
     TAO_Trader_Constraint_Validator validator (type_struct.in ());
-    TAO_Constraint_Interpreter constr_inter (validator, constr, ACE_TRY_ENV);
+    TAO_Constraint_Interpreter constr_inter (validator, constr TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     while (offer_iter.has_more_offers ())
@@ -1146,7 +1146,7 @@ withdraw_using_constraint (const char *type,
           char* offer_id = 0;
 
           ids.dequeue_head (offer_id);
-          offer_database.remove_offer (offer_id, ACE_TRY_ENV);
+          offer_database.remove_offer (offer_id TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           CORBA::string_free (offer_id);
         }
@@ -1158,8 +1158,8 @@ withdraw_using_constraint (const char *type,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register_ptr
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-resolve (const CosTrading::TraderName &name,
-         CORBA::Environment& ACE_TRY_ENV)
+resolve (const CosTrading::TraderName &name
+         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::IllegalTraderName,
                   CosTrading::Register::UnknownTraderName,
@@ -1184,11 +1184,11 @@ resolve (const CosTrading::TraderName &name,
   ACE_TRY
     {
       // Ensure that the link to the next trader exists.
-      link_info = link_if->describe_link (name[0], ACE_TRY_ENV);
+      link_info = link_if->describe_link (name[0] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       remote_reg =
-        CosTrading::Register::_narrow (link_info->target_reg.in (), ACE_TRY_ENV);
+        CosTrading::Register::_narrow (link_info->target_reg.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1212,7 +1212,7 @@ resolve (const CosTrading::TraderName &name,
       for (int i = trader_name.length () - 1; i >= 0; i--)
         trader_name[i] = name[i + 1];
 
-      return_value = remote_reg->resolve (trader_name, ACE_TRY_ENV);
+      return_value = remote_reg->resolve (trader_name TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CosTrading::Register::_nil ());
     }
 
@@ -1224,8 +1224,8 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 validate_properties (const char* type,
                      const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-                     const CosTrading::PropertySeq& properties,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     const CosTrading::PropertySeq& properties
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::PropertyTypeMismatch,
                   CosTrading::ReadonlyDynamicProperty,
@@ -1235,7 +1235,7 @@ validate_properties (const char* type,
   CORBA::ULong length = properties.length ();
   const CosTradingRepos::ServiceTypeRepository::PropStructSeq&
     prop_types = type_struct->props;
-  TAO_Property_Evaluator_By_Name prop_eval (properties, ACE_TRY_ENV);
+  TAO_Property_Evaluator_By_Name prop_eval (properties TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Perform property validation
@@ -1260,8 +1260,8 @@ validate_properties (const char* type,
       else
         {
           int check =
-            (! prop_type->equal (prop_struct.value_type.in (),
-                                 ACE_TRY_ENV));
+            (! prop_type->equal (prop_struct.value_type.in ()
+                                 TAO_ENV_ARG_PARAMETER));
           ACE_CHECK;
           if (check)
             {
@@ -1343,7 +1343,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void)
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq *
-TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment&)
+TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
@@ -1365,8 +1365,8 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment&)
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_def_search_card (CORBA::ULong value,
-                     CORBA::Environment& )
+set_def_search_card (CORBA::ULong value
+                     TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1379,8 +1379,8 @@ set_def_search_card (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_search_card (CORBA::ULong value,
-                     CORBA::Environment& )
+set_max_search_card (CORBA::ULong value
+                     TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1393,8 +1393,8 @@ set_max_search_card (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_def_match_card (CORBA::ULong value,
-                    CORBA::Environment& )
+set_def_match_card (CORBA::ULong value
+                    TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1407,8 +1407,8 @@ set_def_match_card (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_match_card (CORBA::ULong value,
-                    CORBA::Environment& )
+set_max_match_card (CORBA::ULong value
+                    TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1421,8 +1421,8 @@ set_max_match_card (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_def_return_card (CORBA::ULong value,
-                     CORBA::Environment& )
+set_def_return_card (CORBA::ULong value
+                     TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1435,8 +1435,8 @@ set_def_return_card (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_return_card (CORBA::ULong value,
-                     CORBA::Environment& )
+set_max_return_card (CORBA::ULong value
+                     TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1449,8 +1449,8 @@ set_max_return_card (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_list (CORBA::ULong value,
-              CORBA::Environment& )
+set_max_list (CORBA::ULong value
+              TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1463,8 +1463,8 @@ set_max_list (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_supports_modifiable_properties (CORBA::Boolean value,
-                                    CORBA::Environment& )
+set_supports_modifiable_properties (CORBA::Boolean value
+                                    TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1477,8 +1477,8 @@ set_supports_modifiable_properties (CORBA::Boolean value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_supports_dynamic_properties (CORBA::Boolean value,
-                                 CORBA::Environment& )
+set_supports_dynamic_properties (CORBA::Boolean value
+                                 TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1491,8 +1491,8 @@ set_supports_dynamic_properties (CORBA::Boolean value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_supports_proxy_offers (CORBA::Boolean value,
-                           CORBA::Environment& )
+set_supports_proxy_offers (CORBA::Boolean value
+                           TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1505,8 +1505,8 @@ set_supports_proxy_offers (CORBA::Boolean value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_def_hop_count (CORBA::ULong value,
-                   CORBA::Environment& )
+set_def_hop_count (CORBA::ULong value
+                   TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1519,8 +1519,8 @@ set_def_hop_count (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_hop_count (CORBA::ULong value,
-                   CORBA::Environment& )
+set_max_hop_count (CORBA::ULong value
+                   TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1533,8 +1533,8 @@ set_max_hop_count (CORBA::ULong value,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_def_follow_policy (CosTrading::FollowOption policy,
-                       CORBA::Environment& )
+set_def_follow_policy (CosTrading::FollowOption policy
+                       TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1547,8 +1547,8 @@ set_def_follow_policy (CosTrading::FollowOption policy,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_follow_policy (CosTrading::FollowOption policy,
-                       CORBA::Environment& )
+set_max_follow_policy (CosTrading::FollowOption policy
+                       TAO_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1561,8 +1561,8 @@ set_max_follow_policy (CosTrading::FollowOption policy,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_max_link_follow_policy (CosTrading::FollowOption policy,
-                            CORBA::Environment&)
+set_max_link_follow_policy (CosTrading::FollowOption policy
+                            TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1575,8 +1575,8 @@ set_max_link_follow_policy (CosTrading::FollowOption policy,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::TypeRepository_ptr
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_type_repos (CosTrading::TypeRepository_ptr repository,
-                CORBA::Environment&)
+set_type_repos (CosTrading::TypeRepository_ptr repository
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::TypeRepository_ptr return_value =
@@ -1589,8 +1589,8 @@ set_type_repos (CosTrading::TypeRepository_ptr repository,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq*
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
-                       CORBA::Environment&)
+set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
+                       TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_,
@@ -1604,8 +1604,8 @@ void
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_offers (CORBA::ULong how_many,
              CosTrading::OfferIdSeq_out ids,
-             CosTrading::OfferIdIterator_out id_itr,
-             CORBA::Environment& ACE_TRY_ENV)
+             CosTrading::OfferIdIterator_out id_itr
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented))
 {
   // This method only applies when the register interface is implemented
@@ -1618,14 +1618,14 @@ list_offers (CORBA::ULong how_many,
   id_itr = CosTrading::OfferIdIterator::_nil ();
   if (how_many > 0)
     {
-      int check = offer_id_iter->next_n (how_many, ids, ACE_TRY_ENV);
+      int check = offer_id_iter->next_n (how_many, ids TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (check == 1)
         {
-          id_itr = offer_id_iter->_this (ACE_TRY_ENV);
+          id_itr = offer_id_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          offer_id_iter->_remove_ref (ACE_TRY_ENV);
+          offer_id_iter->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -1640,8 +1640,8 @@ void
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq_out,
-              CosTrading::OfferIdIterator_out,
-              CORBA::Environment& ACE_TRY_ENV)
+              CosTrading::OfferIdIterator_out
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented))
 {
@@ -1668,8 +1668,8 @@ TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
 add_link (const char *name,
           CosTrading::Lookup_ptr target,
           CosTrading::FollowOption def_pass_on_follow_rule,
-          CosTrading::FollowOption limiting_follow_rule,
-          CORBA::Environment& ACE_TRY_ENV)
+          CosTrading::FollowOption limiting_follow_rule
+          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::DuplicateLinkName,
@@ -1699,7 +1699,7 @@ add_link (const char *name,
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
   CosTrading::FollowOption follow_policy =
-    this->max_link_follow_policy (ACE_TRY_ENV);
+    this->max_link_follow_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   if (limiting_follow_rule < follow_policy)
     ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
@@ -1721,8 +1721,8 @@ add_link (const char *name,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-remove_link (const char *name,
-             CORBA::Environment& ACE_TRY_ENV)
+remove_link (const char *name
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::UnknownLinkName))
@@ -1742,8 +1742,8 @@ remove_link (const char *name,
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Link::LinkInfo *
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name,
-                                               CORBA::Environment& ACE_TRY_ENV)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
+                                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName))
@@ -1777,7 +1777,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name,
   // This avoids the nested upcall that would occur were we to invoke
   // this method in the add_link method.
 
-  new_link_info->target_reg = old_link_info.target->register_if (ACE_TRY_ENV);
+  new_link_info->target_reg = old_link_info.target->register_if (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (new_link_info);
 
   // return the link information for this link name.
@@ -1786,7 +1786,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name,
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::LinkNameSeq*
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (CORBA::Environment&)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate space for the link names.
@@ -1809,8 +1809,8 @@ void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify_link (const char *name,
              CosTrading::FollowOption def_pass_on_follow_rule,
-             CosTrading::FollowOption limiting_follow_rule,
-             CORBA::Environment& ACE_TRY_ENV)
+             CosTrading::FollowOption limiting_follow_rule
+             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName,
                    CosTrading::Link::DefaultFollowTooPermissive,
@@ -1835,7 +1835,7 @@ modify_link (const char *name,
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
   CosTrading::FollowOption follow_policy =
-    this->max_link_follow_policy (ACE_TRY_ENV);
+    this->max_link_follow_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (limiting_follow_rule < follow_policy)
@@ -1870,8 +1870,8 @@ export_proxy (CosTrading::Lookup_ptr,
               const CosTrading::PropertySeq&,
               CORBA::Boolean,
               const char *,
-              const CosTrading::PolicySeq&,
-              CORBA::Environment& ACE_TRY_ENV)
+              const CosTrading::PolicySeq&
+              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -1890,8 +1890,8 @@ export_proxy (CosTrading::Lookup_ptr,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw_proxy (const char *,
-                CORBA::Environment& ACE_TRY_ENV)
+withdraw_proxy (const char *
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1903,8 +1903,8 @@ withdraw_proxy (const char *,
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Proxy::ProxyInfo *
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-describe_proxy (const char *,
-                CORBA::Environment& ACE_TRY_ENV)
+describe_proxy (const char *
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1918,8 +1918,8 @@ void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
                 CosTrading::OfferIdSeq*&,
-                CosTrading::OfferIdIterator_ptr&,
-                CORBA::Environment& ACE_TRY_ENV)
+                CosTrading::OfferIdIterator_ptr&
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index bf7c9e1e85c..34d492776d7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -74,8 +74,8 @@ public:
            CORBA::ULong how_many,
            CosTrading::OfferSeq_out offers,
            CosTrading::OfferIterator_out offer_itr,
-           CosTrading::PolicyNameSeq_out limits_applied,
-           CORBA::Environment& env)
+           CosTrading::PolicyNameSeq_out limits_applied
+           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -179,8 +179,8 @@ private:
                             CosTradingRepos::ServiceTypeRepository_ptr rep,
                             TAO_Constraint_Interpreter& constr_inter,
                             TAO_Preference_Interpreter& pref_inter,
-                            TAO_Offer_Filter& offer_filter,
-                            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                            TAO_Offer_Filter& offer_filter
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Traverse the type hierarchy to pull the matching offers from all
   // subtypes of the root type.
 
@@ -198,8 +198,8 @@ private:
                         TAO_Policies& policies,
                         TAO_Preference_Interpreter& pref_inter,
                         CosTrading::OfferSeq& offers,
-                        CosTrading::OfferIterator_ptr& offer_itr,
-                        CORBA::Environment& env)
+                        CosTrading::OfferIterator_ptr& offer_itr
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                     CosTrading::DuplicatePropertyName));
   // This method takes the list of ordered offers and places a number
@@ -217,8 +217,8 @@ private:
                       CORBA::ULong how_many,
                       CosTrading::OfferSeq_out offers,
                       CosTrading::OfferIterator_out offer_itr,
-                      CosTrading::PolicyNameSeq_out limits_applied,
-                      CORBA::Environment& env)
+                      CosTrading::PolicyNameSeq_out limits_applied
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -235,8 +235,8 @@ private:
 
   CORBA::Boolean retrieve_links (TAO_Policies& policies,
                                  CORBA::ULong offer_returned,
-                                 CosTrading::LinkNameSeq_out links,
-                                 CORBA::Environment& _env)
+                                 CosTrading::LinkNameSeq_out links
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
   // Assemble a sequence of links that the federate_query method
@@ -255,8 +255,8 @@ private:
                         CORBA::ULong how_many,
                         CosTrading::OfferSeq& offers,
                         CosTrading::OfferIterator_ptr& offer_itr,
-                        CosTrading::PolicyNameSeq& limits_applied,
-                        CORBA::Environment& env)
+                        CosTrading::PolicyNameSeq& limits_applied
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -277,8 +277,8 @@ private:
   // Merge the results from a federated query into the collected results.
 
   CORBA::Boolean seen_request_id (TAO_Policies& policies,
-                                  CosTrading::Admin::OctetSeq*& seq,
-                                  CORBA::Environment& _env)
+                                  CosTrading::Admin::OctetSeq*& seq
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -321,8 +321,8 @@ public:
 
   virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
                                            const char *type,
-                                           const CosTrading::PropertySeq& properties,
-                                           CORBA::Environment& _env)
+                                           const CosTrading::PropertySeq& properties
+                                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Register::InvalidObjectRef,
                     CosTrading::IllegalServiceType,
@@ -388,7 +388,7 @@ public:
   // parameter, the DuplicatePropertyName exception is raised.
   // END SPEC
 
-  virtual void withdraw (const char *id, CORBA::Environment& _env)
+  virtual void withdraw (const char *id TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -408,8 +408,8 @@ public:
   // END SPEC
 
   virtual CosTrading::Register::OfferInfo*
-    describe (const char * id,
-              CORBA::Environment& _env)
+    describe (const char * id
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -431,8 +431,8 @@ public:
 
   virtual void modify (const char * id,
                        const CosTrading::PropertyNameSeq& del_list,
-                       const CosTrading::PropertySeq& modify_list,
-                       CORBA::Environment& _env)
+                       const CosTrading::PropertySeq& modify_list
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -500,8 +500,8 @@ public:
   // END SPEC
 
   virtual void withdraw_using_constraint (const char *type,
-                                          const char *constr,
-                                          CORBA::Environment& _env)
+                                          const char *constr
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -532,8 +532,8 @@ public:
   // END SPEC
 
   virtual CosTrading::Register_ptr
-    resolve (const CosTrading::TraderName &name,
-             CORBA::Environment& _env)
+    resolve (const CosTrading::TraderName &name
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::IllegalTraderName,
                      CosTrading::Register::UnknownTraderName,
@@ -566,8 +566,8 @@ public:
 
   void validate_properties (const char* type,
                             const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
-                            const CosTrading::PropertySeq& properties,
-                            CORBA::Environment& _env)
+                            const CosTrading::PropertySeq& properties
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::PropertyTypeMismatch,
                      CosTrading::ReadonlyDynamicProperty,
@@ -622,94 +622,94 @@ public:
 
   // = Importing Parameters (used by the Lookup Interface)
 
-  virtual CORBA::ULong set_def_search_card (CORBA::ULong value,
-                                            CORBA::Environment &)
+  virtual CORBA::ULong set_def_search_card (CORBA::ULong value
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_search_card (CORBA::ULong value,
-                                            CORBA::Environment &)
+  virtual CORBA::ULong set_max_search_card (CORBA::ULong value
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // search card is the cardinality of the offers searched for
   // constraint compliance.
 
 
-  virtual CORBA::ULong set_def_match_card (CORBA::ULong value,
-                                            CORBA::Environment &)
+  virtual CORBA::ULong set_def_match_card (CORBA::ULong value
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_match_card (CORBA::ULong value,
-                                            CORBA::Environment &)
+  virtual CORBA::ULong set_max_match_card (CORBA::ULong value
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // match card is the cardinality of offers found compliant with the
   // constraints.
 
-  virtual CORBA::ULong set_def_return_card (CORBA::ULong value,
-                                            CORBA::Environment &)
+  virtual CORBA::ULong set_def_return_card (CORBA::ULong value
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_return_card (CORBA::ULong value,
-                                            CORBA::Environment &)
+  virtual CORBA::ULong set_max_return_card (CORBA::ULong value
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // return card is the cardinality of the offers returned from
   // Lookup.
 
-  virtual CORBA::ULong set_max_list (CORBA::ULong value,
-                                     CORBA::Environment &)
+  virtual CORBA::ULong set_max_list (CORBA::ULong value
+                                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_modifiable_properties (CORBA::Boolean value,
-                                        CORBA::Environment &)
+    set_supports_modifiable_properties (CORBA::Boolean value
+                                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_dynamic_properties (CORBA::Boolean value,
-                                     CORBA::Environment &)
+    set_supports_dynamic_properties (CORBA::Boolean value
+                                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
-    set_supports_proxy_offers (CORBA::Boolean value,
-                               CORBA::Environment &)
+    set_supports_proxy_offers (CORBA::Boolean value
+                               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Types of offers available for consideration. Ween out those
   // offers with modifiable properties
 
   // = Link Interface parameters
 
-  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value,
-                                          CORBA::Environment &)
+  virtual CORBA::ULong set_def_hop_count (CORBA::ULong value
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value,
-                                          CORBA::Environment &)
+  virtual CORBA::ULong set_max_hop_count (CORBA::ULong value
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption
-    set_def_follow_policy (CosTrading::FollowOption policy,
-                           CORBA::Environment &)
+    set_def_follow_policy (CosTrading::FollowOption policy
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
-    set_max_follow_policy (CosTrading::FollowOption policy,
-                           CORBA::Environment &)
+    set_max_follow_policy (CosTrading::FollowOption policy
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
-    set_max_link_follow_policy (CosTrading::FollowOption policy,
-                                CORBA::Environment &)
+    set_max_link_follow_policy (CosTrading::FollowOption policy
+                                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Set Type Repository
 
   virtual CosTrading::TypeRepository_ptr
-    set_type_repos (CosTrading::TypeRepository_ptr repository,
-                    CORBA::Environment &)
+    set_type_repos (CosTrading::TypeRepository_ptr repository
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
-    request_id_stem (CORBA::Environment &)
+    request_id_stem (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
-    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem,
-                         CORBA::Environment &)
+    set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
+                         TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void list_offers (CORBA::ULong how_many,
                             CosTrading::OfferIdSeq_out ids,
-                            CosTrading::OfferIdIterator_out id_itr,
-                            CORBA::Environment& env)
+                            CosTrading::OfferIdIterator_out id_itr
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -734,8 +734,8 @@ public:
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq_out,
-                             CosTrading::OfferIdIterator_out,
-                             CORBA::Environment& env)
+                             CosTrading::OfferIdIterator_out
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -775,8 +775,8 @@ public:
   virtual void add_link (const char *name,
                          CosTrading::Lookup_ptr target,
                          CosTrading::FollowOption def_pass_on_follow_rule,
-                         CosTrading::FollowOption limiting_follow_rule,
-                         CORBA::Environment& _env)
+                         CosTrading::FollowOption limiting_follow_rule
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::DuplicateLinkName,
@@ -824,8 +824,8 @@ public:
   // creation of the link.
   // END SPEC
 
-  virtual void remove_link (const char *name,
-                            CORBA::Environment& _env)
+  virtual void remove_link (const char *name
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -841,8 +841,8 @@ public:
   // not in the trader.
   // END SPEC
 
-  virtual CosTrading::Link::LinkInfo* describe_link (const char *name,
-                                                     CORBA::Environment&)
+  virtual CosTrading::Link::LinkInfo* describe_link (const char *name
+                                                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -870,7 +870,7 @@ public:
   // state.
   // END SPEC
 
-  virtual CosTrading::LinkNameSeq* list_links (CORBA::Environment &)
+  virtual CosTrading::LinkNameSeq* list_links (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -882,8 +882,8 @@ public:
 
   virtual void modify_link (const char *name,
                             CosTrading::FollowOption def_pass_on_follow_rule,
-                            CosTrading::FollowOption limiting_follow_rule,
-                            CORBA::Environment& _env)
+                            CosTrading::FollowOption limiting_follow_rule
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName,
                     CosTrading::Link::DefaultFollowTooPermissive,
@@ -956,8 +956,8 @@ public:
                   const CosTrading::PropertySeq &,
                   CORBA::Boolean if_match_all,
                   const char *,
-                  const CosTrading::PolicySeq &,
-                  CORBA::Environment& _env)
+                  const CosTrading::PolicySeq &
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -970,16 +970,16 @@ public:
                     CosTrading::DuplicatePropertyName,
                     CosTrading::DuplicatePolicyName));
 
-  virtual void withdraw_proxy (const char *,
-                               CORBA::Environment& _env)
+  virtual void withdraw_proxy (const char *
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
                     CosTrading::Proxy::NotProxyOfferId));
 
   virtual CosTrading::Proxy::ProxyInfo *
-  describe_proxy (const char *,
-                  CORBA::Environment& _env)
+  describe_proxy (const char *
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
@@ -989,8 +989,8 @@ public:
 
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq *&,
-                             CosTrading::OfferIdIterator_ptr &,
-                             CORBA::Environment& env)
+                             CosTrading::OfferIdIterator_ptr &
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::NotImplemented));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index e97ee08d360..b452b289d20 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -26,9 +26,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (lookup,
                (TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().lookup_if (lookup->_this (ACE_TRY_ENV));
+      this->trading_components ().lookup_if (lookup->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      lookup->_remove_ref (ACE_TRY_ENV);
+      lookup->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[LOOKUP_IF] = lookup;
@@ -40,9 +40,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (reg,
                (TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().register_if (reg->_this (ACE_TRY_ENV));
+      this->trading_components ().register_if (reg->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      reg->_remove_ref (ACE_TRY_ENV);
+      reg->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[REGISTER_IF] = reg;
@@ -54,9 +54,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (admin,
                (TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().admin_if (admin->_this (ACE_TRY_ENV));
+      this->trading_components ().admin_if (admin->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      admin->_remove_ref (ACE_TRY_ENV);
+      admin->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[ADMIN_IF] = admin;
@@ -68,9 +68,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (proxy,
                (TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().proxy_if (proxy->_this (ACE_TRY_ENV));
+      this->trading_components ().proxy_if (proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      proxy->_remove_ref (ACE_TRY_ENV);
+      proxy->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[PROXY_IF] = proxy;
@@ -82,9 +82,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (link,
                (TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().link_if (link->_this (ACE_TRY_ENV));
+      this->trading_components ().link_if (link->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      link->_remove_ref (ACE_TRY_ENV);
+      link->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[LINK_IF] = link;
@@ -105,14 +105,14 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
           ACE_TRY
             {
               PortableServer::POA_var poa =
-                this->ifs_[i]->_default_POA (ACE_TRY_ENV);
+                this->ifs_[i]->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               PortableServer::ObjectId_var id =
-                poa->servant_to_id (this->ifs_[i], ACE_TRY_ENV);
+                poa->servant_to_id (this->ifs_[i] TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              poa->deactivate_object (id.in (), ACE_TRY_ENV);
+              poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -146,35 +146,35 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 }
 
 template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::lookup_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::register_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::admin_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::proxy_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (CORBA::Environment&)
+TAO_Trader_Components<IF>::link_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
@@ -187,28 +187,28 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (CORBA::Environment&)
+TAO_Support_Attributes<IF>::supports_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (CORBA::Environment&)
+TAO_Support_Attributes<IF>::supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (CORBA::Environment&)
+TAO_Support_Attributes<IF>::supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_proxy_offers ();
 }
 
 template <class IF> CosTrading::TypeRepository_ptr
-TAO_Support_Attributes<IF>::type_repos (CORBA::Environment& )
+TAO_Support_Attributes<IF>::type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
@@ -222,77 +222,77 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (CORBA::Environment&)
+TAO_Import_Attributes<IF>::def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (CORBA::Environment&)
+TAO_Import_Attributes<IF>::max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_follow_policy ();
@@ -306,7 +306,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (CORBA::Environment &)
+TAO_Link_Attributes<IF>::max_link_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_link_follow_policy ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 8264d00775a..9ab03d4f1c8 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -230,10 +230,10 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
       CORBA::TypeCode_var type = value.type ();
 
       // @@ Seth, this will not work on platforms using environment variable.
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
-      if (type->equal (CosTradingDynamic::_tc_DynamicProp,
-                       ACE_TRY_ENV))
+      if (type->equal (CosTradingDynamic::_tc_DynamicProp
+                       TAO_ENV_ARG_PARAMETER))
         return_value = 1;
     }
 
@@ -241,8 +241,8 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
 }
 
 CORBA::Any*
-TAO_Property_Evaluator::property_value (int index,
-                                        CORBA::Environment& ACE_TRY_ENV)
+TAO_Property_Evaluator::property_value (int index
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* prop_val = 0;
@@ -282,7 +282,7 @@ TAO_Property_Evaluator::property_value (int index,
           ACE_TRY
             {
               // Retrieve the value of the dynamic property.
-              prop_val = dp_eval->evalDP(name, type, info, ACE_TRY_ENV);
+              prop_val = dp_eval->evalDP(name, type, info TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (this->dp_cache_ != 0)
@@ -325,8 +325,8 @@ TAO_Property_Evaluator::property_type (int index)
 }
 
 TAO_Property_Evaluator_By_Name::
-TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
-                                CORBA::Environment& ACE_TRY_ENV,
+TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
+                                TAO_ENV_ARG_DECL,
                                 CORBA::Boolean supports_dp)
   ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                    CosTrading::IllegalPropertyName))
@@ -377,8 +377,8 @@ is_dynamic_property(const char* property_name)
 }
 
 CORBA::Any*
-TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
-                                                CORBA::Environment& ACE_TRY_ENV)
+TAO_Property_Evaluator_By_Name::property_value (const char* property_name
+                                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   int index = 0;
@@ -390,8 +390,8 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name,
   if (this->table_.find (prop_name, index) == 0)
     {
       prop_value =
-        this->TAO_Property_Evaluator::property_value (index,
-                                                      ACE_TRY_ENV);
+        this->TAO_Property_Evaluator::property_value (index
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -447,12 +447,12 @@ construct_dynamic_prop (const char* name,
   if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // Seth, we need a way to either propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
-      this->prop_ = this->_this (ACE_TRY_ENV);
+      this->prop_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      this->_remove_ref (ACE_TRY_ENV);
+      this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -472,17 +472,17 @@ TAO_Dynamic_Property::destroy (void)
   if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // @@ Seth, we need a way to propagate exceptions out.
-      ACE_DECLARE_NEW_CORBA_ENV;
-      PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+      TAO_ENV_DECLARE_NEW_ENV;
+      PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this,
-                            ACE_TRY_ENV);
+        poa->servant_to_id (this
+                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      poa->deactivate_object (id.in (),
-                              ACE_TRY_ENV);
+      poa->deactivate_object (id.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -503,8 +503,8 @@ const char* TAO_Policies::POLICY_NAMES[] =
 };
 
 TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
-                            const CosTrading::PolicySeq& policies,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            const CosTrading::PolicySeq& policies
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                   CosTrading::DuplicatePolicyName))
   : trader_ (trader)
@@ -572,8 +572,8 @@ TAO_Policies::~TAO_Policies (void)
 }
 
 CORBA::ULong
-TAO_Policies::ulong_prop (POLICY_TYPE pol,
-                          CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::ulong_prop (POLICY_TYPE pol
+                          TAO_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::ULong return_value = 0, max_value = 0;
@@ -611,7 +611,7 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol,
       const CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong, ACE_TRY_ENV);
+      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (!equal_ulong)
@@ -628,29 +628,29 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol,
 }
 
 CORBA::ULong
-TAO_Policies::search_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::search_card (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (SEARCH_CARD, ACE_TRY_ENV);
+  return this->ulong_prop (SEARCH_CARD TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
-TAO_Policies::match_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::match_card (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (MATCH_CARD, ACE_TRY_ENV);
+  return this->ulong_prop (MATCH_CARD TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
-TAO_Policies::return_card (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::return_card (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (RETURN_CARD, ACE_TRY_ENV);
+  return this->ulong_prop (RETURN_CARD TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Policies::boolean_prop (POLICY_TYPE pol,
-                            CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::boolean_prop (POLICY_TYPE pol
+                            TAO_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean def_value = 1,
@@ -683,7 +683,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol,
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_boolean =
-        type->equal (CORBA::_tc_boolean, ACE_TRY_ENV);
+        type->equal (CORBA::_tc_boolean TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (!equal_boolean)
@@ -704,36 +704,36 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol,
 
 
 CORBA::Boolean
-TAO_Policies::use_modifiable_properties (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES, ACE_TRY_ENV);
+  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Policies::use_dynamic_properties (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_DYNAMIC_PROPERTIES, ACE_TRY_ENV);
+  return this->boolean_prop (USE_DYNAMIC_PROPERTIES TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Policies::use_proxy_offers (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_PROXY_OFFERS, ACE_TRY_ENV);
+  return this->boolean_prop (USE_PROXY_OFFERS TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Policies::exact_type_match (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (EXACT_TYPE_MATCH, ACE_TRY_ENV);
+  return this->boolean_prop (EXACT_TYPE_MATCH TAO_ENV_ARG_PARAMETER);
 }
 
 
 CosTrading::TraderName*
-TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -746,11 +746,11 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_tradername =
-        type->equal (CosTrading::_tc_TraderName, ACE_TRY_ENV);
+        type->equal (CosTrading::_tc_TraderName TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (trader_name);
 
       CORBA::Boolean equal_linknameseq =
-        type->equal (CosTrading::_tc_LinkNameSeq, ACE_TRY_ENV);
+        type->equal (CosTrading::_tc_LinkNameSeq TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (trader_name);
 
       if (!equal_tradername ||
@@ -765,7 +765,7 @@ TAO_Policies::starting_trader (CORBA::Environment& ACE_TRY_ENV) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::FollowOption return_value =
@@ -782,7 +782,7 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
 
       // Extract the link follow rule
       CORBA::Boolean type_equal =
-        type->equal (CosTrading::_tc_FollowOption, ACE_TRY_ENV);
+        type->equal (CosTrading::_tc_FollowOption TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (!type_equal)
@@ -799,8 +799,8 @@ TAO_Policies::link_follow_rule (CORBA::Environment& ACE_TRY_ENV) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
-                                CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
+                                TAO_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue,
                    CosTrading::Link::IllegalLinkName,
@@ -814,7 +814,7 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
 
   // If not defined defaults to trader.def_link_follow_rule
   CosTrading::FollowOption query_link_follow_rule =
-    this->link_follow_rule (ACE_TRY_ENV);
+    this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (return_value);
 
   return_value = (query_link_follow_rule < trader_max_follow_policy)
@@ -826,14 +826,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
 }
 
 CORBA::ULong
-TAO_Policies::hop_count (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::hop_count (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (HOP_COUNT, ACE_TRY_ENV);
+  return this->ulong_prop (HOP_COUNT TAO_ENV_ARG_PARAMETER);
 }
 
 CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
+TAO_Policies::request_id (TAO_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::Admin::OctetSeq* request_id = 0;
@@ -845,7 +845,7 @@ TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_octetseq =
-        type->equal (CosTrading::Admin::_tc_OctetSeq, ACE_TRY_ENV);
+        type->equal (CosTrading::Admin::_tc_OctetSeq TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (request_id);
 
       if (!equal_octetseq)
@@ -861,8 +861,8 @@ TAO_Policies::request_id (CORBA::Environment& ACE_TRY_ENV) const
 void
 TAO_Policies::
 copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
-                       const CosTrading::Link::LinkInfo& link_info,
-                       CORBA::Environment& ACE_TRY_ENV) const
+                       const CosTrading::Link::LinkInfo& link_info
+                       TAO_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -873,7 +873,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
   if (this->policies_[LINK_FOLLOW_RULE] != 0)
     {
       CosTrading::FollowOption query_link_follow_rule =
-        this->link_follow_rule (ACE_TRY_ENV);
+        this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       follow_option = (CosTrading::FollowOption)
@@ -943,9 +943,9 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq,
       if (i == HOP_COUNT)
         {
           // @@ Seth, Same thing here, are you trying to catch the exception??? (and forget about it?)
-          CORBA::Environment env;
+          TAO_ENV_DECLARE_NEW_ENV;
           new_policy.name = POLICY_NAMES[HOP_COUNT];
-          new_policy.value <<= this->hop_count (env) - 1;
+          new_policy.value <<= this->hop_count (TAO_ENV_SINGLE_ARG_PARAMETER) - 1;
 
           // Don't count hop count twice.
           if (this->policies_[i] == 0)
@@ -1087,8 +1087,8 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
 
 void
 TAO_Offer_Modifier::
-delete_properties (const CosTrading::PropertyNameSeq& deletes,
-                   CORBA::Environment& ACE_TRY_ENV)
+delete_properties (const CosTrading::PropertyNameSeq& deletes
+                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                   CosTrading::Register::MandatoryProperty,
                   CosTrading::IllegalPropertyName,
@@ -1127,8 +1127,8 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes,
 
 void
 TAO_Offer_Modifier::
-merge_properties (const CosTrading::PropertySeq& modifies,
-                  CORBA::Environment& ACE_TRY_ENV)
+merge_properties (const CosTrading::PropertySeq& modifies
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName,
                    CosTrading::PropertyTypeMismatch,
@@ -1174,7 +1174,7 @@ merge_properties (const CosTrading::PropertySeq& modifies,
               // seemed "safest".
 
               CORBA::Boolean td_equal =
-                type_def->equal (prop_type.in (), ACE_TRY_ENV);
+                type_def->equal (prop_type.in () TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
 
               if (!td_equal)
@@ -1248,26 +1248,26 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
   //  CosTrading::PropertySeq::freebuf (prop_buf);
 }
 
-TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies,
-                                    CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies
+                                    TAO_ENV_ARG_DECL)
 {
-  search_card_ = policies.search_card (ACE_TRY_ENV);
+  search_card_ = policies.search_card (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  match_card_ = policies.match_card (ACE_TRY_ENV);
+  match_card_ = policies.match_card (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  return_card_ = policies.return_card (ACE_TRY_ENV);
+  return_card_ = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  dp_ = policies.use_dynamic_properties (ACE_TRY_ENV);
+  dp_ = policies.use_dynamic_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  mod_ = policies.use_modifiable_properties (ACE_TRY_ENV);
+  mod_ = policies.use_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean exact_type_match =
-    policies.exact_type_match (ACE_TRY_ENV);
+    policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (exact_type_match == 1)
@@ -1422,8 +1422,8 @@ TAO_Offer_Filter::limits_applied (void)
 }
 
 TAO_Property_Filter::
-TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
-                     CORBA::Environment& ACE_TRY_ENV)
+TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
   : policy_  (desired_props._d ())
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index e5db59b78ba..f7e52735058 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -72,7 +72,7 @@ public:
   // Returns 1 if the property at index <index> is dynamic. Returns a
   // 0 when the index is out of bounds.
 
-  CORBA::Any* property_value(int index, CORBA::Environment& _env)
+  CORBA::Any* property_value(int index TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // Returns value of the property whose index is <index>. If the
@@ -129,8 +129,8 @@ class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Ev
   //    be O(lg n).
 public:
 
-  TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties,
-                                  CORBA::Environment& _env,
+  TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
+                                  TAO_ENV_ARG_DECL ,
                                   CORBA::Boolean supports_dp = 1)
     ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                      CosTrading::IllegalPropertyName));
@@ -146,8 +146,8 @@ public:
   // defined and dynamic. If the property is undefined, this method
   // will throw a Property_Undefined exception with impunity.
 
-  CORBA::Any* property_value(const char* property_name,
-                             CORBA::Environment& _env)
+  CORBA::Any* property_value(const char* property_name
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // This method is identical to its counterpart in
@@ -187,8 +187,8 @@ public:
 
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
-                             const CORBA::Any& extra_info,
-                             CORBA::Environment& _env)
+                             const CORBA::Any& extra_info
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTradingDynamic::DPEvalFailure)) = 0;
   // Dynamic property evaluation call-back method.
@@ -245,8 +245,8 @@ public:
   static const char * POLICY_NAMES[];
 
   TAO_Policies (TAO_Trader_Base& trader,
-                const CosTrading::PolicySeq& policies,
-                CORBA::Environment& _env)
+                const CosTrading::PolicySeq& policies
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                      CosTrading::DuplicatePolicyName));
 
@@ -274,7 +274,7 @@ public:
 
   ~TAO_Policies (void);
 
-  CORBA::ULong search_card (CORBA::Environment& _env) const
+  CORBA::ULong search_card (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -286,7 +286,7 @@ public:
   // trader's def_search_card attribute is used.
   // END SPEC
 
-  CORBA::ULong match_card (CORBA::Environment& _env) const
+  CORBA::ULong match_card (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -298,7 +298,7 @@ public:
   // attribute is used.
   // END SPEC
 
-  CORBA::ULong return_card (CORBA::Environment& _env) const
+  CORBA::ULong return_card (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -312,7 +312,7 @@ public:
 
   // = Offer consideration policies
 
-  CORBA::Boolean use_modifiable_properties (CORBA::Environment& _env) const
+  CORBA::Boolean use_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -325,7 +325,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_dynamic_properties (CORBA::Environment& _env) const
+  CORBA::Boolean use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -338,7 +338,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_proxy_offers (CORBA::Environment& _env) const
+  CORBA::Boolean use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -350,7 +350,7 @@ public:
   // specified, such offers will be included.
   // END SPEC
 
-  CORBA::Boolean exact_type_match (CORBA::Environment& _env) const
+  CORBA::Boolean exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -362,7 +362,7 @@ public:
 
   // = Federated trader policies (not implemented yet)
 
-  CosTrading::TraderName* starting_trader (CORBA::Environment& _env) const
+  CosTrading::TraderName* starting_trader (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
   // BEGIN SPEC
@@ -381,7 +381,7 @@ public:
   // "starting_trader" policy with the first component removed.
   // END SPEC
 
-  CosTrading::FollowOption link_follow_rule (CORBA::Environment& _env) const
+  CosTrading::FollowOption link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Determine the link follow policy for this query overall.
 
@@ -392,8 +392,8 @@ public:
   // END SPEC
 
 
-  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info,
-                                             CORBA::Environment& _env) const
+  CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info
+                                             TAO_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue,
                      CosTrading::Link::IllegalLinkName,
@@ -407,7 +407,7 @@ public:
   // else min(trader.max_follow_policy, link.limiting_follow_rule,
   //          trader.def_follow_policy)
 
-  CORBA::ULong hop_count (CORBA::Environment& _env) const
+  CORBA::ULong hop_count (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -422,7 +422,7 @@ public:
   // decremented before passing on to a federated trader.
   // END SPEC
 
-  CosTrading::Admin::OctetSeq* request_id (CORBA::Environment& _env) const
+  CosTrading::Admin::OctetSeq* request_id (TAO_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Return the request_id passed to the query method across a link to
   // another trader.
@@ -436,8 +436,8 @@ public:
   // Policies to forward to the next trader in a directed query.
 
   void copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
-                              const CosTrading::Link::LinkInfo& link_info,
-                              CORBA::Environment& _env) const
+                              const CosTrading::Link::LinkInfo& link_info
+                              TAO_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
   // Determine the link follow policy to pass down the link with <link_name>.
@@ -451,13 +451,13 @@ public:
 
 private:
 
-  CORBA::ULong ulong_prop (POLICY_TYPE pol,
-                           CORBA::Environment& _env) const
+  CORBA::ULong ulong_prop (POLICY_TYPE pol
+                           TAO_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconclile a ULong property with its default.
 
-  CORBA::Boolean boolean_prop (POLICY_TYPE pol,
-                               CORBA::Environment& _env) const
+  CORBA::Boolean boolean_prop (POLICY_TYPE pol
+                               TAO_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconcile a Boolean property with its debault.
 
@@ -567,8 +567,8 @@ public:
 
   ~TAO_Offer_Modifier (void);
 
-  void delete_properties (const CosTrading::PropertyNameSeq& deletes,
-                          CORBA::Environment& _env)
+  void delete_properties (const CosTrading::PropertyNameSeq& deletes
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                      CosTrading::Register::MandatoryProperty,
                      CosTrading::IllegalPropertyName,
@@ -576,8 +576,8 @@ public:
   // Delete the properties whose names were given to the
   // constructor. Ensure we don't delete mandatory properties.
 
-  void merge_properties (const CosTrading::PropertySeq& modifies,
-                         CORBA::Environment& _env)
+  void merge_properties (const CosTrading::PropertySeq& modifies
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName,
                      CosTrading::PropertyTypeMismatch,
@@ -638,8 +638,8 @@ class TAO_Offer_Filter
   //    enforcer.
 public:
 
-  TAO_Offer_Filter (TAO_Policies& policies,
-                    CORBA::Environment& _env);
+  TAO_Offer_Filter (TAO_Policies& policies
+                    TAO_ENV_ARG_DECL);
   // Glean from the TypeStruct and Policy setting the appropriate way
   // to screen unsuitable offers from consideration.
 
@@ -716,8 +716,8 @@ public:
   TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {}
   // An accomplice to g++'s insane lust for copy constructors.
 
-  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props,
-                       CORBA::Environment& env)
+  TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Verify that the specified properties are correct.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 629756484c0..9074816f56b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -75,13 +75,13 @@ TAO_Trading_Loader::~TAO_Trading_Loader (void)
 int
 TAO_Trading_Loader::init (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB Manager
       this->orb_manager_.init (argc,
-                               argv,
-                               ACE_TRY_ENV);
+                               argv
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
@@ -89,7 +89,7 @@ TAO_Trading_Loader::init (int argc, char *argv[])
 
       // Initializes and sets up the Trading Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), argc, argv, ACE_TRY_ENV);
+        this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -115,7 +115,7 @@ TAO_Trading_Loader::fini (void)
             trd_comp.link_if ();
 
           CosTrading::LinkNameSeq_var link_name_seq =
-            our_link->list_links (ACE_TRY_ENV);
+            our_link->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -131,16 +131,16 @@ TAO_Trading_Loader::fini (void)
               ACE_DEBUG ((LM_DEBUG,
                           "*** Describing the next link.\n"));
               CosTrading::Link::LinkInfo_var link_info =
-                our_link->describe_link (link_name_seq[i],
-                                         ACE_TRY_ENV);
+                our_link->describe_link (link_name_seq[i]
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
                           "*** Removing link to %s.\n",
                           ACE_static_cast (const char *,
                                            link_name_seq[i])));
-              our_link->remove_link (link_name_seq[i],
-                                     ACE_TRY_ENV);
+              our_link->remove_link (link_name_seq[i]
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CosTrading::Lookup_ptr remote_lookup;
@@ -150,18 +150,18 @@ TAO_Trading_Loader::fini (void)
               ACE_DEBUG ((LM_DEBUG,
                           "*** Retrieving its link interface.\n"));
               CosTrading::Link_var remote_link =
-                remote_lookup->link_if (ACE_TRY_ENV);
+                remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
                           "*** Removing its link to us.\n"));
 
               if (this->bootstrapper_)
-                remote_link->remove_link ("Bootstrap",
-                                          ACE_TRY_ENV);
+                remote_link->remove_link ("Bootstrap"
+                                          TAO_ENV_ARG_PARAMETER);
               else
-                remote_link->remove_link (this->name_.in (),
-                                          ACE_TRY_ENV);
+                remote_link->remove_link (this->name_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -176,10 +176,10 @@ TAO_Trading_Loader::fini (void)
 }
 
 int
-TAO_Trading_Loader::run (CORBA::Environment &ACE_TRY_ENV)
+TAO_Trading_Loader::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   int return_value =
-    this->orb_manager_.run (ACE_TRY_ENV);
+    this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return return_value;
@@ -187,15 +187,15 @@ TAO_Trading_Loader::run (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Object_ptr
 TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
-                                   int argc, char *argv[],
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   int argc, char *argv[]
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the ORB
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr);
 
   // Activating the poa manager
-  this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+  this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Create a Trader Object and set its Service Type Repository.
@@ -209,7 +209,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
   TAO_Trading_Components_i &trd_comp =
     this->trader_->trading_components ();
 
-  sup_attr.type_repos (this->type_repos_._this (ACE_TRY_ENV));
+  sup_attr.type_repos (this->type_repos_._this (TAO_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // The Spec says: return a reference to the Lookup interface from
@@ -218,8 +218,8 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
     trd_comp.lookup_if ();
 
   this->ior_ =
-    orb->object_to_string (lookup,
-                           ACE_TRY_ENV);
+    orb->object_to_string (lookup
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Parse the args
@@ -242,7 +242,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
       // @@ Could do other things. For example, every timeout
       // period try to federate again, but let's not hardcode that
       // policy.
-      int rc = this->bootstrap_to_federation (ACE_TRY_ENV);
+      int rc = this->bootstrap_to_federation (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       if (rc == -1)
@@ -255,7 +255,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
 }
 
 int
-TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
+TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
 {
   // If all traders follow this strategy, it creates a complete graph
   // of all known traders on a multicast network.
@@ -265,7 +265,7 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
   ACE_DEBUG ((LM_DEBUG,
               "*** Bootstrapping to another Trading Service.\n"));
   CORBA::Object_var trading_obj =
-    orb->resolve_initial_references ("TradingService", ACE_TRY_ENV);
+    orb->resolve_initial_references ("TradingService" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (trading_obj.in ()))
@@ -277,14 +277,14 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
   ACE_DEBUG ((LM_DEBUG,
               "*** Narrowing the lookup interface.\n"));
   CosTrading::Lookup_var lookup_if =
-    CosTrading::Lookup::_narrow (trading_obj.in (),
-                                 ACE_TRY_ENV);
+    CosTrading::Lookup::_narrow (trading_obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Obtaining the link interface.\n"));
   CosTrading::Link_var link_if =
-    lookup_if->link_if (ACE_TRY_ENV);
+    lookup_if->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO_Trading_Components_i &trd_comp =
@@ -299,8 +299,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
   link_if->add_link (this->name_.in (),
                      our_lookup,
                      CosTrading::always,
-                     CosTrading::always,
-                     ACE_TRY_ENV);
+                     CosTrading::always
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -308,14 +308,14 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
   our_link->add_link ("Bootstrap",
                       lookup_if.in (),
                       CosTrading::always,
-                      CosTrading::always,
-                      ACE_TRY_ENV);
+                      CosTrading::always
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Retrieving list of known linked traders.\n"));
   CosTrading::LinkNameSeq_var link_name_seq =
-    link_if->list_links (ACE_TRY_ENV);
+    link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -334,8 +334,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
                       ACE_static_cast (const char *,
                                        link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i],
-                                    ACE_TRY_ENV);
+            link_if->describe_link (link_name_seq[i]
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CosTrading::Lookup_ptr remote_lookup;
@@ -344,7 +344,7 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
           ACE_DEBUG ((LM_DEBUG,
                       "*** Retrieving its link interface.\n"));
           CosTrading::Link_var remote_link =
-            remote_lookup->link_if (ACE_TRY_ENV);
+            remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_DEBUG ((LM_DEBUG,
@@ -352,8 +352,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
           remote_link->add_link (this->name_.in (),
                                  our_lookup,
                                  CosTrading::always,
-                                 CosTrading::always,
-                                 ACE_TRY_ENV);
+                                 CosTrading::always
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_DEBUG ((LM_DEBUG,
@@ -361,8 +361,8 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV)
           our_link->add_link (link_name_seq[i],
                               remote_lookup,
                               CosTrading::always,
-                              CosTrading::always,
-                              ACE_TRY_ENV);
+                              CosTrading::always
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 2536febca92..7b994f6d36d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -46,12 +46,12 @@ public:
   // Called by the Service Configurator framework to remove the
   // Event Service. Defined in <ace/Service_Config.h>
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the Trading Service
 
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                   int argc, char *argv[],
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   int argc, char *argv[]
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function call initializes the Trading Service given a reference to the
   // ORB and the command line parameters.
@@ -62,7 +62,7 @@ public:
   // Enable the Trading Service to answer multicast requests for its
   // IOR.
 
-  int bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV);
+  int bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL);
   // Bootstrap to another trader, and attach to its trader network.
 
   int parse_args (int &argc, char *argv []);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp
index 2f34eb9ea7a..ff02cc9589d 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp
@@ -21,11 +21,11 @@ ECFL_Consumer::
 }
 
 void
-ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                       TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -34,12 +34,12 @@ ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -56,13 +56,13 @@ ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
   h1.source = this->experiment_id_;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos,
-                                                ACE_TRY_ENV);
+                                                consumer_qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -74,17 +74,17 @@ ECFL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -95,8 +95,8 @@ ECFL_Consumer::samples (void) const
 }
 
 void
-ECFL_Consumer::push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &)
+ECFL_Consumer::push (const RtecEventComm::EventSet &events
+                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Consumer::push (%P|%t)\n"));
@@ -113,7 +113,7 @@ ECFL_Consumer::push (const RtecEventComm::EventSet &events,
 }
 
 void
-ECFL_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECFL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h
index ccd7b62d19b..80123bce02b 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h
@@ -33,11 +33,11 @@ public:
                  CORBA::ULong iterations);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Get the samples
   const Control::Samples &samples (void) const;
@@ -45,10 +45,10 @@ public:
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
index 22857482fcb..d50dd07dfc0 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
@@ -34,8 +34,8 @@ ECFL_Coordinator::~ECFL_Coordinator (void)
 }
 
 void
-ECFL_Coordinator::join (Control::Peer_ptr peer,
-                        CORBA::Environment &ACE_TRY_ENV)
+ECFL_Coordinator::join (Control::Peer_ptr peer
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -57,14 +57,14 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
   for (i = 0; i != this->peers_count_; ++i)
     {
       RtecEventChannelAdmin::EventChannel_var channel =
-        this->peers_[i]->channel (ACE_TRY_ENV);
+        this->peers_[i]->channel (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (size_t j = 0; j != this->peers_count_; ++j)
         {
           if (i != j)
             {
-              this->peers_[j]->connect (channel.in (), ACE_TRY_ENV);
+              this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -89,20 +89,20 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
           if (j != i)
             {
               loopbacks[lcount++] =
-                this->peers_[j]->setup_loopback (experiment_id,
-                                                 ACE_TRY_ENV);
+                this->peers_[j]->setup_loopback (experiment_id
+                                                 TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
       Control::Samples_var samples =
         this->peers_[i]->run_experiment (experiment_id,
-                                         this->iterations_,
-                                         ACE_TRY_ENV);
+                                         this->iterations_
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       for (j = 0; j != lcount; ++j)
         {
-          loopbacks[j]->destroy (ACE_TRY_ENV);
+          loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -129,10 +129,10 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
 
   for (i = 0; i != this->peers_count_; ++i)
     {
-      this->peers_[i]->shutdown (ACE_TRY_ENV);
+      this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h
index b719de9f6e5..be2be30a0da 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h
@@ -37,8 +37,8 @@ public:
   //@{
   /** @name The Control::Coordinator methods
    */
-  virtual void join (Control::Peer_ptr peer,
-                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void join (Control::Peer_ptr peer
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp
index a822c455157..2b296599d05 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp
@@ -17,14 +17,14 @@ ECFL_Loopback::ECFL_Loopback (void)
 
 void
 ECFL_Loopback::init (CORBA::Long experiment_id,
-                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     RtecEventChannelAdmin::EventChannel_ptr ec
+                     TAO_ENV_ARG_DECL)
 {
   this->supplier_ =
     Servant_var<ECFL_Loopback_Supplier> (
            new ECFL_Loopback_Supplier (experiment_id)
            );
-  this->supplier_->connect (ec, ACE_TRY_ENV);
+  this->supplier_->connect (ec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_ =
@@ -32,30 +32,30 @@ ECFL_Loopback::init (CORBA::Long experiment_id,
             new ECFL_Loopback_Consumer (experiment_id,
                                         this->supplier_.in ())
             );
-  this->consumer_->connect (ec, ACE_TRY_ENV);
+  this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback::destroy (CORBA::Environment &ACE_TRY_ENV)
+ECFL_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->consumer_->disconnect (ACE_TRY_ENV);
+      this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->supplier_->disconnect (ACE_TRY_ENV);
+      this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h
index 33ae6ccf925..94492c347b1 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h
@@ -33,13 +33,13 @@ public:
 
   /// Initialize the loopback
   void init (CORBA::Long experiment_id,
-             RtecEventChannelAdmin::EventChannel_ptr ec,
-             CORBA::Environment &ACE_TRY_ENV);
+             RtecEventChannelAdmin::EventChannel_ptr ec
+             TAO_ENV_ARG_DECL);
 
   //@{
   /** @name The Control::Loopback methods
    */
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp
index 1496fb5d63a..6eb56cfaf91 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp
@@ -22,11 +22,11 @@ ECFL_Loopback_Consumer::
 }
 
 void
-ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                       TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -35,12 +35,12 @@ ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -57,13 +57,13 @@ ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
   h1.source = this->experiment_id_;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos,
-                                                ACE_TRY_ENV);
+                                                consumer_qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFL_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -75,31 +75,31 @@ ECFL_Loopback_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback_Consumer::push (const RtecEventComm::EventSet &events,
-                              CORBA::Environment &ACE_TRY_ENV)
+ECFL_Loopback_Consumer::push (const RtecEventComm::EventSet &events
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n"));
-  this->supplier_->push (events, ACE_TRY_ENV);
+  this->supplier_->push (events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECFL_Loopback_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECFL_Loopback_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h
index c4eadc6c87a..8138c3f9040 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h
@@ -34,19 +34,19 @@ public:
                           ECFL_Loopback_Supplier *supplier);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp
index f08f6484765..1e9e90cf4a4 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp
@@ -17,11 +17,11 @@ ECFL_Loopback_Supplier::ECFL_Loopback_Supplier (CORBA::Long experiment_id)
 }
 
 void
-ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                 CORBA::Environment &ACE_TRY_ENV)
+ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                                 TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
+    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -47,13 +47,13 @@ ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
   sh0.source = this->experiment_id_;
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
-                                                supplier_qos,
-                                                ACE_TRY_ENV);
+                                                supplier_qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFL_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFL_Loopback_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source,
-                              CORBA::Environment &ACE_TRY_ENV)
+ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -101,11 +101,11 @@ ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source,
       events[i].header.source = this->experiment_id_;
     }
 
-  proxy->push (events, ACE_TRY_ENV);
+  proxy->push (events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECFL_Loopback_Supplier::disconnect_push_supplier (CORBA::Environment &)
+ECFL_Loopback_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h
index d34ea0eed89..4dc341bab47 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h
@@ -35,20 +35,20 @@ public:
   ECFL_Loopback_Supplier (CORBA::Long experiment_id);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
-  void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment &)
+  void push (const RtecEventComm::EventSet &events
+             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
index 60ec5d726c5..23469192079 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
@@ -30,72 +30,72 @@ ECFL_Peer::~ECFL_Peer (void)
 }
 
 void
-ECFL_Peer::init (PortableServer::POA_ptr root_poa,
-                 CORBA::Environment &ACE_TRY_ENV)
+ECFL_Peer::init (PortableServer::POA_ptr root_poa
+                 TAO_ENV_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attr (root_poa, root_poa);
   Servant_var<TAO_EC_Event_Channel> ec_impl (
          new TAO_EC_Event_Channel (attr)
          );
 
-  ec_impl->activate (ACE_TRY_ENV);
+  ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_channel_ =
-    ec_impl->_this (ACE_TRY_ENV);
+    ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
-ECFL_Peer::channel (CORBA::Environment &)
+ECFL_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ());
 }
 
 void
-ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                    CORBA::Environment &ACE_TRY_ENV)
+ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
   Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP);
   gateway->init (remote_ec,
-                 this->event_channel_.in (),
-                 ACE_TRY_ENV);
+                 this->event_channel_.in ()
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::Observer_var observer =
-    gateway->_this (ACE_TRY_ENV);
+    gateway->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::Observer_Handle h =
-    this->event_channel_->append_observer (observer.in (),
-                                           ACE_TRY_ENV);
+    this->event_channel_->append_observer (observer.in ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   gateway->observer_handle (h);
 }
 
 Control::Loopback_ptr
-ECFL_Peer::setup_loopback (CORBA::Long experiment_id,
-                           CORBA::Environment &ACE_TRY_ENV)
+ECFL_Peer::setup_loopback (CORBA::Long experiment_id
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFL_Loopback> loopback (new ECFL_Loopback);
 
   loopback->init (experiment_id,
-                  this->event_channel_.in (),
-                  ACE_TRY_ENV);
+                  this->event_channel_.in ()
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Control::Loopback::_nil ());
 
-  return loopback->_this (ACE_TRY_ENV);
+  return loopback->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Control::Samples *
 ECFL_Peer::run_experiment (CORBA::Long experiment_id,
-                           CORBA::Long iterations,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Long iterations
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFL_Consumer> consumer (
@@ -103,14 +103,14 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id,
                              iterations)
           );
 
-  consumer->connect (this->event_channel_.in (), ACE_TRY_ENV);
+  consumer->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Servant_var<ECFL_Supplier> supplier (
           new ECFL_Supplier (experiment_id)
           );
 
-  supplier->connect (this->event_channel_.in (), ACE_TRY_ENV);
+  supplier->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n"));
@@ -127,26 +127,26 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id,
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      creation);
       // push one event...
-      supplier->push (event, ACE_TRY_ENV);
+      supplier->push (event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  supplier->disconnect (ACE_TRY_ENV);
+  supplier->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  consumer->disconnect (ACE_TRY_ENV);
+  consumer->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return new Control::Samples (consumer->samples ());
 }
 
 void
-ECFL_Peer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+ECFL_Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->event_channel_->destroy (ACE_TRY_ENV);
+  this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
index dd749ec10d7..5d6d7cee042 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
@@ -32,30 +32,30 @@ public:
   virtual ~ECFL_Peer (void);
 
   /// Initialize the peer
-  void init (PortableServer::POA_ptr poa,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (PortableServer::POA_ptr poa
+             TAO_ENV_ARG_DECL);
 
   //@{
   /** @name The Control::Peer methods
    */
   virtual RtecEventChannelAdmin::EventChannel_ptr
-      channel (CORBA::Environment&)
+      channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                        CORBA::Environment&)
+  virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
+                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id,
-                                        CORBA::Environment &)
+  Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id
+                                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Control::Samples* run_experiment (CORBA::Long experiment_id,
-                                            CORBA::Long iterations,
-                                            CORBA::Environment &)
+                                            CORBA::Long iterations
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment&)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp
index 0774b658e1a..74308570630 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp
@@ -17,11 +17,11 @@ ECFL_Supplier::ECFL_Supplier (CORBA::Long experiment_id)
 }
 
 void
-ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment &ACE_TRY_ENV)
+ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                        TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
+    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -47,13 +47,13 @@ ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
   sh0.source = this->experiment_id_;
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
-                                                supplier_qos,
-                                                ACE_TRY_ENV);
+                                                supplier_qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Supplier::push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &ACE_TRY_ENV)
+ECFL_Supplier::push (const RtecEventComm::EventSet &events
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -92,11 +92,11 @@ ECFL_Supplier::push (const RtecEventComm::EventSet &events,
     proxy = this->proxy_consumer_;
   }
 
-  proxy->push (events, ACE_TRY_ENV);
+  proxy->push (events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECFL_Supplier::disconnect_push_supplier (CORBA::Environment &)
+ECFL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h
index fe1e8819fa8..3034cd976f6 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h
@@ -35,20 +35,20 @@ public:
   ECFL_Supplier (CORBA::Long experiment_id);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
-  void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment &)
+  void push (const RtecEventComm::EventSet &events
+             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp
index 9fe4702e6bf..92d8a54651d 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp
@@ -68,7 +68,7 @@ int main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -76,12 +76,12 @@ int main (int argc, char *argv[])
 
       // Get the event channel object reference
       CORBA::Object_var coordinator_object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Control::Coordinator_var coordinator =
-        Control::Coordinator::_narrow (coordinator_object.in (),
-                                       ACE_TRY_ENV);
+        Control::Coordinator::_narrow (coordinator_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -92,13 +92,13 @@ int main (int argc, char *argv[])
         }
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -108,20 +108,20 @@ int main (int argc, char *argv[])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -130,32 +130,32 @@ int main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Servant_var<ECFL_Peer> peer_impl (new ECFL_Peer (orb.in ()));
 
-      peer_impl->init (root_poa.in (), ACE_TRY_ENV);
+      peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Control::Peer_var peer (peer_impl->_this (ACE_TRY_ENV));
+      Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
-      coordinator->join (peer.in (), ACE_TRY_ENV);
+      coordinator->join (peer.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp
index 16b276bf0b0..a29e8e88813 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp
@@ -83,20 +83,20 @@ int main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -106,20 +106,20 @@ int main (int argc, char *argv[])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -128,10 +128,10 @@ int main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Servant_var<ECFL_Coordinator> coordinator_impl (
@@ -142,11 +142,11 @@ int main (int argc, char *argv[])
               );
 
       Control::Coordinator_var coordinator =
-        coordinator_impl->_this (ACE_TRY_ENV);
+        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in (), ACE_TRY_ENV);
+        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the ior to the <ior_output_file>
@@ -159,18 +159,18 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp
index 96821914159..2e020bbd26f 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp
@@ -17,11 +17,11 @@ ECL_Consumer::ECL_Consumer (int iterations)
 }
 
 void
-ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                       TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -51,13 +51,13 @@ ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
   h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
-                                                consumer_qos,
-                                                ACE_TRY_ENV);
+                                                consumer_qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -69,17 +69,17 @@ ECL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -90,8 +90,8 @@ ECL_Consumer::sample_history (void)
 }
 
 void
-ECL_Consumer::push (const RtecEventComm::EventSet &events,
-                    CORBA::Environment &)
+ECL_Consumer::push (const RtecEventComm::EventSet &events
+                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -105,7 +105,7 @@ ECL_Consumer::push (const RtecEventComm::EventSet &events,
 }
 
 void
-ECL_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h
index b089e771fcb..a05566c370b 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h
@@ -32,11 +32,11 @@ public:
   ECL_Consumer (int iterations);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Access the history of samples
   ACE_Sample_History &sample_history (void);
@@ -44,10 +44,10 @@ public:
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp
index ebf23176603..1712c4f496c 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp
@@ -16,11 +16,11 @@ ECL_Supplier::ECL_Supplier (void)
 }
 
 void
-ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                       TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
+    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -29,12 +29,12 @@ ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -45,13 +45,13 @@ ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
   sh0.source = 1;                      // first free event source
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
-                                                supplier_qos,
-                                                ACE_TRY_ENV);
+                                                supplier_qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -63,23 +63,23 @@ ECL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECL_Supplier::push (const RtecEventComm::EventSet &events,
-                    CORBA::Environment &ACE_TRY_ENV)
+ECL_Supplier::push (const RtecEventComm::EventSet &events
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -89,12 +89,12 @@ ECL_Supplier::push (const RtecEventComm::EventSet &events,
       return;
     proxy = this->proxy_consumer_;
   }
-  proxy->push (events, ACE_TRY_ENV);
+  proxy->push (events TAO_ENV_ARG_PARAMETER);
 
 }
 
 void
-ECL_Supplier::disconnect_push_supplier (CORBA::Environment &)
+ECL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h
index 85485f85335..e9e26a788bf 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h
@@ -30,20 +30,20 @@ public:
   ECL_Supplier (void);
 
   /// Connect to the event channel
-  void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
-  void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment &)
+  void push (const RtecEventComm::EventSet &events
+             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
index ccac7953c06..82a708446ce 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
@@ -57,17 +57,17 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -77,16 +77,16 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -95,14 +95,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -110,12 +110,12 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var ec_object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (ec.in ()))
         {
@@ -130,7 +130,7 @@ main (int argc, char *argv [])
                       1);
       PortableServer::ServantBase_var consumer_owner (consumer_impl);
 
-      consumer_impl->connect (ec.in (), ACE_TRY_ENV);
+      consumer_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ECL_Supplier *supplier_impl;
@@ -139,7 +139,7 @@ main (int argc, char *argv [])
                       1);
       PortableServer::ServantBase_var supplier_owner (consumer_impl);
 
-      supplier_impl->connect (ec.in (), ACE_TRY_ENV);
+      supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n"));
@@ -161,14 +161,14 @@ main (int argc, char *argv [])
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
           // push one event...
-          supplier_impl->push (event, ACE_TRY_ENV);
+          supplier_impl->push (event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
 
-      consumer_impl->disconnect (ACE_TRY_ENV);
+      consumer_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_impl->disconnect (ACE_TRY_ENV);
+      supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Calibrate the high resolution timer *before* starting the
@@ -195,12 +195,12 @@ main (int argc, char *argv [])
                                              stats.samples_count ());
 
 
-      orb->shutdown (0, ACE_TRY_ENV);
+      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp
index b01372dfc74..11b88dfa730 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp
@@ -67,17 +67,17 @@ int main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -87,20 +87,20 @@ int main (int argc, char *argv[])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -109,13 +109,13 @@ int main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
@@ -126,15 +126,15 @@ int main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var ec_owner (ec_impl);
 
-      ec_impl->activate (ACE_TRY_ENV);
+      ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl->_this (ACE_TRY_ENV);
+        ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (ec.in (), ACE_TRY_ENV);
+        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the ior to the <ior_output_file>
@@ -147,18 +147,18 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 8f0e3c8c523..2e4d40d71d6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -24,8 +24,8 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
-                                       AVStreams::MMDevice_ptr sender,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       AVStreams::MMDevice_ptr sender
+                                       TAO_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -43,8 +43,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name,
-                                                ACE_TRY_ENV);
+        this->naming_client_->bind_new_context (name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -58,8 +58,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name,
-                                                 ACE_TRY_ENV);
+        this->sender_context_->bind_new_context (name
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
@@ -74,8 +74,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name,
-                                       ACE_TRY_ENV);
+        this->naming_client_->resolve (name
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->sender_context_ =
@@ -86,14 +86,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup ("Receivers");
 
       object =
-        this->sender_context_->resolve (name,
-                                        ACE_TRY_ENV);
+        this->sender_context_->resolve (name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
-      this->find_receivers (ACE_TRY_ENV);
+      this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -104,13 +104,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
-                                 sender,
-                                 ACE_TRY_ENV);
+                                 sender
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -119,13 +119,13 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV)
   // Get the list of receivers registered for this sender.
   this->receiver_context_->list (chunk,
                                  binding_list,
-                                 iterator,
-                                 ACE_TRY_ENV);
+                                 iterator
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Add the receivers found in the bindinglist to the <receivers>.
-  this->add_to_receivers (binding_list,
-                          ACE_TRY_ENV);
+  this->add_to_receivers (binding_list
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (iterator.in ()))
@@ -136,20 +136,20 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV)
       while (more)
         {
           more = iterator->next_n (chunk,
-                                   binding_list,
-                                   ACE_TRY_ENV);
+                                   binding_list
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->add_to_receivers (binding_list,
-                                  ACE_TRY_ENV);
+          this->add_to_receivers (binding_list
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 }
 
 void
-Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
-                                      CORBA::Environment& ACE_TRY_ENV)
+Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
+                                      TAO_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -167,8 +167,8 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
       // Resolve the reference of the receiver from the receiver
       // context.
       CORBA::Object_var obj =
-        this->receiver_context_->resolve (name,
-                                          ACE_TRY_ENV);
+        this->receiver_context_->resolve (name
+                                          TAO_ENV_ARG_PARAMETER);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -184,7 +184,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
 }
 
 void
-Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -223,7 +223,7 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
 
       // Register streamctrl.
       AVStreams::StreamCtrl_var streamctrl_object =
-        streamctrl->_this (ACE_TRY_ENV);
+        streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Bind the flowname and the corresponding stream controller to
@@ -235,8 +235,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
       (void) streamctrl->bind_devs (this->sender_.in (),
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
-                                    flow_spec,
-                                    ACE_TRY_ENV);
+                                    flow_spec
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -244,8 +244,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
 void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
-                                    AVStreams::MMDevice_ptr receiver,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    AVStreams::MMDevice_ptr receiver
+                                    TAO_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -268,8 +268,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name,
-                                       ACE_TRY_ENV);
+        this->naming_client_->resolve (name
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -286,8 +286,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Find the receivers context under the sender's context
       object =
-        this->sender_context_->resolve (name,
-                                        ACE_TRY_ENV);
+        this->sender_context_->resolve (name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
@@ -300,8 +300,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Create the sender context
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name,
-                                                ACE_TRY_ENV);
+        this->naming_client_->bind_new_context (name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       name [0].id =
@@ -309,8 +309,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Create the receivers context under the sender's context
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name,
-                                                 ACE_TRY_ENV);
+        this->sender_context_->bind_new_context (name
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -325,8 +325,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
-                                   receiver,
-                                   ACE_TRY_ENV);
+                                   receiver
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -342,12 +342,12 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
             CORBA::string_dup (this->sender_name_.c_str ());
 
           CORBA::Object_var object =
-            this->sender_context_->resolve (name,
-                                            ACE_TRY_ENV);
+            this->sender_context_->resolve (name
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in (), ACE_TRY_ENV);
+            AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
@@ -360,7 +360,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -396,7 +396,7 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
 
   // Register streamctrl.
   AVStreams::StreamCtrl_var streamctrl_object =
-    streamctrl->_this (ACE_TRY_ENV);
+    streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -414,8 +414,8 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
     streamctrl->bind_devs (this->sender_.in (),
                            this->receiver_.in (),
                            the_qos.inout (),
-                           flow_spec,
-                           ACE_TRY_ENV);
+                           flow_spec
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == 0)
@@ -424,20 +424,20 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
 
   // Start the data sending.
   AVStreams::flowSpec start_spec;
-  streamctrl->start (start_spec,
-                     ACE_TRY_ENV);
+  streamctrl->start (start_spec
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
-                                    TAO_StreamEndPoint *endpoint,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    TAO_StreamEndPoint *endpoint
+                                    TAO_ENV_ARG_DECL)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_ptr streamctrl_any =
-    endpoint->get_property_value ("Related_StreamCtrl",
-                                  ACE_TRY_ENV);
+    endpoint->get_property_value ("Related_StreamCtrl"
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   AVStreams::StreamCtrl_ptr streamctrl;
@@ -449,7 +449,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 }
 
 void
-Connection_Manager::destroy (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL)
 {
   AVStreams::flowSpec stop_spec;
 
@@ -458,15 +458,15 @@ Connection_Manager::destroy (CORBA::Environment &ACE_TRY_ENV)
        iterator != this->streamctrls_.end ();
        ++iterator)
     {
-      (*iterator).int_id_->destroy (stop_spec,
-                                    ACE_TRY_ENV);
+      (*iterator).int_id_->destroy (stop_spec
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Connection_Manager::destroy (const ACE_CString &flowname,
-                             CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::destroy (const ACE_CString &flowname
+                             TAO_ENV_ARG_DECL)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
@@ -476,8 +476,8 @@ Connection_Manager::destroy (const ACE_CString &flowname,
                              streamctrl);
 
   AVStreams::flowSpec stop_spec;
-  streamctrl->destroy (stop_spec,
-                       ACE_TRY_ENV);
+  streamctrl->destroy (stop_spec
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index c121456931a..6db0ebd24bb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -44,33 +44,33 @@ public:
   // Initialize this class.
 
   void bind_to_receivers (const ACE_CString &sender_name,
-                          AVStreams::MMDevice_ptr sender,
-                          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                          AVStreams::MMDevice_ptr sender
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ());
+  void connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
-                       AVStreams::MMDevice_ptr receiver,
-                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                       AVStreams::MMDevice_ptr receiver
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Bind receiver to the sender.
 
-  void connect_to_sender (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ());
+  void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the sender that we found.
 
-  void destroy (CORBA::Environment & = TAO_default_environment ());
+  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Destroy all streams.
 
-  void destroy (const ACE_CString &flowname,
-                CORBA::Environment & = TAO_default_environment ());
+  void destroy (const ACE_CString &flowname
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Destroy streams associated with <flowname>.
 
   void add_streamctrl (const ACE_CString &flowname,
-                       TAO_StreamEndPoint *endpoint,
-                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                       TAO_StreamEndPoint *endpoint
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -98,10 +98,10 @@ public:
 
 protected:
 
-  void find_receivers (CORBA::Environment &ACE_TRY_ENV);
+  void find_receivers (TAO_ENV_SINGLE_ARG_DECL);
 
-  void add_to_receivers (CosNaming::BindingList &binding_list,
-                         CORBA::Environment& ACE_TRY_ENV);
+  void add_to_receivers (CosNaming::BindingList &binding_list
+                         TAO_ENV_ARG_DECL);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index d24a84b2951..4a9892f4428 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -90,7 +90,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Distributer_Callback::end_stream\n"));
 
-      DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_TRY_ENV);
+      DISTRIBUTER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We can close down now.
@@ -153,8 +153,8 @@ Distributer::parse_args (int argc,
 
 int
 Distributer::init (int argc,
-                   char ** argv,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   char ** argv
+                   TAO_ENV_ARG_DECL)
 {
   // Initialize the connection class.
   int result =
@@ -191,7 +191,7 @@ Distributer::init (int argc,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
@@ -203,28 +203,28 @@ Distributer::init (int argc,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV);
+    this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
-                                               distributer_sender_mmdevice.in (),
-                                               ACE_TRY_ENV);
+                                               distributer_sender_mmdevice.in ()
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to receivers
-  this->connection_manager_.connect_to_receivers (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
-                                            distributer_receiver_mmdevice.in (),
-                                            ACE_TRY_ENV);
+                                            distributer_receiver_mmdevice.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to sender.
-  this->connection_manager_.connect_to_sender (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -246,46 +246,46 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -293,7 +293,7 @@ main (int argc,
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          orb->perform_work (ACE_TRY_ENV);
+          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index a6e73b7e911..83e7ec81eea 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -115,8 +115,8 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index e1b130cb3e2..4bcedbd078b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -63,8 +63,8 @@ Receiver_Callback::handle_destroy (void)
 
   ACE_TRY_NEW_ENV
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0,
-                                                  ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -93,8 +93,8 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **,
-                CORBA::Environment &ACE_TRY_ENV)
+                char **
+                TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -119,18 +119,18 @@ Receiver::init (int,
     this->mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
+    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
-                                            mmdevice.in (),
-                                            ACE_TRY_ENV);
+                                            mmdevice.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to the sender.
-  this->connection_manager_.connect_to_sender (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -179,39 +179,39 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Receiver receiver;
@@ -237,20 +237,20 @@ main (int argc,
 
       result =
         receiver.init (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index 48724fc7ce3..c38cb18815a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -83,8 +83,8 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index a96e4e49c71..dd8678dd200 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -81,8 +81,8 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv,
-              CORBA::Environment& ACE_TRY_ENV)
+              char **argv
+              TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -128,18 +128,18 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the object reference with the Naming Service and bind to
   // the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
-                                               mmdevice.in (),
-                                               ACE_TRY_ENV);
+                                               mmdevice.in ()
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to the receivers
-  this->connection_manager_.connect_to_receivers (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -147,7 +147,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
+Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -224,8 +224,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-                                                         ACE_TRY_ENV);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -280,54 +280,54 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv,
-                                          ACE_TRY_ENV);
+                                          argv
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"), -1);
 
-      SENDER::instance ()->pace_data (ACE_TRY_ENV);
+      SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      SENDER::instance ()->connection_manager ().destroy (ACE_TRY_ENV);
+      SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index 22038260fa8..58468c578b6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -62,11 +62,11 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment&);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (CORBA::Environment &);
+  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   Connection_Manager &connection_manager (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index 796b6e40464..b6a3c85341c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -25,8 +25,8 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
-                                       AVStreams::MMDevice_ptr sender,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       AVStreams::MMDevice_ptr sender
+                                       TAO_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -44,8 +44,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name,
-                                                ACE_TRY_ENV);
+        this->naming_client_->bind_new_context (name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -59,8 +59,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name,
-                                                 ACE_TRY_ENV);
+        this->sender_context_->bind_new_context (name
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
@@ -75,8 +75,8 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name,
-                                       ACE_TRY_ENV);
+        this->naming_client_->resolve (name
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->sender_context_ =
@@ -87,14 +87,14 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
         CORBA::string_dup ("Receivers");
 
       object =
-        this->sender_context_->resolve (name,
-                                        ACE_TRY_ENV);
+        this->sender_context_->resolve (name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
-      this->find_receivers (ACE_TRY_ENV);
+      this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -105,13 +105,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
-                                 sender,
-                                 ACE_TRY_ENV);
+                                 sender
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -120,13 +120,13 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV)
   // Get the list of receivers registered for this sender.
   this->receiver_context_->list (chunk,
                                  binding_list,
-                                 iterator,
-                                 ACE_TRY_ENV);
+                                 iterator
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Add the receivers found in the bindinglist to the <receivers>.
-  this->add_to_receivers (binding_list,
-                          ACE_TRY_ENV);
+  this->add_to_receivers (binding_list
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (iterator.in ()))
@@ -137,20 +137,20 @@ Connection_Manager::find_receivers (CORBA::Environment &ACE_TRY_ENV)
       while (more)
         {
           more = iterator->next_n (chunk,
-                                   binding_list,
-                                   ACE_TRY_ENV);
+                                   binding_list
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->add_to_receivers (binding_list,
-                                  ACE_TRY_ENV);
+          this->add_to_receivers (binding_list
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 }
 
 void
-Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
-                                      CORBA::Environment& ACE_TRY_ENV)
+Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
+                                      TAO_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -168,8 +168,8 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
       // Resolve the reference of the receiver from the receiver
       // context.
       CORBA::Object_var obj =
-        this->receiver_context_->resolve (name,
-                                          ACE_TRY_ENV);
+        this->receiver_context_->resolve (name
+                                          TAO_ENV_ARG_PARAMETER);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -185,7 +185,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list,
 }
 
 void
-Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -224,7 +224,7 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
 
       // Register streamctrl.
       AVStreams::StreamCtrl_var streamctrl_object =
-        streamctrl->_this (ACE_TRY_ENV);
+        streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Bind the flowname and the corresponding stream controller to
@@ -236,8 +236,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
       (void) streamctrl->bind_devs (this->sender_.in (),
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
-                                    flow_spec,
-                                    ACE_TRY_ENV);
+                                    flow_spec
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -245,8 +245,8 @@ Connection_Manager::connect_to_receivers (CORBA::Environment &ACE_TRY_ENV)
 void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
-                                    AVStreams::MMDevice_ptr receiver,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    AVStreams::MMDevice_ptr receiver
+                                    TAO_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -271,8 +271,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
         CORBA::string_dup (this->sender_name_.c_str ());
 
       CORBA::Object_var object =
-        this->naming_client_->resolve (name,
-                                       ACE_TRY_ENV);
+        this->naming_client_->resolve (name
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -289,8 +289,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Find the receivers context under the sender's context
       object =
-        this->sender_context_->resolve (name,
-                                        ACE_TRY_ENV);
+        this->sender_context_->resolve (name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
@@ -303,8 +303,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Create the sender context
       this->sender_context_ =
-        this->naming_client_->bind_new_context (name,
-                                                ACE_TRY_ENV);
+        this->naming_client_->bind_new_context (name
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       name [0].id =
@@ -312,8 +312,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       // Create the receivers context under the sender's context
       this->receiver_context_ =
-        this->sender_context_->bind_new_context (name,
-                                                 ACE_TRY_ENV);
+        this->sender_context_->bind_new_context (name
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -328,8 +328,8 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
-                                   receiver,
-                                   ACE_TRY_ENV);
+                                   receiver
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -345,12 +345,12 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
             CORBA::string_dup (this->sender_name_.c_str ());
 
           CORBA::Object_var object =
-            this->sender_context_->resolve (name,
-                                            ACE_TRY_ENV);
+            this->sender_context_->resolve (name
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in (), ACE_TRY_ENV);
+            AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
@@ -363,7 +363,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -399,7 +399,7 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
 
   // Register streamctrl.
   AVStreams::StreamCtrl_var streamctrl_object =
-    streamctrl->_this (ACE_TRY_ENV);
+    streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -417,8 +417,8 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
     streamctrl->bind_devs (this->sender_.in (),
                            this->receiver_.in (),
                            the_qos.inout (),
-                           flow_spec,
-                           ACE_TRY_ENV);
+                           flow_spec
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == 0)
@@ -427,20 +427,20 @@ Connection_Manager::connect_to_sender (CORBA::Environment &ACE_TRY_ENV)
 
   // Start the data sending.
   AVStreams::flowSpec start_spec;
-  streamctrl->start (start_spec,
-                     ACE_TRY_ENV);
+  streamctrl->start (start_spec
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
-                                    TAO_StreamEndPoint *endpoint,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    TAO_StreamEndPoint *endpoint
+                                    TAO_ENV_ARG_DECL)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_ptr streamctrl_any =
-    endpoint->get_property_value ("Related_StreamCtrl",
-                                  ACE_TRY_ENV);
+    endpoint->get_property_value ("Related_StreamCtrl"
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   AVStreams::StreamCtrl_ptr streamctrl;
@@ -452,33 +452,33 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 }
 
 void
-Connection_Manager::destroy (CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL)
 {
   AVStreams::flowSpec stop_spec;
 
-        
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"Connection_Manager::destroy\n"));
-  
+                "Connection_Manager::destroy\n"));
+
   StreamCtrls::iterator iterator = this->streamctrls_.begin ();
   int size = this->streamctrls_.current_size ();
   for (int i = 0 ; i < size; i++)
     {
-      (*iterator).int_id_->destroy (stop_spec,
-                                    ACE_TRY_ENV);
+      (*iterator).int_id_->destroy (stop_spec
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       iterator.advance ();
     }
-  
+
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"Finished with the destroy\n"));
+                "Finished with the destroy\n"));
 }
 
 void
-Connection_Manager::destroy (const ACE_CString &flowname,
-                             CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::destroy (const ACE_CString &flowname
+                             TAO_ENV_ARG_DECL)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
@@ -488,163 +488,163 @@ Connection_Manager::destroy (const ACE_CString &flowname,
                              streamctrl);
 
   AVStreams::flowSpec stop_spec;
-  streamctrl->destroy (stop_spec,
-                       ACE_TRY_ENV);
+  streamctrl->destroy (stop_spec
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Connection_Manager::unbind_sender (const ACE_CString &sender_name, 
-				   AVStreams::MMDevice_ptr sender_mmdevice_obj,
-				   CORBA::Environment &ACE_TRY_ENV)
+Connection_Manager::unbind_sender (const ACE_CString &sender_name,
+                                   AVStreams::MMDevice_ptr sender_mmdevice_obj
+                                   TAO_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"Connection_Manager::unbind_sender\n"));
-  
+                "Connection_Manager::unbind_sender\n"));
+
   CosNaming::Name name (1);
   name.length (1);
 
   // Try binding the sender context in the NS
   name [0].id =
     CORBA::string_dup (sender_name.c_str ());
-  
+
   ACE_TRY
     {
       CORBA::Object_var object =
-	this->naming_client_->resolve (name,
-				       ACE_TRY_ENV);
+        this->naming_client_->resolve (name
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       CosNaming::NamingContext_var sender_context =
-	CosNaming::NamingContext::_narrow (object.in ());
-  
+        CosNaming::NamingContext::_narrow (object.in ());
+
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "Sender Context Found\n"));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "Sender Context Found\n"));
+
       ACE_TRY_EX (Resolve_Sender)
-	{
-	  object =
-	    sender_context->resolve (name,
-				     ACE_TRY_ENV);
-	  ACE_TRY_CHECK_EX (Resolve_Sender);
-
-	  AVStreams::MMDevice_var mmdevice =
-	    AVStreams::MMDevice::_narrow (object.in ());
-
-	  if (mmdevice->_is_equivalent (sender_mmdevice_obj))
-	  {
-	    sender_context->unbind (name,
-				    ACE_TRY_ENV);
-	    ACE_TRY_CHECK_EX (Resolve_Sender);
-	    
-	    if (TAO_debug_level > 0)
-	      ACE_DEBUG ((LM_DEBUG,
-			  "Sender Unbound\n"));
-	  }
-	}
+        {
+          object =
+            sender_context->resolve (name
+                                     TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (Resolve_Sender);
+
+          AVStreams::MMDevice_var mmdevice =
+            AVStreams::MMDevice::_narrow (object.in ());
+
+          if (mmdevice->_is_equivalent (sender_mmdevice_obj))
+          {
+            sender_context->unbind (name
+                                    TAO_ENV_ARG_PARAMETER);
+            ACE_TRY_CHECK_EX (Resolve_Sender);
+
+            if (TAO_debug_level > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          "Sender Unbound\n"));
+          }
+        }
       ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
-	{
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Sender object not found\n"));
-	  // Do not have to unbind.
-	}
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Sender object not found\n"));
+          // Do not have to unbind.
+        }
       ACE_ENDTRY;
 
     }
   ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "Sender Context Not Found\n"));
+                  "Sender Context Not Found\n"));
       // Do not have to unbind.
     }
   ACE_ENDTRY;
-  
+
 }
 
 void
 Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
-				     const ACE_CString &receiver_name, 
-				     AVStreams::MMDevice_ptr receiver_mmdevice)
+                                     const ACE_CString &receiver_name,
+                                     AVStreams::MMDevice_ptr receiver_mmdevice)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"Connection_Manager::unbind_receiver\n"));
-  
+                "Connection_Manager::unbind_receiver\n"));
+
   CosNaming::Name name (1);
   name.length (1);
 
   // Try binding the sender context in the NS
   name [0].id =
     CORBA::string_dup (sender_name.c_str ());
-  
+
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object =
-	this->naming_client_->resolve (name,
-				       ACE_TRY_ENV);
+        this->naming_client_->resolve (name
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       CosNaming::NamingContext_var sender_context =
-	CosNaming::NamingContext::_narrow (object.in ());
-      
+        CosNaming::NamingContext::_narrow (object.in ());
+
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "Sender Context Found\n"));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "Sender Context Found\n"));
+
       ACE_TRY_EX (Resolve_Receiver)
-	{
-	  name [0].id =
-	    CORBA::string_dup ("Receivers");
-	  
-	  object =
-	    sender_context->resolve (name,
-				     ACE_TRY_ENV);
-	  ACE_TRY_CHECK_EX (Resolve_Receiver);
-	
-	  if (TAO_debug_level > 0)  
-	    ACE_DEBUG ((LM_DEBUG,
-			"Receivers Context Found\n"));
-	  
-	  CosNaming::NamingContext_var receivers_context =
-	    CosNaming::NamingContext::_narrow (object.in ());
-	  
-	  name [0].id =
-	    CORBA::string_dup (receiver_name.c_str ());
-	  
-	  object =
-	    receivers_context->resolve (name,
-					ACE_TRY_ENV);
-	  ACE_TRY_CHECK_EX (Resolve_Receiver);
-
-	  AVStreams::MMDevice_var  mmdevice =
-	    AVStreams::MMDevice::_narrow (object.in ());
-	  
-	  if (mmdevice->_is_equivalent (receiver_mmdevice))
-	  {
-	    receivers_context->unbind (name,
-				       ACE_TRY_ENV);
-	    ACE_TRY_CHECK_EX (Resolve_Receiver);
-
-	    if (TAO_debug_level > 0)
-	      ACE_DEBUG ((LM_DEBUG,
-			  "Receiver Unbound\n"));
-	  }
-	}
+        {
+          name [0].id =
+            CORBA::string_dup ("Receivers");
+
+          object =
+            sender_context->resolve (name
+                                     TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (Resolve_Receiver);
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "Receivers Context Found\n"));
+
+          CosNaming::NamingContext_var receivers_context =
+            CosNaming::NamingContext::_narrow (object.in ());
+
+          name [0].id =
+            CORBA::string_dup (receiver_name.c_str ());
+
+          object =
+            receivers_context->resolve (name
+                                        TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK_EX (Resolve_Receiver);
+
+          AVStreams::MMDevice_var  mmdevice =
+            AVStreams::MMDevice::_narrow (object.in ());
+
+          if (mmdevice->_is_equivalent (receiver_mmdevice))
+          {
+            receivers_context->unbind (name
+                                       TAO_ENV_ARG_PARAMETER);
+            ACE_TRY_CHECK_EX (Resolve_Receiver);
+
+            if (TAO_debug_level > 0)
+              ACE_DEBUG ((LM_DEBUG,
+                          "Receiver Unbound\n"));
+          }
+        }
       ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
-	{
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Receiver Not found\n"));
-	  // Do not have to unbind.
-	}
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Receiver Not found\n"));
+          // Do not have to unbind.
+        }
       ACE_ENDTRY;
-      
+
     }
   ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "Sender Context Not Found\n"));
+                  "Sender Context Not Found\n"));
       // Do not have to unbind.
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 83d71d94977..f7f44716a56 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -47,43 +47,43 @@ public:
   // Initialize this class.
 
   void bind_to_receivers (const ACE_CString &sender_name,
-                          AVStreams::MMDevice_ptr sender,
-                          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                          AVStreams::MMDevice_ptr sender
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ());
+  void connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
-                       AVStreams::MMDevice_ptr receiver,
-                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                       AVStreams::MMDevice_ptr receiver
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Bind receiver to the sender.
 
-  void connect_to_sender (CORBA::Environment& ACE_TRY_ENV = TAO_default_environment ());
+  void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the sender that we found.
 
-  void destroy (CORBA::Environment & = TAO_default_environment ());
+  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Destroy all streams.
 
-  void destroy (const ACE_CString &flowname,
-                CORBA::Environment & = TAO_default_environment ());
+  void destroy (const ACE_CString &flowname
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Destroy streams associated with <flowname>.
 
-  void unbind_sender (const ACE_CString &sender_name, 
-		      AVStreams::MMDevice_ptr sender_mmdevice,
-		      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ;
+  void unbind_sender (const ACE_CString &sender_name,
+                      AVStreams::MMDevice_ptr sender_mmdevice
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) ;
   // Unbind the sender from the Naming Service
 
-  void unbind_receiver (const ACE_CString &sender_name, 
-			const ACE_CString &receiver_name, 
-			AVStreams::MMDevice_ptr receiver_mmdevice);
+  void unbind_receiver (const ACE_CString &sender_name,
+                        const ACE_CString &receiver_name,
+                        AVStreams::MMDevice_ptr receiver_mmdevice);
   // Unbind the Receiver from the Naming Service
 
   void add_streamctrl (const ACE_CString &flowname,
-                       TAO_StreamEndPoint *endpoint,
-                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                       TAO_StreamEndPoint *endpoint
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -111,10 +111,10 @@ public:
 
 protected:
 
-  void find_receivers (CORBA::Environment &ACE_TRY_ENV);
+  void find_receivers (TAO_ENV_SINGLE_ARG_DECL);
 
-  void add_to_receivers (CosNaming::BindingList &binding_list,
-                         CORBA::Environment& ACE_TRY_ENV);
+  void add_to_receivers (CosNaming::BindingList &binding_list
+                         TAO_ENV_ARG_DECL);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index a3c6579f6be..5720e0a6cb6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -21,12 +21,12 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
   if (signum == SIGINT)
     {
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "In the signal handler\n"));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "In the signal handler\n"));
+
       DISTRIBUTER::instance ()->done (1);
-                 
-    }  
+
+    }
   return 0;
 }
 
@@ -37,7 +37,7 @@ Distributer_Sender_StreamEndPoint::get_callback (const char *flow_name,
   /// Create and return the sender application callback to AVStreams
   /// for further upcalls.
   callback = &this->callback_;
-  
+
   ACE_CString fname = flow_name;
 
   this->callback_.flowname (fname);
@@ -59,7 +59,7 @@ Distributer_Sender_StreamEndPoint::set_protocol_object (const char *flowname,
   /// Store the related streamctrl.
   connection_manager.add_streamctrl (flowname,
                                      this);
-  
+
   return 0;
 }
 
@@ -87,17 +87,17 @@ Distributer_Receiver_StreamEndPoint::set_protocol_object (const char *,
   return 0;
 }
 
-CORBA::Boolean 
-Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec,
-                                                                  CORBA::Environment &)
+CORBA::Boolean
+Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
+                                                                  TAO_ENV_ARG_DECL_NOT_USED)
 {
   //if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"Distributer_Receiver_StreamEndPoint::handle_connection_requested\n"));	     
-  
+                "Distributer_Receiver_StreamEndPoint::handle_connection_requested\n"));
+
   Connection_Manager &connection_manager =
     DISTRIBUTER::instance ()->connection_manager ();
-  
+
   /// Check to see if the flow already exists. If it does then close the
   /// old connection and setup a new one with the new sender.
 
@@ -107,34 +107,34 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
     {
       TAO_Forward_FlowSpec_Entry entry;
       entry.parse (flowspec[i].in ());
-      
+
       //if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "Handle Conection Requested flowname %s \n",
-		    entry.flowname ()));	     
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "Handle Conection Requested flowname %s \n",
+                    entry.flowname ()));
+
       ACE_CString flowname (entry.flowname ());
-        
+
       int result =
                connection_manager.streamctrls ().find (flowname);
-      
+
       /// If the flowname is found.
       if (result == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "\nDistributer switching senders handle connection requested\n\n"));
-	  
-	  ///Destroy old stream with the same flowname.
-      	  connection_manager.destroy (flowname);
-	  
-	}
-      
+        {
+          ACE_DEBUG ((LM_DEBUG, "\nDistributer switching senders handle connection requested\n\n"));
+
+          ///Destroy old stream with the same flowname.
+          connection_manager.destroy (flowname);
+
+        }
+
       /// Store the related streamctrl.
       connection_manager.add_streamctrl (flowname.c_str (),
-					 this);
-      
+                                         this);
+
     }
   return 1;
-  
+
 }
 
 
@@ -149,7 +149,7 @@ Distributer_Receiver_Callback::flowname (void)
   return this->flowname_;
 }
 
-void 
+void
 Distributer_Receiver_Callback::flowname (const ACE_CString &flowname)
 {
   this->flowname_ = flowname;
@@ -193,13 +193,13 @@ Distributer_Receiver_Callback::handle_destroy (void)
 {
   /// Called when the sender requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
-	      "Distributer_Receiver_Callback::end_stream\n"));
-  
+              "Distributer_Receiver_Callback::end_stream\n"));
+
   DISTRIBUTER::instance ()->connection_manager ().streamctrls ().unbind (this->flowname_.c_str ());
-  
+
   /// Decrement the stream count.
   DISTRIBUTER::instance ()->stream_destroyed ();
-  
+
   return 0;
 }
 
@@ -209,7 +209,7 @@ Distributer_Sender_Callback::flowname (void)
   return this->flowname_;
 }
 
-void 
+void
 Distributer_Sender_Callback::flowname (const ACE_CString &flowname)
 {
   this->flowname_ = flowname;
@@ -222,11 +222,11 @@ Distributer_Sender_Callback::handle_destroy (void)
 
   ACE_DEBUG ((LM_DEBUG,
               "Distributer_Sender_Callback::end_stream\n"));
-  
+
   DISTRIBUTER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ());
-  
+
   DISTRIBUTER::instance ()->connection_manager ().streamctrls ().unbind (this->flowname_.c_str ());
-  
+
   DISTRIBUTER::instance ()->connection_manager ().receivers ().unbind (this->flowname_.c_str ());
 
   return 0;
@@ -244,17 +244,17 @@ Distributer::~Distributer (void)
 {
 }
 
-void 
+void
 Distributer::stream_created (void)
 {
   this->stream_count_++;
 }
 
-void 
+void
 Distributer::stream_destroyed (void)
 {
   this->stream_count_--;
-  
+
   if (this->stream_count_ == 0)
     this->done_ = 1;
 }
@@ -295,8 +295,8 @@ Distributer::parse_args (int argc,
 
 int
 Distributer::init (int argc,
-                   char ** argv,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   char ** argv
+                   TAO_ENV_ARG_DECL)
 {
   /// Initialize the connection class.
   int result =
@@ -324,15 +324,15 @@ Distributer::init (int argc,
   if (result != 0)
     return result;
 
-  ACE_Reactor *reactor = 
+  ACE_Reactor *reactor =
     TAO_AV_CORE::instance ()->reactor ();
-  
+
   if (reactor->register_handler (SIGINT,
-				 &this->signal_handler_) == -1)
+                                 &this->signal_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Error in handler register\n"),
-		      -1);
-  /// Register the signal handler for clean termination of the process.  
+                       "Error in handler register\n"),
+                      -1);
+  /// Register the signal handler for clean termination of the process.
 
   ACE_NEW_RETURN (this->distributer_sender_mmdevice_,
                   TAO_MMDevice (&this->sender_endpoint_strategy_),
@@ -343,7 +343,7 @@ Distributer::init (int argc,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
@@ -355,31 +355,31 @@ Distributer::init (int argc,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV);
+    this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
   /// Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
-                                            distributer_receiver_mmdevice.in (),
-                                            ACE_TRY_ENV);
+                                            distributer_receiver_mmdevice.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  
+
   /// Connect to sender.
-  this->connection_manager_.connect_to_sender (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  
+
   /// Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
-                                               distributer_sender_mmdevice.in (),
-                                               ACE_TRY_ENV);
+                                               distributer_sender_mmdevice.in ()
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  
+
   /// Connect to receivers
-  this->connection_manager_.connect_to_receivers (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  
+
   return 0;
 }
 
@@ -390,25 +390,25 @@ Distributer::done (void) const
 }
 
 void
-Distributer::shut_down (CORBA::Environment &ACE_TRY_ENV)
+Distributer::shut_down (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      AVStreams::MMDevice_var receiver_mmdevice = 
-	this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var receiver_mmdevice =
+        this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DISTRIBUTER::instance ()->connection_manager ().unbind_receiver (this->sender_name_,
-								       this->distributer_name_,
-								       receiver_mmdevice.in ());
-      AVStreams::MMDevice_var sender_mmdevice = 
-	this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV);
+                                                                       this->distributer_name_,
+                                                                       receiver_mmdevice.in ());
+      AVStreams::MMDevice_var sender_mmdevice =
+        this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       DISTRIBUTER::instance ()->connection_manager ().unbind_sender (this->distributer_name_,
-								     sender_mmdevice.in ());
-      
-      DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_TRY_ENV);
+                                                                     sender_mmdevice.in ());
+
+      DISTRIBUTER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -429,60 +429,60 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
       while (!DISTRIBUTER::instance ()->done ())
-	{
-	  orb->perform_work (ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+        {
+          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
-      DISTRIBUTER::instance ()->shut_down (ACE_TRY_ENV);
+      DISTRIBUTER::instance ()->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index 4f1a2e96c3c..b410f8a662e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -30,7 +30,7 @@ class Signal_Handler : public ACE_Event_Handler
   //   Useful to gracefully release the process
 
 public:
-  
+
   Signal_Handler (void);
 
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
@@ -64,7 +64,7 @@ public:
   /// Accessor methods for the flowname of the callback.
   ACE_CString &flowname (void);
   void flowname (const ACE_CString &flowname);
-  
+
 private:
   int frame_count_;
   /// Count of the frames passing through us.
@@ -80,9 +80,9 @@ class Distributer_Sender_Callback : public TAO_AV_Callback
   //    for receiving data.
   //
   // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the 
+  //    This class overides the methods of the TAO_AV_Callback so the
   //    AVStreams can make upcalls to the application.
-  
+
 public:
 
   int handle_destroy (void);
@@ -94,9 +94,9 @@ public:
   void flowname (const ACE_CString &flowname);
 
 private:
-  
+
   ACE_CString flowname_;
-  
+
 };
 
 class Distributer_Receiver_StreamEndPoint : public TAO_Server_StreamEndPoint
@@ -110,14 +110,14 @@ public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  
+
   int set_protocol_object (const char *,
-			   TAO_AV_Protocol_Object *object);
+                           TAO_AV_Protocol_Object *object);
   /// Store the reference to the protocol object corresponding
   /// to the transport
 
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,
-                                                      CORBA::Environment &);
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
+                                                      TAO_ENV_ARG_DECL_NOT_USED);
   /// Called when a sender makes a connection request.
 
 private:
@@ -139,7 +139,7 @@ public:
                            TAO_AV_Protocol_Object *object);
   /// Set protocol object corresponding to the transport protocol
   /// chosen.
-  
+
 protected:
   Distributer_Sender_Callback callback_;
   /// Application callback.
@@ -173,8 +173,8 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   /// Initialize data components.
 
   int parse_args (int argc,
@@ -190,11 +190,11 @@ public:
 
   void stream_created (void);
   /// Called when stream created
-  
+
   void stream_destroyed (void);
   /// Called when stream destroyed
 
-  void shut_down (CORBA::Environment &);
+  void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   ///Unbind the sender and receiver from the Naming Service
 
 protected:
@@ -221,13 +221,13 @@ protected:
 
   int done_;
   /// Flag to know when we are done.
-  
+
   int stream_count_;
-  /// Number of active streams. When a stream is disconnected this 
+  /// Number of active streams. When a stream is disconnected this
   /// count is decremented.
 
   Signal_Handler signal_handler_;
   /// Reference to the signal handler.
-  
+
 };
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index a33af2bec29..afede31f802 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -23,11 +23,11 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
   if (signum == SIGINT)
     {
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "In the signal handler\n"));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "In the signal handler\n"));
+
       done = 1;
-    }  
+    }
   return 0;
 }
 
@@ -41,54 +41,54 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name,
   /// Return the receiver application callback to the AVStreams for
   /// future upcalls.
   callback = &this->callback_;
-  
+
   ACE_CString fname = flow_name;
   this->callback_.flowname (fname);
   return 0;
 }
 
-CORBA::Boolean 
-Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec,
-						      CORBA::Environment &)
+CORBA::Boolean
+Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
+                                                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"In Handle Conection Requested \n"));	     
-  
+                "In Handle Conection Requested \n"));
+
   for (CORBA::ULong i = 0;
        i < flowspec.length ();
        i++)
     {
       TAO_Forward_FlowSpec_Entry entry;
       entry.parse (flowspec[i].in ());
-      
+
       ACE_DEBUG ((LM_DEBUG,
-		  "Handle Conection Requested flowname %s \n",
-		  entry.flowname ()));	     
-      
+                  "Handle Conection Requested flowname %s \n",
+                  entry.flowname ()));
+
       ACE_CString flowname (entry.flowname ());
-        
+
       int result =
-	connection_manager->streamctrls ().find (flowname);
-      
+        connection_manager->streamctrls ().find (flowname);
+
       /// If the flowname is found.
       if (result == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "\nReceiver switching distributers handle connection requested\n\n"));
-	  
-	  ///Destroy old stream with the same flowname.
-	  
-	  connection_manager->destroy (flowname);
-	  
-	}
-      
+        {
+          ACE_DEBUG ((LM_DEBUG, "\nReceiver switching distributers handle connection requested\n\n"));
+
+          ///Destroy old stream with the same flowname.
+
+          connection_manager->destroy (flowname);
+
+        }
+
       /// Store the related streamctrl.
       connection_manager->add_streamctrl (flowname.c_str (),
-					 this);
-      
+                                         this);
+
     }
   return 1;
-  
+
 }
 
 Receiver_Callback::Receiver_Callback (void)
@@ -102,7 +102,7 @@ Receiver_Callback::flowname (void)
   return this->flowname_;
 }
 
-void 
+void
 Receiver_Callback::flowname (const ACE_CString &flowname)
 {
   this->flowname_ = flowname;
@@ -113,11 +113,11 @@ Receiver_Callback::handle_destroy (void)
 {
   /// Called when the sender requests the stream to be shutdown.
   ACE_DEBUG ((LM_DEBUG,
-	      "Receiver_Callback::end_stream\n"));
+              "Receiver_Callback::end_stream\n"));
 
   /// Remove the related stream control reference.
   connection_manager->streamctrls ().unbind (this->flowname_.c_str ());
-  
+
   return 0;
 }
 int
@@ -180,8 +180,8 @@ Receiver::receiver_name (void)
 
 int
 Receiver::init (int,
-                char **,
-                CORBA::Environment &ACE_TRY_ENV)
+                char **
+                TAO_ENV_ARG_DECL)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -197,17 +197,17 @@ Receiver::init (int,
     return result;
 
   connection_manager = &this->connection_manager_;
-  
-  ACE_Reactor *reactor = 
+
+  ACE_Reactor *reactor =
     TAO_AV_CORE::instance ()->reactor ();
-  
+
   if (reactor->register_handler (SIGINT,
-				 &this->signal_handler_) == -1)
+                                 &this->signal_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Error in handler register\n"),
-		      -1);
+                       "Error in handler register\n"),
+                      -1);
   /// Register the signal handler for clean termination of the process.
-  
+
   /// Register the receiver mmdevice object with the ORB
   ACE_NEW_RETURN (this->mmdevice_,
                   TAO_MMDevice (&this->reactive_strategy_),
@@ -218,18 +218,18 @@ Receiver::init (int,
     this->mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
+    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
-                                            mmdevice.in (),
-                                            ACE_TRY_ENV);
+                                            mmdevice.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Connect to the sender.
-  this->connection_manager_.connect_to_sender (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -275,20 +275,20 @@ Receiver::output_file_name (void)
 }
 
 void
-Receiver::shut_down (CORBA::Environment &ACE_TRY_ENV)
+Receiver::shut_down (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       AVStreams::MMDevice_var mmdevice_obj =
-	this->mmdevice_->_this (ACE_TRY_ENV);
-      
+        this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+
       ACE_TRY_CHECK;
 
       this->connection_manager_.unbind_receiver (this->sender_name_,
-						 this->receiver_name_,
-						 mmdevice_obj.in ());
+                                                 this->receiver_name_,
+                                                 mmdevice_obj.in ());
 
-      this->connection_manager_.destroy (ACE_TRY_ENV);
+      this->connection_manager_.destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -297,46 +297,46 @@ Receiver::shut_down (CORBA::Environment &ACE_TRY_ENV)
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Receiver::unbind");
     }
   ACE_ENDTRY;
-	
+
 }
 
 int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Receiver receiver;
@@ -362,20 +362,20 @@ main (int argc,
 
       result =
         receiver.init (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      while (!done) 
-	{
-	  orb->perform_work (ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+      while (!done)
+        {
+          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
 
-      receiver.shut_down (ACE_TRY_ENV);
+      receiver.shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index f193d072230..fe302b57523 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -30,7 +30,7 @@ class Signal_Handler : public ACE_Event_Handler
   //   Useful to gracefully release the process
 
 public:
-  
+
   Signal_Handler (void);
 
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
@@ -61,7 +61,7 @@ public:
   /// Accessor methods for the flowname of the callback.
   ACE_CString &flowname (void);
   void flowname (const ACE_CString &flowname);
-  
+
 private:
   int frame_count_;
   /// Keeping a count of the incoming frames.
@@ -81,9 +81,9 @@ public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-  
-  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec,
-                                                      CORBA::Environment &);
+
+  virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
+                                                      TAO_ENV_ARG_DECL_NOT_USED);
   /// Called when a distributor tries to connect to the receiver
 
 private:
@@ -107,8 +107,8 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   /// Initialize data components.
 
   int parse_args (int argc,
@@ -117,11 +117,11 @@ public:
 
   ACE_CString output_file_name (void);
   /// Name of the output file.
-  
+
   ACE_CString sender_name (void);
   ACE_CString receiver_name (void);
 
-  void shut_down (CORBA::Environment &);
+  void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 protected:
   Connection_Manager connection_manager_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 71588022d7c..833a089cae7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -25,12 +25,12 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
   if (signum == SIGINT)
     {
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "In the signal handler\n"));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "In the signal handler\n"));
+
       g_shutdown = 1;
-      
-    }  
+
+    }
   return 0;
 }
 
@@ -40,7 +40,7 @@ Sender_Callback::flowname (void)
   return this->flowname_;
 }
 
-void 
+void
 Sender_Callback::flowname (const ACE_CString &flowname)
 {
   this->flowname_ = flowname;
@@ -51,11 +51,11 @@ int
 Sender_Callback::handle_destroy (void)
 {
   SENDER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ());
-   
+
   SENDER::instance ()->connection_manager ().streamctrls ().unbind (this->flowname_.c_str ());
 
   SENDER::instance ()->connection_manager ().receivers ().unbind (this->flowname_.c_str ());
-  
+
   //  SENDER::instance ()->remove_stream ();
 
   return 0;
@@ -66,14 +66,14 @@ Sender_StreamEndPoint::get_callback (const char * flowname,
                                      TAO_AV_Callback *&callback)
 {
   //SENDER::instance ()->add_stream ();
-    
+
   /// Create and return the client application callback and return to the AVStreams
   /// for further upcalls.
   callback = &this->callback_;
 
   ACE_CString flow_name (flowname);
   this->callback_.flowname (flow_name);
-    
+
   return 0;
 }
 
@@ -142,24 +142,24 @@ Sender::~Sender (void)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"Sender destructor\n"));
+                "Sender destructor\n"));
 }
 
 void
-Sender::shut_down (CORBA::Environment &ACE_TRY_ENV)
+Sender::shut_down (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       AVStreams::MMDevice_var mmdevice =
-	this->sender_mmdevice_->_this (ACE_TRY_ENV);
+        this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
-								mmdevice.in (),
-								ACE_TRY_ENV);
+                                                                mmdevice.in ()
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      SENDER::instance ()->connection_manager ().destroy (ACE_TRY_ENV);
+
+      SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -204,8 +204,8 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv,
-              CORBA::Environment& ACE_TRY_ENV)
+              char **argv
+              TAO_ENV_ARG_DECL)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -226,15 +226,15 @@ Sender::init (int argc,
                       argv);
   if (result != 0)
     return result;
-  
-  ACE_Reactor *reactor = 
+
+  ACE_Reactor *reactor =
     TAO_AV_CORE::instance ()->reactor ();
-  
+
   if (reactor->register_handler (SIGINT,
-				 &this->signal_handler_) == -1)
+                                 &this->signal_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Error in handler register\n"),
-		      -1);
+                       "Error in handler register\n"),
+                      -1);
   /// Register the signal handler for clean termination of the process.
 
   /// Open file to read.
@@ -261,18 +261,18 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Register the object reference with the Naming Service and bind to
   /// the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
-                                               mmdevice.in (),
-                                               ACE_TRY_ENV);
+                                               mmdevice.in ()
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Connect to the receivers
-  this->connection_manager_.connect_to_receivers (ACE_TRY_ENV);
+  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -280,7 +280,7 @@ Sender::init (int argc,
 
 /// Method to send data at the specified rate
 int
-Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
+Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 {
   /// The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -304,16 +304,16 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
       while (1)
         {
 
-	  if (g_shutdown == 1)
-	    {
-	      ACE_DEBUG ((LM_DEBUG,
-			  "Shut Down called\n"));
+          if (g_shutdown == 1)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Shut Down called\n"));
 
-	      this->shut_down (ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
+              this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
 
-	      break;
-	    }
+              break;
+            }
 
           /// Read from the file into a message block.
           int n = ACE_OS::fread (this->mb_.wr_ptr (),
@@ -329,16 +329,16 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
           if (n == 0)
             {
               /// At end of file break the loop and end the sender.
-	      if (TAO_debug_level > 0)
+              if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n"));
 
-	      this->shut_down (ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
+              this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              break;
 
-	      break;
-			    
             }
-	  
+
           this->mb_.wr_ptr (n);
 
           if (this->frame_count_ > 1)
@@ -374,9 +374,9 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
                   /// Run the orb for the wait time so the sender can
                   /// continue other orb requests.
-		  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-							 ACE_TRY_ENV);
-		  ACE_TRY_CHECK;
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                         TAO_ENV_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
 
                 }
             }
@@ -450,51 +450,51 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ///Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv,
-                                          ACE_TRY_ENV);
+                                          argv
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"), -1);
 
-      SENDER::instance ()->pace_data (ACE_TRY_ENV);
+      SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->destroy ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 9e64e1ee716..a28a58fc69f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -30,7 +30,7 @@ class Signal_Handler : public ACE_Event_Handler
   //   Useful to gracefully release the process
 
 public:
-  
+
   Signal_Handler (void);
 
   int handle_signal(int signum, siginfo_t*,ucontext_t*);
@@ -45,11 +45,11 @@ class Sender_Callback : public TAO_AV_Callback
   //    Defines a class for the sender application callback.
   //
   // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the 
+  //    This class overides the methods of the TAO_AV_Callback so the
   //    AVStreams can make upcalls to the application.
 
 public:
-  
+
   int handle_destroy (void);
   /// Called when the sender has finished reading the file and wants
   /// to close down the connection. Also called when the distributer
@@ -58,7 +58,7 @@ public:
   ACE_CString &flowname (void);
   void flowname (const ACE_CString &flowname);
   /// Accessor methods for the flowname of the callback
-  
+
 private:
   ACE_CString flowname_;
   /// Flowname of the callback.
@@ -109,14 +109,14 @@ public:
   ~Sender (void);
   /// Destructor
 
-  void shut_down (CORBA::Environment &);
+  void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment&);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   /// Method to initialize the various data components.
 
-  int pace_data (CORBA::Environment &);
+  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   /// Method to pace and send data from a file.
 
   Connection_Manager &connection_manager (void);
@@ -152,10 +152,10 @@ private:
 
   Connection_Manager connection_manager_;
   /// Connection manager.
-  
+
   //  int stream_count_;
   /// Teh count of the number of streams that are active
-  
+
   Signal_Handler signal_handler_;
   /// Reference to the signal handler.
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index a64c2ff9856..ab852c5c2de 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -49,9 +49,9 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
-                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   ACE_TRY_CHECK;
                   return 0;
@@ -192,7 +192,7 @@ Client::Client (void)
 int
 Client::bind_to_server (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -207,13 +207,13 @@ Client::bind_to_server (void)
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
       CORBA::Object_var server_mmdevice_obj =
-        my_naming_client_->resolve (server_mmdevice_name,
-                                  ACE_TRY_ENV);
+        my_naming_client_->resolve (server_mmdevice_name
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->server_mmdevice_ =
-        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (),
-                                      ACE_TRY_ENV);
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
@@ -238,7 +238,7 @@ Client::init (int argc,char **argv)
   this->argv_ = argv;
 
   CORBA::String_var ior;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -261,12 +261,12 @@ Client::init (int argc,char **argv)
                        "Data");
 
       this->fdev_->flowname (this->flowname ());
-      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV);
+      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      mmdevice->add_fdev (fdev.in (),
-                          ACE_TRY_ENV);
+      mmdevice->add_fdev (fdev.in ()
+                          TAO_ENV_ARG_PARAMETER);
 
       if (this->my_naming_client_.init (this->orb_.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -299,7 +299,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       char flow_protocol_str [BUFSIZ];
@@ -324,16 +324,16 @@ Client::run (void)
       timer.start ();
 
       AVStreams::MMDevice_var client_mmdevice
-        = this->client_mmdevice_._this (ACE_TRY_ENV);
+        = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-        
+
       // Bind the client and server mmdevices.
       CORBA::Boolean result =
         this->streamctrl_.bind_devs (client_mmdevice.in (),
                                      this->server_mmdevice_.in (),
                                      the_qos.inout (),
-                                     flow_spec,
-                                     ACE_TRY_ENV);
+                                     flow_spec
+                                     TAO_ENV_ARG_PARAMETER);
       timer.stop ();
       timer.elapsed_time (elapsed);
       elapsed.dump ();
@@ -341,12 +341,12 @@ Client::run (void)
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
       AVStreams::flowSpec start_spec (1);
-      this->streamctrl_.start (start_spec,ACE_TRY_ENV);
+      this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Schedule a timer for the for the flow handler.
       ACE_Time_Value tv (10000,0);
-      this->orb_->run (tv, ACE_TRY_ENV);
+      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -366,21 +366,21 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -390,10 +390,10 @@ main (int argc,
         ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
       result = CLIENT::instance ()->run ();
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (result < 0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index d396833b908..aac3bf6209c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -10,11 +10,11 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
   protocols [2] = CORBA::string_dup ("RTP/UDP");
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->set_protocol_restriction (protocols,
-                                      ACE_TRY_ENV);
+      this->set_protocol_restriction (protocols
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -103,7 +103,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       PortableServer::POAManager_var mgr
@@ -133,10 +133,10 @@ Server::init (int argc,
 
       this->fdev_->flowname ("Data");
 
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV);
+      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (fdev.in ()))
@@ -145,7 +145,7 @@ Server::init (int argc,
       if (CORBA::is_nil (mmdevice.in ()))
         cout << "MMDevice is nil" << endl;
 
-      mmdevice->add_fdev (fdev.in (), ACE_TRY_ENV);
+      mmdevice->add_fdev (fdev.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the mmdevice with the naming service.
@@ -155,8 +155,8 @@ Server::init (int argc,
 
       // Register the video control object with the naming server.
       this->my_naming_client_->rebind (server_mmdevice_name,
-                                       mmdevice.in (),
-                                       ACE_TRY_ENV);
+                                       mmdevice.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -172,10 +172,10 @@ Server::init (int argc,
 int
 Server::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
     ACE_CATCHANY
@@ -226,22 +226,22 @@ main (int argc,
       char **argv)
 {
   int result = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index fcfa07ea215..6f7c7af972f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -85,7 +85,7 @@ int main (int argc, char *argv[])
                                             argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -97,8 +97,8 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Connect the two streams and run them...
@@ -128,19 +128,19 @@ int main (int argc, char *argv[])
       TAO_StreamCtrl stream_control_impl;
 
       AVStreams::StreamCtrl_var stream_control =
-        stream_control_impl._this (ACE_TRY_ENV);
+        stream_control_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj = orb->string_to_object (ping_ior, ACE_TRY_ENV);
+      obj = orb->string_to_object (ping_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::MMDevice_var ping_sender =
-        AVStreams::MMDevice::_narrow (obj.in (), ACE_TRY_ENV);
+        AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj = orb->string_to_object (pong_ior, ACE_TRY_ENV);
+      obj = orb->string_to_object (pong_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::MMDevice_var pong_sender =
-        AVStreams::MMDevice::_narrow (obj.in (), ACE_TRY_ENV);
+        AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AVStreams::streamQoS_var the_qos =
@@ -149,29 +149,29 @@ int main (int argc, char *argv[])
       stream_control->bind_devs (pong_sender.in (),
                                  ping_sender.in (),
                                  the_qos.inout (),
-                                 flow_spec,
-                                 ACE_TRY_ENV);
+                                 flow_spec
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       flow_spec.length (0);
-      stream_control->start (flow_spec, ACE_TRY_ENV);
+      stream_control->start (flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (100, 0);
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
      // flow_spec.length (0);
-     // stream_control->stop (flow_spec, ACE_TRY_ENV);
+     // stream_control->stop (flow_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 98d415865df..3a061df9629 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -101,7 +101,7 @@ int main (int argc, char *argv[])
                                             argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -113,8 +113,8 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the video mmdevice object with the ORB
@@ -129,11 +129,11 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (ACE_TRY_ENV);
+        mmdevice_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in (), ACE_TRY_ENV);
+        orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -161,18 +161,18 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (ACE_TRY_ENV);
+        ping_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (ACE_TRY_ENV);
+        pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mmdevice->add_fdev (ping_fdev.in (), ACE_TRY_ENV);
+      mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in (), ACE_TRY_ENV);
+          mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -190,7 +190,7 @@ int main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index bd50c1f2842..2ab4114cd1e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -118,7 +118,7 @@ int main (int argc, char *argv[])
                                             argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -130,8 +130,8 @@ int main (int argc, char *argv[])
       mgr->activate ();
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Reactive_Strategy *reactive_strategy;
@@ -145,11 +145,11 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (ACE_TRY_ENV);
+        mmdevice_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in (), ACE_TRY_ENV);
+        orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -177,17 +177,17 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (ACE_TRY_ENV);
+        ping_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (ACE_TRY_ENV);
+        pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mmdevice->add_fdev (ping_fdev.in (), ACE_TRY_ENV);
+      mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in (), ACE_TRY_ENV);
+          mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -208,7 +208,7 @@ int main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index 6210c289a7b..027a15f2ee3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -1,4 +1,4 @@
-// $Id$ 
+// $Id$
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
@@ -25,13 +25,13 @@ Receiver_StreamEndPoint::get_callback (const char *,
   ACE_TRY_NEW_ENV
     {
       CORBA::Any_ptr streamctrl_any =
-        this->get_property_value ("Related_StreamCtrl",
-                                  ACE_TRY_ENV);
+        this->get_property_value ("Related_StreamCtrl"
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       AVStreams::StreamCtrl_ptr streamctrl;
       *streamctrl_any >>= streamctrl;
-      
+
       // Store the stream control for the stream with the callback.
       this->callback_.streamctrl (streamctrl);
     }
@@ -39,11 +39,11 @@ Receiver_StreamEndPoint::get_callback (const char *,
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Sender_StreamEndPoint::get_callback failed");
-      
+
       return -1;
     }
   ACE_ENDTRY;
-  
+
   return 0;
 }
 
@@ -73,7 +73,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::receive_frame for frame %d\n",
               ++this->frame_count_));
-  
+
 
   if (this->streamctrl_ != 0)
     {
@@ -86,27 +86,27 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
                                             "",
                                             "",
                                             0);
-  
+
           AVStreams::flowSpec flow_spec (1);
           flow_spec.length (1);
           flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
-          
-          // Initialize the qos parameter(s) that need to be changed 
+
+          // Initialize the qos parameter(s) that need to be changed
           // with the corresponding value.
           AVStreams::streamQoS qos;
           qos.length (1);
-          
+
           // The QoS Type that needs to be changed.
           qos [0].QoSType =  CORBA::string_dup ("video_qos");
-          
+
           qos [0].QoSParams.length (1);
           qos [0].QoSParams [0].property_name = CORBA::string_dup ("video_frame_rate");
           qos [0].QoSParams [0].property_value <<= (CORBA::Short) 30;
 
           ACE_DECLARE_NEW_CORBA_ENV;
-          
+
           // Initiate the modifying of the qos for the flows.
-          this->streamctrl_->modify_QoS (qos, flow_spec, ACE_TRY_ENV);
+          this->streamctrl_->modify_QoS (qos, flow_spec TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           ACE_DEBUG ((LM_DEBUG,
@@ -115,7 +115,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
     }
   else ACE_DEBUG ((LM_DEBUG,
                    "No Stream Ctrl\n"));
-  
+
   while (frame != 0)
     {
       // Write the received data to the file.
@@ -145,8 +145,8 @@ Receiver_Callback::handle_destroy (void)
 
   ACE_TRY_NEW_ENV
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0,
-                                                  ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -174,8 +174,8 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **,
-                CORBA::Environment &ACE_TRY_ENV)
+                char **
+                TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -194,7 +194,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
+    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -212,8 +212,8 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in (),
-                                ACE_TRY_ENV);
+                                mmdevice.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -250,39 +250,39 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -308,20 +308,20 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 9fba843cfa1..11e76614d32 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -6,7 +6,7 @@
  *  @file   receiver.h
  *
  *  receiver.h,v 1.1 2001/04/15 02:56:26 yamuna Exp
- *  
+ *
  *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
  */
 //=============================================================================
@@ -36,14 +36,14 @@ public:
 
   /// Set the related stream control for this flow.
   void streamctrl (AVStreams::StreamCtrl_ptr streamctrl);
-  
+
 private:
   int frame_count_;
   /// Keeping a count of the incoming frames.
-  
+
   /// Related stream control.
   AVStreams::StreamCtrl_ptr streamctrl_;
-  
+
 };
 
 // = AVStreams calls this class during connection setup.
@@ -54,7 +54,7 @@ public:
   /// Create a receiver application callback.
   int get_callback (const char *flowname,
                     TAO_AV_Callback *&callback);
-    
+
 private:
   Receiver_Callback callback_;
   /// Receiver application callback.
@@ -71,11 +71,11 @@ public:
   /// Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   /// Initialize data components.
-  
-  
+
+
 protected:
   TAO_Naming_Client naming_client_;
   /// The Naming Service Client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 3a73cc54205..b06449a23e8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -33,15 +33,15 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
 
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
-                                   const AVStreams::flowSpec &/* the_flows */,
-                                   CORBA::Environment &/* ACE_TRY_ENV */)
+                                   const AVStreams::flowSpec &/* the_flows */
+                                   TAO_ENV_ARG_DECL_NOT_USED)
                             ACE_THROW_SPEC((CORBA::SystemException,
                                             AVStreams::noSuchFlow,
                                             AVStreams::QoSRequestFailed ))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Sender_StreamEndPoint::modify_QoS\n"));
-  
+
   // Check if the qos for the flow has changed.
   if (new_qos.length () != 0)
     {
@@ -53,10 +53,10 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
           // Get the new value of the frame rate.
           CORBA::Any frame_rate_any =
             new_qos [0].QoSParams [0].property_value;
-          
+
           CORBA::Short frame_rate;
           frame_rate_any >>= frame_rate;
-          
+
           // Calculate the new inter frame time.
           inter_frame_time.set (1 / (double) frame_rate);
         }
@@ -119,7 +119,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
+Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -128,13 +128,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_client_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (),
-                                  ACE_TRY_ENV);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -147,8 +147,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
 
 int
 Sender::init (int argc,
-              char **argv,
-              CORBA::Environment &ACE_TRY_ENV)
+              char **argv
+              TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -185,9 +185,9 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_TRY_ENV);
+  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  
+
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) Error binding to the naming service\n"),
@@ -219,7 +219,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -234,8 +234,8 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec,
-                                  ACE_TRY_ENV);
+                                  flow_spec
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -248,7 +248,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
+Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 {
 
 
@@ -324,8 +324,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-                                                         ACE_TRY_ENV);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -354,13 +354,11 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec,
-                                  ACE_TRY_ENV);
+      this->streamctrl_->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        
+
         // Shut the orb down.
-        TAO_AV_CORE::instance ()->orb ()->shutdown (1,
-                                                    ACE_TRY_ENV);
+        TAO_AV_CORE::instance ()->orb ()->shutdown (1 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -377,44 +375,44 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv,
-                                          ACE_TRY_ENV);
+                                          argv
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -423,7 +421,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_TRY_ENV);
+      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 9f3b47cd9a8..21ea6e49778 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -5,7 +5,7 @@
  *  @file sender.h
  *
  *  $Id$
- *  
+ *
  *  @author Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
  */
 //=============================================================================
@@ -28,13 +28,13 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
                            TAO_AV_Protocol_Object *object);
   /// Set protocol object corresponding to the transport protocol
   /// chosen.
-  
+
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-			     const AVStreams::flowSpec &flow_spec,
-			     CORBA::Environment &ACE_TRY_ENV)
-	                    ACE_THROW_SPEC((CORBA::SystemException,
-                                            AVStreams::noSuchFlow, 
-					    AVStreams::QoSRequestFailed ));
+                             const AVStreams::flowSpec &flow_spec
+                             TAO_ENV_ARG_DECL)
+                            ACE_THROW_SPEC((CORBA::SystemException,
+                                            AVStreams::noSuchFlow,
+                                            AVStreams::QoSRequestFailed ));
 
   /// The over-ridden modify_qos method to change the qos of the
   /// flows specified in the flow spec to that in the new_qos.
@@ -64,11 +64,11 @@ public:
   /// Constructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment&);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   /// Method to initialize the various data components.
 
-  int pace_data (CORBA::Environment &);
+  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   /// Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -78,7 +78,7 @@ private:
   int parse_args (int argc, char **argv);
   /// Method to parse the command line arguments.
 
-  int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV);
+  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
   /// Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 2d8f75ff7a7..0161ba2d659 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -53,10 +53,10 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  //ACE_DECLARE_NEW_CORBA_ENV;
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
+                  //TAO_ENV_DECLARE_NEW_ENV;
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
-//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
 //                    ACE_TRY_CHECK;
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   ACE_TRY_CHECK;
@@ -186,7 +186,7 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -195,13 +195,13 @@ Client::bind_to_server (const char *name)
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
-        my_naming_client_->resolve (server_mmdevice_name,
-                                    ACE_TRY_ENV);
+        my_naming_client_->resolve (server_mmdevice_name
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->server_mmdevice_ =
-        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (),
-                                      ACE_TRY_ENV);
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
@@ -252,7 +252,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       char flow_protocol_str [BUFSIZ];
@@ -280,16 +280,16 @@ Client::run (void)
       flow_spec [0] = entry.entry_to_string ();
       flow_spec.length (1);
 
-      AVStreams::MMDevice_var client_mmdevice 
-        = this->client_mmdevice_._this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var client_mmdevice
+        = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean result =
         this->streamctrl_.bind_devs (client_mmdevice.in (),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
-                                     flow_spec,
-                                     ACE_TRY_ENV);
+                                     flow_spec
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice1") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -298,8 +298,8 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec,
-                                            ACE_TRY_ENV);
+                                            flow_spec
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice2") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -308,8 +308,8 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec,
-                                            ACE_TRY_ENV);
+                                            flow_spec
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == 0)
@@ -317,13 +317,13 @@ Client::run (void)
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec,ACE_TRY_ENV);
+      this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
       ACE_Time_Value tv (10000,0);
 
-      TAO_AV_CORE::instance ()->orb ()->run (tv, ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -344,21 +344,21 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 4c5f0ec212d..4fa4582f4b2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -65,7 +65,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -94,23 +94,23 @@ Server::init (int argc,
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1");
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_TRY_EX (bind)
         {
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in (),
-                                         ACE_TRY_ENV);
+                                         mmdevice.in ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bind);
         }
       ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
         {
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in (),
-                                         ACE_TRY_ENV);
+                                         mmdevice.in ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_ENDTRY;
@@ -129,10 +129,10 @@ Server::init (int argc,
 int
 Server::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      TAO_AV_CORE::instance ()->orb ()->run (ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
     ACE_CATCHANY
@@ -186,20 +186,20 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 50247d880d6..d624906a378 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -48,10 +48,10 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  //ACE_DECLARE_NEW_CORBA_ENV;
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
+                  //TAO_ENV_DECLARE_NEW_ENV;
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
-                  // CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+                  // CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
                   //ACE_TRY_CHECK;
                   ACE_DEBUG ((LM_DEBUG, "Just before Orb Shutdown\n"));
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
@@ -196,7 +196,7 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -211,13 +211,13 @@ Client::bind_to_server (const char *name)
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
-        my_naming_client_->resolve (server_mmdevice_name,
-                                  ACE_TRY_ENV);
+        my_naming_client_->resolve (server_mmdevice_name
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->server_mmdevice_ =
-        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (),
-                                      ACE_TRY_ENV);
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
@@ -241,7 +241,7 @@ Client::init (int argc,char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       PortableServer::POAManager_var mgr
@@ -263,12 +263,12 @@ Client::init (int argc,char **argv)
       ACE_OS::sprintf (this->flowname_,
                        "Data");
       this->fdev_->flowname (this->flowname ());
-      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV);
+      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      mmdevice->add_fdev (fdev.in (),
-                          ACE_TRY_ENV);
+      mmdevice->add_fdev (fdev.in ()
+                          TAO_ENV_ARG_PARAMETER);
 
       if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -295,7 +295,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       char flow_protocol_str [BUFSIZ];
@@ -316,17 +316,17 @@ Client::run (void)
                                         &addr);
       flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
       flow_spec.length (1);
-      
+
       AVStreams::MMDevice_var client_mmdevice =
-        this->client_mmdevice_._this (ACE_TRY_ENV);
+        this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean result =
         this->streamctrl_.bind_devs (client_mmdevice.in (),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
-                                     flow_spec,
-                                     ACE_TRY_ENV);
+                                     flow_spec
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Suuceessful ONE\n"));
       if (result == 0)
@@ -338,8 +338,8 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec,
-                                            ACE_TRY_ENV);
+                                            flow_spec
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Suuceessful TWO\n"));
@@ -354,8 +354,8 @@ Client::run (void)
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
-                                            flow_spec,
-                                            ACE_TRY_ENV);
+                                            flow_spec
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Suuceessful THREE\n"));
       if (result == 0)
@@ -363,13 +363,13 @@ Client::run (void)
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec,ACE_TRY_ENV);
+      this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
 
       ACE_Time_Value tv (10000,0);
-      TAO_AV_CORE::instance ()->orb ()->run (tv, ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -394,20 +394,20 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index c639a4897f8..5c1275ac3bd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -9,11 +9,11 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols.length (2);
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->set_protocol_restriction (protocols,
-                                      ACE_TRY_ENV);
+      this->set_protocol_restriction (protocols
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -82,14 +82,14 @@ FTP_Server_Callback::handle_end_stream (void)
 //                                 AVStreams::QoS & the_qos,
 //                                 CORBA::Boolean_out met_qos,
 //                                 char *& named_fdev,
-//                                 CORBA::Environment &ACE_TRY_ENV)
+//                                 TAO_ENV_SINGLE_ARG_DECL)
 // {
 //   ACE_DEBUG ((LM_DEBUG,"FTP_Server_FDev::make_consumer"));
 //   FTP_Server_FlowEndPoint *endpoint;
 //   ACE_NEW_RETURN (endpoint,
 //                   FTP_Server_FlowEndPoint,
 //                   0);
-//   return endpoint->_this (ACE_TRY_ENV);
+//   return endpoint->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 //   ACE_CHECK_RETURN (0);
 // }
 
@@ -119,7 +119,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -148,12 +148,12 @@ Server::init (int argc,
                       FTP_Server_FDev,
                       -1);
       this->fdev_->flowname ("Data");
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_TRY_ENV);
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_TRY_ENV);
+      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      mmdevice->add_fdev (fdev.in (),
-                          ACE_TRY_ENV);
+      mmdevice->add_fdev (fdev.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the mmdevice with the naming service.
@@ -164,16 +164,16 @@ Server::init (int argc,
         {
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in (),
-                                         ACE_TRY_ENV);
+                                         mmdevice.in ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bind);
         }
       ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
         {
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
-                                         mmdevice.in (),
-                                         ACE_TRY_ENV);
+                                         mmdevice.in ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_ENDTRY;
@@ -192,10 +192,10 @@ Server::init (int argc,
 int
 Server::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      TAO_AV_CORE::instance ()->orb ()->run (ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
     ACE_CATCHANY
@@ -249,20 +249,20 @@ main (int argc,
 
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
 
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      poa.in (),
-                                      ACE_TRY_ENV);
+                                      poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 354ea8d2b3a..969f9c8d451 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -79,9 +79,9 @@ Client::parse_args (int argc,
         case 'p':
           this->protocol_ = ACE_OS::strdup (opts.optarg);
           break;
-	case 'r':
-	  this->frame_rate_ = ACE_OS::atoi (opts.optarg);
-	  break;
+        case 'r':
+          this->frame_rate_ = ACE_OS::atoi (opts.optarg);
+          break;
         case 's':
           this->use_sfp_ = 1;
           break;
@@ -124,14 +124,14 @@ Client::frame_rate (void)
 
 // Method to get the object reference of the server
 int
-Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV)
+Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Initialize the naming services
   if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize "
-		       "the TAO_Naming_Client. \n"),
-		      -1);
+                       " (%P|%t) Unable to initialize "
+                       "the TAO_Naming_Client. \n"),
+                      -1);
 
   CosNaming::Name server_mmdevice_name (1);
   server_mmdevice_name.length (1);
@@ -139,27 +139,27 @@ Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV)
 
   // Resolve the server object reference from the Naming Service
   CORBA::Object_var server_mmdevice_obj =
-    my_naming_client_->resolve (server_mmdevice_name,
-				ACE_TRY_ENV);
+    my_naming_client_->resolve (server_mmdevice_name
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->server_mmdevice_ =
-    AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (),
-				  ACE_TRY_ENV);
+    AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->server_mmdevice_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Could not resolve Server_MMdevice in Naming service <%s>\n"),
-		      -1);
+                       "Could not resolve Server_MMdevice in Naming service <%s>\n"),
+                      -1);
 
   return 0;
 }
 
 int
 Client::init (int argc,
-	      char **argv,
-	      CORBA::Environment& ACE_TRY_ENV)
+              char **argv
+              TAO_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -179,15 +179,15 @@ Client::init (int argc,
 
   // Open file to read.
   this->fp_ = ACE_OS::fopen (this->filename_,
-			     "r");
+                             "r");
   if (this->fp_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
-		       "Cannot open output file %s\n",
-		       this->filename_),
-		      -1);
+                       "Cannot open output file %s\n",
+                       this->filename_),
+                      -1);
 
-  result 
-    = this->bind_to_server (ACE_TRY_ENV);
+  result
+    = this->bind_to_server (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Resolve the object reference of the server from the Naming Service.
@@ -195,15 +195,15 @@ Client::init (int argc,
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) Error binding to the naming service\n"),
                       -1);
-  
+
   // Create the Flow protocol name
   char flow_protocol_str [BUFSIZ];
   if (this->use_sfp_)
     ACE_OS::strcpy (flow_protocol_str,
-		    "sfp:1.0");
+                    "sfp:1.0");
   else
     ACE_OS::strcpy (flow_protocol_str,
-		    "");
+                    "");
 
   // Initialize the  QoS
   AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
@@ -213,36 +213,36 @@ Client::init (int argc,
 
   // Initialize the flowname
   ACE_NEW_RETURN (this->flowname_,
-		  char [BUFSIZ],
-		  0);
+                  char [BUFSIZ],
+                  0);
 
   ACE_OS::sprintf (this->flowname_,
-		   "Data_%s",
-		   this->protocol_);
+                   "Data_%s",
+                   this->protocol_);
 
   // Create the forward flow specification to describe the flow.
   TAO_Forward_FlowSpec_Entry entry (this->flowname_,
-				    "IN",
-				    "USER_DEFINED",
-				    flow_protocol_str,
-				    this->protocol_,
-				    &addr);
+                                    "IN",
+                                    "USER_DEFINED",
+                                    flow_protocol_str,
+                                    this->protocol_,
+                                    &addr);
 
   AVStreams::flowSpec flow_spec (1);
   flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
   flow_spec.length (1);
 
-  AVStreams::MMDevice_var client_mmdevice = 
-    this->client_mmdevice_._this (ACE_TRY_ENV);
+  AVStreams::MMDevice_var client_mmdevice =
+    this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind/Connect  the client and server MMDevices.
   CORBA::Boolean bind_result =
     this->streamctrl_.bind_devs (client_mmdevice.in (),
-				 this->server_mmdevice_.in (),
-				 the_qos.inout (),
-				 flow_spec,
-				 ACE_TRY_ENV);
+                                 this->server_mmdevice_.in (),
+                                 the_qos.inout (),
+                                 flow_spec
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -253,7 +253,7 @@ Client::init (int argc,
 
 // Method to send data at the specified rate
 int
-Client::pace_data (CORBA::Environment& ACE_TRY_ENV)
+Client::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   // Rate at which frames of data need to be sent.
@@ -281,45 +281,45 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV)
 
       // Continue to send data till the file is read to the end.
       while (1)
-	{
+        {
           // Count the frames sent.
-	  count_++;
+          count_++;
 
           // Read from the file into a message block.
-	  int n = ACE_OS::fread(this->mb.rd_ptr (),
-				1,
-				this->mb.size (),
-				CLIENT::instance ()->file ());
-
-	  if (n < 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "FTP_Client_Flow_Handler::fread end of file\n"),
-			      -1);
-
-	  if (n == 0)
-	    {
-	      if (feof (CLIENT::instance ()->file ()))
-		{
+          int n = ACE_OS::fread(this->mb.rd_ptr (),
+                                1,
+                                this->mb.size (),
+                                CLIENT::instance ()->file ());
+
+          if (n < 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "FTP_Client_Flow_Handler::fread end of file\n"),
+                              -1);
+
+          if (n == 0)
+            {
+              if (feof (CLIENT::instance ()->file ()))
+                {
                   // At end of file break the loop and end the client.
                   if (TAO_debug_level > 0)
                     ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n"));
                   break;
                 }
 
-	    }
+            }
 
-	  this->mb.wr_ptr (n);
+          this->mb.wr_ptr (n);
 
-	  if ( this->count_ > 1)
-	    {
+          if ( this->count_ > 1)
+            {
               // Greater than the first frame.
 
               // Stop the timer that was started just before the previous frame was sent.
-	      last_frame_sent_time.stop ();
+              last_frame_sent_time.stop ();
 
               // Get the time elapsed after sending the previous frame.
-	      ACE_Time_Value tv;
-	      last_frame_sent_time.elapsed_time (tv);
+              ACE_Time_Value tv;
+              last_frame_sent_time.elapsed_time (tv);
 
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,
@@ -327,12 +327,12 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV)
                             tv.msec ()));
 
               // Check to see if the inter frame time has elapsed.
-	      if (tv < inter_frame_time)
-		{
+              if (tv < inter_frame_time)
+                {
                   // Inter frame time has not elapsed.
 
                   // Claculate the time to wait before the next frame needs to be sent.
-		  ACE_Time_Value wait_time (inter_frame_time - tv);
+                  ACE_Time_Value wait_time (inter_frame_time - tv);
 
                   if (TAO_debug_level > 0)
                     ACE_DEBUG ((LM_DEBUG,
@@ -340,32 +340,32 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV)
                                 wait_time.msec ()));
 
                   // run the orb for the wait time so the client can continue other orb requests.
-		  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-							 ACE_TRY_ENV);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
-		}
-	    }
+                }
+            }
 
           // Start timer before sending the frame.
-	  last_frame_sent_time.start ();
+          last_frame_sent_time.start ();
 
           // Send frame.
           int result = this->protocol_object_->send_frame (&this->mb);
-	  if (result < 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "send failed:%p","FTP_Client_Flow_Handler::send\n"),
-			      -1);
+          if (result < 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "send failed:%p","FTP_Client_Flow_Handler::send\n"),
+                              -1);
           ACE_DEBUG ((LM_DEBUG,"Client::pace_data buffer sent succesfully\n"));
 
           // Reset the mb.
           this->mb.reset ();
 
-	} // end while
+        } // end while
 
       // Since the file is read stop the stream.
       AVStreams::flowSpec stop_spec (1);
-      CLIENT::instance ()->streamctrl ()->destroy (stop_spec,
-						   ACE_TRY_ENV);
+      CLIENT::instance ()->streamctrl ()->destroy (stop_spec
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Shut the orb down.
@@ -376,7 +376,7 @@ Client::pace_data (CORBA::Environment& ACE_TRY_ENV)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Client::pace_data Failed");
+                           "Client::pace_data Failed");
       return -1;
     }
   ACE_ENDTRY;
@@ -387,52 +387,52 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-					   ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-					ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV STream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // INitialize the Client.
       int result = 0;
       result = CLIENT::instance ()->init (argc,
-					  argv,
-					  ACE_TRY_ENV);
+                                          argv
+                                          TAO_ENV_ARG_PARAMETER);
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-			   "client::init failed\n"),1);
+                           "client::init failed\n"),1);
 
       // Start sending data.
-      result = CLIENT::instance ()->pace_data (ACE_TRY_ENV);
+      result = CLIENT::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 24f43d7664c..386dd169b7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -33,11 +33,11 @@ class FTP_Client_Callback : public TAO_AV_Callback
 {
   // = TITLE
   //    Defines the client applcation callback.
-  //   
+  //
   // = DESCRIPTION
-  //    This class can override the methods of 
-  //    the TAO_AV_Callback to do application 
-  //    specific processing. 
+  //    This class can override the methods of
+  //    the TAO_AV_Callback to do application
+  //    specific processing.
 public:
   FTP_Client_Callback (void);
   //Constructor
@@ -48,25 +48,25 @@ class FTP_Client_StreamEndPoint  : public TAO_Client_StreamEndPoint
 {
   // = TITLE
   //    Defines the client stream endpoint.
-  // 
+  //
   // = DESCRIPTION
-  //    This class overrides the methods of TAO_ClientStreamendpoint 
+  //    This class overrides the methods of TAO_ClientStreamendpoint
   //    so the application can perform its processing during post and pre
   //    connection set up.
-  
+
 public:
   FTP_Client_StreamEndPoint (void);
   //Contructor
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
-  // Create the application client callback and return its handle to the 
+  // Create the application client callback and return its handle to the
   // AVSTreams for further application callbacks
 
   virtual int set_protocol_object (const char *flowname,
                                    TAO_AV_Protocol_Object *object);
   // Set protocol object corresponding to the transport protocol chosen.
-  
+
 protected:
   FTP_Client_Callback callback_;
   // reference to the cllient application callback.
@@ -79,7 +79,7 @@ class Client
 {
   // = TITLE
   //    Defines the Client Application
-  // 
+  //
   // = DESCRIPTION
   //    The actual client program that acts as the ftp client that streams data
   //    to the ftp servers that are waiting for data.
@@ -87,15 +87,15 @@ public:
   Client (void);
   // Constructor
 
-  int init (int argc, 
-	    char **argv,
-	    CORBA::Environment&);
+  int init (int argc,
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
-  
+
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
   // Set the protocol object corresponding to the transport protocol chosen.
-  
-  int pace_data (CORBA::Environment&);
+
+  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   FILE *file (void);
@@ -106,17 +106,17 @@ public:
 
   char *flowname (void);
   // name of the flow set up.
-  
+
   int frame_rate (void);
   // The requested frame rate for sending each frame of data read from the file.
-  
+
 private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
-  
-  int bind_to_server (CORBA::Environment& ACE_TRY_ENV);
+
+  int bind_to_server (TAO_ENV_SINGLE_ARG_DECL);
   // Method that binds the ftp client to the server
-  
+
   ENDPOINT_STRATEGY endpoint_strategy_;
   // The reacfive strategy of the client.
 
@@ -131,7 +131,7 @@ private:
 
   int count_;
   // Number of frames sent.
-  
+
   int argc_;
   char **argv_;
 
@@ -152,7 +152,7 @@ private:
   // Selected protocol - default is UDP
 
   char *flowname_;
-    
+
   int use_sfp_;
   // If set to 1 then use sfp as the flow carrier protocol.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 5d58b1db246..3a98209ae10 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -38,12 +38,12 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
                                             frame->length (),
                                             1,
                                             output_file);
-      
+
       if (result == frame->length ())
         ACE_ERROR_RETURN ((LM_ERROR,
                            "FTP_Server_Flow_Handler::fwrite failed\n"),
                           -1);
-      
+
       frame = frame->cont ();
     }
   return 0;
@@ -71,8 +71,8 @@ Server::~Server (void)
 
 int
 Server::init (int,
-              char **,
-              CORBA::Environment &ACE_TRY_ENV)
+              char **
+              TAO_ENV_ARG_DECL)
 {
   int result =
     this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
@@ -80,7 +80,7 @@ Server::init (int,
   if (result != 0)
     return result;
 
-  // Register the server mmdevice object with the ORB 
+  // Register the server mmdevice object with the ORB
   ACE_NEW_RETURN (this->mmdevice_,
                   TAO_MMDevice (&this->reactive_strategy_),
                   -1);
@@ -91,7 +91,7 @@ Server::init (int,
   server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
+    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
 
   // Initialize the naming services
@@ -103,8 +103,8 @@ Server::init (int,
 
   // Register the server object with the naming server.
   this->my_naming_client_->rebind (server_mmdevice_name,
-                                   mmdevice.in (),
-                                   ACE_TRY_ENV);
+                                   mmdevice.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -140,14 +140,14 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -167,43 +167,43 @@ main (int argc,
                           -1);
 
       else ACE_DEBUG ((LM_DEBUG,
-		       "File Opened Successfull\n"));
+                       "File Opened Successfull\n"));
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server server;
       result =
         server.init (argc,
-                     argv,
-                     ACE_TRY_ENV);
+                     argv
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (result != 0)
         return result;
-      
-      orb->run (ACE_TRY_ENV);
+
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index 4f442c7af4e..107e468f4d9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -28,9 +28,9 @@ class FTP_Server_Callback : public TAO_AV_Callback
   //    Defines a class for the server application callback.
   //
   // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the 
+  //    This class overides the methods of the TAO_AV_Callback so the
   //    AVStreams can make upcalls to the application.
-  
+
 public:
 
   // Method that is called when there is data to be received from the ftp client.
@@ -65,7 +65,7 @@ class Server
 {
   // = TITLE
   //    Defines the server application class.
-  // 
+  //
   // = DESCRIPOTION
   //    The actual server progarm that acts as the ftp server that receives data
   //    sent by the ftp client.
@@ -77,10 +77,10 @@ public:
   // Deestructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
-  
+
 protected:
   TAO_Naming_Client my_naming_client_;
   // The Naming Service Client.
@@ -88,7 +88,7 @@ protected:
   TAO_AV_Endpoint_Reactive_Strategy_B
   <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
   // The endpoint reacxtive strategy.
-  
+
   TAO_MMDevice *mmdevice_;
   // The server MMDevice.
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 3b9ae525d88..e681eed4fc9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -77,8 +77,8 @@ Distributer_Receiver_Callback::handle_destroy (void)
 
       // Destroy the receiver stream
       AVStreams::flowSpec stop_spec;
-      DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec,
-                                                                 ACE_TRY_ENV);
+      DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec
+                                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We can close down now.
@@ -126,8 +126,8 @@ Distributer::~Distributer (void)
 
 void
 Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
-                               const ACE_CString &mmdevice_name,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const ACE_CString &mmdevice_name
+                               TAO_ENV_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -136,20 +136,20 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
 
   // Resolve the mmdevice object reference from the Naming Service
   CORBA::Object_var mmdevice_obj =
-    this->naming_client_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_client_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   mmdevice =
-    AVStreams::MMDevice::_narrow (mmdevice_obj.in (),
-                                  ACE_TRY_ENV);
+    AVStreams::MMDevice::_narrow (mmdevice_obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Distributer::init (int /*argc*/,
-                   char *[] /*argv*/,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   char *[] /*argv*/
+                   TAO_ENV_ARG_DECL)
 {
   // Initialize the naming services
   int result =
@@ -173,15 +173,15 @@ Distributer::init (int /*argc*/,
   // Bind to the receiver mmdevice
   ACE_CString mmdevice_name ("Receiver");
   this->bind_to_mmdevice (this->receiver_mmdevice_.out (),
-                          mmdevice_name,
-                          ACE_TRY_ENV);
+                          mmdevice_name
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to the sender mmdevice
   mmdevice_name = "Sender";
   this->bind_to_mmdevice (this->sender_mmdevice_.out (),
-                          mmdevice_name,
-                          ACE_TRY_ENV);
+                          mmdevice_name
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Initialize the  QoS
@@ -210,7 +210,7 @@ Distributer::init (int /*argc*/,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
@@ -222,7 +222,7 @@ Distributer::init (int /*argc*/,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (ACE_TRY_ENV);
+    this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->receiver_streamctrl_,
@@ -238,8 +238,8 @@ Distributer::init (int /*argc*/,
     this->receiver_streamctrl_->bind_devs (distributer_sender_mmdevice.in (),
                                            this->receiver_mmdevice_.in (),
                                            the_qos.inout (),
-                                           flow_spec,
-                                           ACE_TRY_ENV);
+                                           flow_spec
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create the forward flow specification to describe the flow.
@@ -269,8 +269,8 @@ Distributer::init (int /*argc*/,
     sender_streamctrl->bind_devs (sender_mmdevice_.in (),
                                   distributer_receiver_mmdevice.in (),
                                   the_qos.inout (),
-                                  flow_spec,
-                                  ACE_TRY_ENV);
+                                  flow_spec
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (res == 0)
@@ -301,46 +301,46 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -348,7 +348,7 @@ main (int argc,
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          orb->perform_work (ACE_TRY_ENV);
+          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 061b5154500..8f003e75fd5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -115,13 +115,13 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
-                         const ACE_CString &mmdevice_name,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         const ACE_CString &mmdevice_name
+                         TAO_ENV_ARG_DECL);
   // Resolve the reference of the mmdevice from the naming service.
 
   TAO_StreamCtrl *receiver_streamctrl (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index 724476074b1..815bf7fb79d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -66,8 +66,8 @@ Receiver_Callback::handle_destroy (void)
 
   ACE_TRY_NEW_ENV
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0,
-                                                  ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -93,8 +93,8 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **,
-                CORBA::Environment &ACE_TRY_ENV)
+                char **
+                TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -113,7 +113,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
+    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -131,8 +131,8 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in (),
-                                ACE_TRY_ENV);
+                                mmdevice.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -169,39 +169,39 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -227,20 +227,20 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index f197cbae818..1a5fa37d3a8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -83,8 +83,8 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 540eba5f801..777f3b0a4e0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -20,8 +20,8 @@ Sender_StreamEndPoint::get_callback (const char *,
   ACE_TRY_NEW_ENV
     {
       CORBA::Any_ptr streamctrl_any =
-        this->get_property_value ("Related_StreamCtrl",
-                                  ACE_TRY_ENV);
+        this->get_property_value ("Related_StreamCtrl"
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AVStreams::StreamCtrl_ptr streamctrl;
@@ -111,8 +111,8 @@ Sender::parse_args (int argc,
 
 int
 Sender::init (int argc,
-              char **argv,
-              CORBA::Environment &ACE_TRY_ENV)
+              char **argv
+              TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -158,7 +158,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
 
   CosNaming::Name name (1);
@@ -168,8 +168,8 @@ Sender::init (int argc,
 
   // Register the sender object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in (),
-                                ACE_TRY_ENV);
+                                mmdevice.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -177,7 +177,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
+Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -254,8 +254,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-                                                         ACE_TRY_ENV);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -291,8 +291,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
         {
           // File reading is complete, destroy the stream.
           AVStreams::flowSpec stop_spec;
-          this->streamctrl_->destroy (stop_spec,
-                                      ACE_TRY_ENV);
+          this->streamctrl_->destroy (stop_spec
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -310,44 +310,44 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv,
-                                          ACE_TRY_ENV);
+                                          argv
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -355,7 +355,7 @@ main (int argc,
                            "Sender::init failed\n"),
                           -1);
 
-      SENDER::instance ()->pace_data (ACE_TRY_ENV);
+      SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (20);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 58c584efd0f..6619775927b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -62,11 +62,11 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment&);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (CORBA::Environment &);
+  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 724476074b1..815bf7fb79d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -66,8 +66,8 @@ Receiver_Callback::handle_destroy (void)
 
   ACE_TRY_NEW_ENV
     {
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0,
-                                                  ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -93,8 +93,8 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **,
-                CORBA::Environment &ACE_TRY_ENV)
+                char **
+                TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -113,7 +113,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
+    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -131,8 +131,8 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in (),
-                                ACE_TRY_ENV);
+                                mmdevice.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -169,39 +169,39 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -227,20 +227,20 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index d117c273e90..507f6ec9ca7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -83,8 +83,8 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 80819189f07..1f82e374339 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -82,7 +82,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
+Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -91,13 +91,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_client_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (),
-                                  ACE_TRY_ENV);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -110,8 +110,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
 
 int
 Sender::init (int argc,
-              char **argv,
-              CORBA::Environment &ACE_TRY_ENV)
+              char **argv
+              TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -148,9 +148,9 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_TRY_ENV);
+  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  
+
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) Error binding to the naming service\n"),
@@ -182,7 +182,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -197,8 +197,8 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
-                                  flow_spec,
-                                  ACE_TRY_ENV);
+                                  flow_spec
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -211,7 +211,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
+Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -288,8 +288,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-                                                         ACE_TRY_ENV);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -318,13 +318,13 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec,
-                                  ACE_TRY_ENV);
+      this->streamctrl_->destroy (stop_spec
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0,
-                                                  ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -341,44 +341,44 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv,
-                                          ACE_TRY_ENV);
+                                          argv
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -387,7 +387,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_TRY_ENV);
+      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 87b07bcb553..aa74b4b3319 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -62,11 +62,11 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment&);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (CORBA::Environment &);
+  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -76,7 +76,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV);
+  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 43e706c67f2..da934900655 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -74,8 +74,8 @@ Receiver::~Receiver (void)
 
 int
 Receiver::init (int,
-                char **,
-                CORBA::Environment &ACE_TRY_ENV)
+                char **
+                TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -94,7 +94,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
+    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -112,8 +112,8 @@ Receiver::init (int,
 
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
-                                mmdevice.in (),
-                                ACE_TRY_ENV);
+                                mmdevice.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -150,39 +150,39 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -208,20 +208,20 @@ main (int argc,
       Receiver receiver;
       result =
         receiver.init (argc,
-                       argv,
-                       ACE_TRY_ENV);
+                       argv
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index d4e04e5f782..0b617c4d7bc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -80,8 +80,8 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 33901f05a57..943390dd384 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -15,16 +15,16 @@ ACE_Time_Value inter_frame_time;
 
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
-				   const AVStreams::flowSpec &the_flows,
-				   CORBA::Environment &ACE_TRY_ENV)
+                                   const AVStreams::flowSpec &the_flows
+                                   TAO_ENV_ARG_DECL)
                                    ACE_THROW_SPEC (( CORBA::SystemException,
-						     AVStreams::noSuchFlow,
-						     AVStreams::QoSRequestFailed ))
+                                                     AVStreams::noSuchFlow,
+                                                     AVStreams::QoSRequestFailed ))
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "Sender_StreamEndPoint::modify_QoS\n"));
-  
-  int result =  this->change_qos (new_qos, the_flows, ACE_TRY_ENV);
+              "Sender_StreamEndPoint::modify_QoS\n"));
+
+  int result =  this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (result != 0)
@@ -37,17 +37,17 @@ int
 Sender_StreamEndPoint::get_callback (const char *,
                                      TAO_AV_Callback *&callback)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   // Create and return the sender application callback to AVStreams
   // for further upcalls.
   callback = &this->callback_;
-  
+
   TAO_Negotiator *negotiator;
   ACE_NEW_RETURN (negotiator,
-		  TAO_Negotiator,
-		  -1);
+                  TAO_Negotiator,
+                  -1);
   AVStreams::Negotiator_var negotiator_obj =
-    negotiator->_this (ACE_TRY_ENV);
+    negotiator->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->set_negotiator (negotiator_obj.in ());
@@ -110,9 +110,9 @@ Sender::parse_args (int argc,
         case 'd':
           TAO_debug_level++;
           break;
-	case 'a':
-	  this->address_ = opts.optarg;
-	  break;
+        case 'a':
+          this->address_ = opts.optarg;
+          break;
         default:
           ACE_DEBUG ((LM_DEBUG, "Unknown Option\n"));
           return -1;
@@ -127,50 +127,50 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
   peak_bandwidth += 100;
 
   ACE_DEBUG ((LM_DEBUG,
-	      "Sender::fill_qos %d\n",
-	      peak_bandwidth));
+              "Sender::fill_qos %d\n",
+              peak_bandwidth));
 
   qos.length (1);
   qos [0].QoSType =  CORBA::string_dup ("Data_Receiver");
-  
+
   qos [0].QoSParams.length (10);
-  
+
   qos [0].QoSParams [0].property_name = CORBA::string_dup ("Service_Type");
   qos [0].QoSParams [0].property_value <<= (CORBA::Short) 1;//ACE_SERVICETYPE_CONTROLLEDLOAD;
-  
+
   qos [0].QoSParams [1].property_name = CORBA::string_dup ("Token_Rate");
   qos [0].QoSParams [1].property_value <<= (CORBA::ULong) 9200 ;
-  
+
   qos [0].QoSParams [2].property_name = CORBA::string_dup ("Token_Bucket_Size");
   qos [0].QoSParams [2].property_value <<= (CORBA::ULong) 708;
-  
+
   qos [0].QoSParams [3].property_name = CORBA::string_dup ("Peak_Bandwidth");
   qos [0].QoSParams [3].property_value <<= (CORBA::ULong) peak_bandwidth;
 
-  
+
   qos [0].QoSParams [4].property_name = CORBA::string_dup ("Latency");
   qos [0].QoSParams [4].property_value <<= (CORBA::ULong) 0;
-  
+
   qos [0].QoSParams [5].property_name = CORBA::string_dup ("Delay_Variation");
   qos [0].QoSParams [5].property_value <<= (CORBA::ULong) 0;
-  
+
   qos [0].QoSParams [6].property_name = CORBA::string_dup ("Max_SDU_Size");
   qos [0].QoSParams [6].property_value <<= (CORBA::ULong) 368;
-  
+
   qos [0].QoSParams [7].property_name = CORBA::string_dup ("Minimum_Policed_Size");
   qos [0].QoSParams [7].property_value <<= (CORBA::ULong) 368;
-  
+
   qos [0].QoSParams [8].property_name = CORBA::string_dup ("TTL");
   qos [0].QoSParams [8].property_value <<= (CORBA::ULong) 25;
-  
+
   qos [0].QoSParams [9].property_name = CORBA::string_dup ("Priority");
   qos [0].QoSParams [9].property_value <<= (CORBA::ULong) 1;
-  
+
 }
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
+Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -179,13 +179,13 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
 
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
-    this->naming_client_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_client_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
-    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in (),
-                                  ACE_TRY_ENV);
+    AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -198,8 +198,8 @@ Sender::bind_to_receiver (CORBA::Environment &ACE_TRY_ENV)
 
 int
 Sender::init (int argc,
-              char **argv,
-              CORBA::Environment &ACE_TRY_ENV)
+              char **argv
+              TAO_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -236,9 +236,9 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (ACE_TRY_ENV);
+  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  
+
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) Error binding to the naming service\n"),
@@ -269,7 +269,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (ACE_TRY_ENV);
+    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -280,7 +280,7 @@ Sender::init (int argc,
     this->streamctrl_;
 
   AVStreams::streamQoS qos;
-  
+
   //this->fill_qos (qos);
 
   // Bind/Connect the sender and receiver MMDevices.
@@ -288,8 +288,8 @@ Sender::init (int argc,
     this->streamctrl_->bind_devs (mmdevice.in (),
                                   this->receiver_mmdevice_.in (),
                                   qos,
-                                  flow_spec,
-                                  ACE_TRY_ENV);
+                                  flow_spec
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -302,7 +302,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
+Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 {
 
 
@@ -323,7 +323,7 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
       // Continue to send data till the file is read to the end.
       while (1)
-	{
+        {
           // Read from the file into a message block.
           int n = ACE_OS::fread (this->mb_.wr_ptr (),
                                  1,
@@ -378,8 +378,8 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
-                  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-                                                         ACE_TRY_ENV);
+                  TAO_AV_CORE::instance ()->orb ()->run (wait_time
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -403,28 +403,28 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
 
           // Reset the message block.
           this->mb_.reset ();
-	  
-	  if (this->frame_count_ == 25)
-	    {
-	      TAO_Forward_FlowSpec_Entry entry (this->flowname_.c_str (),
-						"IN",
-						"USER_DEFINED",
-						"",
-						"QoS_UDP",
-						0);
-	      AVStreams::flowSpec flow_spec (1);
-	      flow_spec.length (1);
-	      flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
-	      
-	      AVStreams::streamQoS qos;
-	      this->fill_qos (qos);
-	      this->streamctrl_->modify_QoS (qos,
-					     flow_spec,
-					     ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
-	    }
-
-	} // end while
+
+          if (this->frame_count_ == 25)
+            {
+              TAO_Forward_FlowSpec_Entry entry (this->flowname_.c_str (),
+                                                "IN",
+                                                "USER_DEFINED",
+                                                "",
+                                                "QoS_UDP",
+                                                0);
+              AVStreams::flowSpec flow_spec (1);
+              flow_spec.length (1);
+              flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
+
+              AVStreams::streamQoS qos;
+              this->fill_qos (qos);
+              this->streamctrl_->modify_QoS (qos,
+                                             flow_spec
+                                             TAO_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+
+        } // end while
 
     }
   ACE_CATCHANY
@@ -441,44 +441,44 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
+        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
-                                      ACE_TRY_ENV);
+                                      root_poa.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
-                                          argv,
-                                          ACE_TRY_ENV);
+                                          argv
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -487,9 +487,9 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (ACE_TRY_ENV);
+      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       orb->run ();
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index c05e594af7c..c3875d517a2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -39,11 +39,11 @@ public:
   // chosen.
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-			     const AVStreams::flowSpec &/* the_flows */,
-			     CORBA::Environment &ACE_TRY_ENV)
-	                    ACE_THROW_SPEC(( CORBA::SystemException,
-					     AVStreams::noSuchFlow,
-					     AVStreams::QoSRequestFailed ));
+                             const AVStreams::flowSpec &/* the_flows */
+                             TAO_ENV_ARG_DECL)
+                            ACE_THROW_SPEC(( CORBA::SystemException,
+                                             AVStreams::noSuchFlow,
+                                             AVStreams::QoSRequestFailed ));
 protected:
   TAO_AV_Callback callback_;
   // Application callback.
@@ -68,11 +68,11 @@ public:
   // Constructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment&);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (CORBA::Environment &);
+  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -85,7 +85,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (CORBA::Environment& ACE_TRY_ENV);
+  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp
index 64db7de821c..4f441ad8447 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp
@@ -59,7 +59,7 @@ Trader_Client::init (int argc, char** argv)
       //ACE_DEBUG ((LM_DEBUG, "Bootstrapping to the trading service"));
       CORBA::ORB_var orb = this->orb_manager_.orb ();
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("TradingService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("TradingService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the lookup interface.
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index a0e174b9ad1..9c6d58d3aec 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -357,14 +357,14 @@ CC_Client::print_usage (void)
 int
 CC_Client::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       ACE_NEW_RETURN (naming_service_,
                       CC_naming_service,
                       -1);
 
-      this->naming_service_->Init (this->orb_, ACE_TRY_ENV);
+      this->naming_service_->Init (this->orb_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -382,14 +382,14 @@ CC_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -412,15 +412,15 @@ CC_Client::init (int argc, char **argv)
 
 
           CORBA::Object_var factory_object =
-            this->orb_->string_to_object (this->cc_factory_key_,
-                                          ACE_TRY_ENV);
+            this->orb_->string_to_object (this->cc_factory_key_
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 #if 0
           // The test cannot currently run without the naming service.
           this->factory_ =
             CosConcurrencyControl::LockSetFactory::_narrow
-            (factory_object.in (), ACE_TRY_ENV);
+            (factory_object.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (this->factory_.in ()))
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index cf44aa072cc..3023e65b043 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -40,8 +40,8 @@ CC_Command::CC_Command(void)
 }
 
 CosConcurrencyControl::LockSet_var
-CC_Command::GetLockSet (const char *lock_set_name,
-                        CORBA::Environment &ACE_TRY_ENV)
+CC_Command::GetLockSet (const char *lock_set_name
+                        TAO_ENV_ARG_DECL)
 {
   CosConcurrencyControl::LockSet_var ccls_ret;
 
@@ -51,13 +51,13 @@ CC_Command::GetLockSet (const char *lock_set_name,
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
-                                                              lock_set_name,
-                                                              ACE_TRY_ENV);
+                                                              lock_set_name
+                                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ccls_ret =
-            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (),
-                                                     ACE_TRY_ENV);
+            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -160,7 +160,7 @@ int CC_CreateLockSet_Cmd::execute(void)
 
   printf("Executing create command (lock set: %s)\n", name_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosConcurrencyControl::LockSet_ptr lock_set =
@@ -168,7 +168,7 @@ int CC_CreateLockSet_Cmd::execute(void)
       if(ACE_OS::strcmp(name_,"")!=0)// Do not bind an empty name
         {
           CC_naming_service::Instance()->bind_name(name_,
-                                                   lock_set, ACE_TRY_ENV);
+                                                   lock_set TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -214,14 +214,14 @@ int CC_Lock_Cmd::execute(void)
   printf("Executing lock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosConcurrencyControl::LockSet_var ccls =
-        GetLockSet(name_, ACE_TRY_ENV);
+        GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ccls->lock (mode_,
-                  ACE_TRY_ENV);
+      ccls->lock (mode_
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -261,14 +261,14 @@ int CC_UnLock_Cmd::execute(void)
   printf("Executing unlock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ccls->unlock (mode_,
-                    ACE_TRY_ENV);
+      ccls->unlock (mode_
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -311,14 +311,14 @@ int CC_TryLock_Cmd::execute(void)
 
   CORBA::Boolean lock_not_held;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      lock_not_held = ccls->try_lock (mode_,
-                                      ACE_TRY_ENV);
+      lock_not_held = ccls->try_lock (mode_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (lock_not_held)
@@ -376,14 +376,14 @@ int CC_ChangeMode_Cmd::execute(void)
          name_, CC_TestUtils::get_lock_mode_name(held_mode_),
          CC_TestUtils::get_lock_mode_name(new_mode_));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_, ACE_TRY_ENV);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ccls->change_mode (held_mode_, new_mode_,
-                    ACE_TRY_ENV);
+      ccls->change_mode (held_mode_, new_mode_
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -570,18 +570,18 @@ CC_Lookup_Cmd::execute(void)
   // Do the lookup if we haven't done it before
   if(cc_lockset_.in() == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
-                                                              name_,
-                                                              ACE_TRY_ENV);
+                                                              name_
+                                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosConcurrencyControl::LockSet_var ccls =
-            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (),
-                                                     ACE_TRY_ENV);
+            CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           cc_lockset_ = ccls;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index d3b8fd49709..0d075725d06 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -44,8 +44,8 @@ class CC_Command
 
  protected:
   CosConcurrencyControl::LockSet_var
-    GetLockSet (const char *lock_set_name,
-                CORBA::Environment &_env);
+    GetLockSet (const char *lock_set_name
+                TAO_ENV_ARG_DECL);
   // Function to look up the lock set we are operating on, or if the
   // name is "" return the global lock set variable
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index cff8cc5a554..7333698f6b6 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -21,13 +21,13 @@
 
 ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
 
-CC_naming_service::CC_naming_service (CORBA::ORB_var orb,
-                                      CORBA::Environment &ACE_TRY_ENV)
+CC_naming_service::CC_naming_service (CORBA::ORB_var orb
+                                      TAO_ENV_ARG_DECL)
   : cc_factory_key_ (0),
     orb_ (0),
     factory_ (0)
 {
-  this->Init(orb, ACE_TRY_ENV);
+  this->Init(orb TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   instance_ = this;
@@ -41,8 +41,8 @@ CC_naming_service::CC_naming_service(void)
 }
 
 void
-CC_naming_service::Init(CORBA::ORB_var orb,
-                        CORBA::Environment &ACE_TRY_ENV)
+CC_naming_service::Init(CORBA::ORB_var orb
+                        TAO_ENV_ARG_DECL)
 {
   this->orb_ = orb;
 
@@ -70,8 +70,8 @@ CC_naming_service::Instance(void)
 
 CORBA::Object_var
 CC_naming_service::get_obj_from_name (const char *c_name,
-                                      const char *name,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      const char *name
+                                      TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "C: %s, N: %s\n", c_name, name));
   CORBA::Object_var obj;
@@ -83,7 +83,7 @@ CC_naming_service::get_obj_from_name (const char *c_name,
           CosNaming::Name ns_name (1);
           ns_name.length (1);
           ns_name[0].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name, ACE_TRY_ENV);
+          obj = my_name_client_->resolve (ns_name TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -92,7 +92,7 @@ CC_naming_service::get_obj_from_name (const char *c_name,
           ns_name.length (2);
           ns_name[0].id = CORBA::string_dup (c_name);
           ns_name[1].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name, ACE_TRY_ENV);
+          obj = my_name_client_->resolve (ns_name TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (CORBA::is_nil (obj.in ()) )
@@ -112,8 +112,8 @@ CC_naming_service::get_obj_from_name (const char *c_name,
 
 void
 CC_naming_service::bind_name (const char *n,
-                              CORBA::Object_ptr obj,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Object_ptr obj
+                              TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "CC_Client::bind_name\n"));
 
@@ -123,8 +123,8 @@ CC_naming_service::bind_name (const char *n,
       ns_name.length (1);
       ns_name[0].id = CORBA::string_dup (n);
       my_name_client_->bind (ns_name,
-                             obj,
-                             ACE_TRY_ENV);
+                             obj
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -144,7 +144,7 @@ CC_naming_service::get_lock_set_factory (void)
 int
 CC_naming_service::init_naming_service (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the naming services
@@ -155,13 +155,13 @@ CC_naming_service::init_naming_service (void)
                           -1);
 
       CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency",
-                                                         "LockSetFactory",
-                                                         ACE_TRY_ENV);
+                                                         "LockSetFactory"
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
         CosConcurrencyControl::LockSetFactory::_narrow
-        (factory_obj.in (),ACE_TRY_ENV);
+        (factory_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 5615ebed401..f86de983f9b 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -39,24 +39,24 @@ public:
   CC_naming_service ();
   // Default constructor
 
-  CC_naming_service (CORBA::ORB_var orb_, CORBA::Environment &_env);
+  CC_naming_service (CORBA::ORB_var orb_ TAO_ENV_ARG_DECL);
   // Constructor
 
   ~CC_naming_service (void);
   // Default destructor.
 
-  void Init (CORBA::ORB_var orb_, CORBA::Environment &_env);
+  void Init (CORBA::ORB_var orb_ TAO_ENV_ARG_DECL);
   // Initialization method must be called after first call of Instance()
   // in order to initialize the object correctly
 
   CORBA::Object_var get_obj_from_name (const char *c_name,
-                                       const char *name,
-                                       CORBA::Environment &_env);
+                                       const char *name
+                                       TAO_ENV_ARG_DECL);
   // Lookup a name in the naming service (context, name)
 
   void bind_name (const char *n,
-                  CORBA::Object_ptr obj,
-                  CORBA::Environment &_env);
+                  CORBA::Object_ptr obj
+                  TAO_ENV_ARG_DECL);
   // Bind a name in the concurrency context.
 
   CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index 815a98cabcc..fdcddbb53bf 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -37,11 +37,11 @@ CC_Test::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       lock_set =
-        this->naming_service_->get_lock_set_factory ()->create (ACE_TRY_ENV);
+        this->naming_service_->get_lock_set_factory ()->create (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (lock_set))
@@ -101,18 +101,18 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
 
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      cc_lock_set_->lock (mode_, ACE_TRY_ENV);
+      cc_lock_set_->lock (mode_ TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock set\n",
                   get_lock_mode_name (mode_)));
 
-      lock_not_held = cc_lock_set_->try_lock (mode_,
-                                              ACE_TRY_ENV);
+      lock_not_held = cc_lock_set_->try_lock (mode_
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (lock_not_held)
@@ -127,14 +127,14 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
                     "%s lock held\n",
                     get_lock_mode_name (mode_)));
 
-      cc_lock_set_->unlock (mode_,
-                            ACE_TRY_ENV);
+      cc_lock_set_->unlock (mode_
+                            TAO_ENV_ARG_PARAMETER);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
-      lock_not_held = cc_lock_set_->try_lock (mode_,
-                                              ACE_TRY_ENV);
+      lock_not_held = cc_lock_set_->try_lock (mode_
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (lock_not_held)
@@ -179,20 +179,20 @@ Test_Setup_LockSet::~Test_Setup_LockSet (void)
 int
 Test_Setup_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosConcurrencyControl::LockSet_ptr cc_lock_set_ =
         create_lock_set ();
-      this->naming_service_->bind_name (my_name_, cc_lock_set_,
-                                        ACE_TRY_ENV);
+      this->naming_service_->bind_name (my_name_, cc_lock_set_
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Name bound\n"));
 
-      cc_lock_set_->lock (CosConcurrencyControl::read,
-                          ACE_TRY_ENV);
+      cc_lock_set_->lock (CosConcurrencyControl::read
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -226,22 +226,22 @@ Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
 int
 Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::Object_var ccls_obj =
         this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""),
-                                                  my_name_,
-                                                  ACE_TRY_ENV);
+                                                  my_name_
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosConcurrencyControl::LockSet_var ccls =
-        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (),
-                                                 ACE_TRY_ENV);
+        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ccls->lock (CosConcurrencyControl::read,
-                  ACE_TRY_ENV);
+      ccls->lock (CosConcurrencyControl::read
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -273,21 +273,21 @@ Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
 int
 Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::Object_var ccls_obj =
-        this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_,
-                                                 ACE_TRY_ENV);
+        this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosConcurrencyControl::LockSet_var ccls =
-        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in (),
-                                                 ACE_TRY_ENV);
+        CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ccls->unlock (CosConcurrencyControl::read,
-                    ACE_TRY_ENV);
+      ccls->unlock (CosConcurrencyControl::read
+                    TAO_ENV_ARG_PARAMETER);
     }
   ACE_CATCHANY
     {
@@ -320,11 +320,11 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
   // Create the lock set
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // lock the lock
-      cc_lock_set_->lock (mode_, ACE_TRY_ENV);
+      cc_lock_set_->lock (mode_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -332,8 +332,8 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
                   get_lock_mode_name (mode_)));
 
       // check to see if the lock is held
-      lock_not_held = cc_lock_set_->try_lock (mode_,
-                                              ACE_TRY_ENV);
+      lock_not_held = cc_lock_set_->try_lock (mode_
+                                              TAO_ENV_ARG_PARAMETER);
 
       if (lock_not_held)
         {
@@ -348,15 +348,15 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
                     get_lock_mode_name (mode_)));
 
       // release the lock
-      cc_lock_set_->unlock (mode_,
-                            ACE_TRY_ENV);
+      cc_lock_set_->unlock (mode_
+                            TAO_ENV_ARG_PARAMETER);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
       // release the lock again. this should raise an exception
-      cc_lock_set_->unlock (mode_,
-                            ACE_TRY_ENV);
+      cc_lock_set_->unlock (mode_
+                            TAO_ENV_ARG_PARAMETER);
 
       ACE_DEBUG ((LM_DEBUG,
                   "attemptet to release %s lock\n",
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 42612d8d35f..a2e9d894079 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -10,48 +10,48 @@
 ACE_RCSID(CEC_Tests, Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      int use_callbacks
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0, ACE_TRY_ENV);
+      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1, ACE_TRY_ENV);
+      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -67,45 +67,45 @@ main (int argc, char* argv[])
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant,
-                    CORBA::Environment &ACE_TRY_ENV)
+deactivate_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_TRY_ENV);
+    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks,
-          CORBA::Environment &ACE_TRY_ENV)
+          int use_callbacks
+          TAO_ENV_ARG_DECL)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (ACE_TRY_ENV);
+  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_TRY_ENV);
+    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (ACE_TRY_ENV);
+    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (ACE_TRY_ENV);
+    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -119,51 +119,51 @@ run_test (PortableServer::POA_ptr poa,
 
   for (int i = 0; i != iterations; ++i)
     {
-      supplier_0.connect (supplier_admin.in (),
-                          ACE_TRY_ENV);
+      supplier_0.connect (supplier_admin.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.connect (consumer_admin.in (),
-                          ACE_TRY_ENV);
+      consumer_0.connect (consumer_admin.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          supplier_1.connect (supplier_admin.in (),
-                              ACE_TRY_ENV);
+          supplier_1.connect (supplier_admin.in ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          consumer_1.connect (consumer_admin.in (),
-                              ACE_TRY_ENV);
+          consumer_1.connect (consumer_admin.in ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (ACE_TRY_ENV);
+      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (ACE_TRY_ENV);
+      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_TRY_ENV);
+          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (ACE_TRY_ENV);
+          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
-  supplier_0.connect (supplier_admin.in (),
-                      ACE_TRY_ENV);
+  supplier_0.connect (supplier_admin.in ()
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_0.connect (consumer_admin.in (),
-                      ACE_TRY_ENV);
+  consumer_0.connect (consumer_admin.in ()
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  event_channel->destroy (ACE_TRY_ENV);
+  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&supplier_0, ACE_TRY_ENV);
+  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0, ACE_TRY_ENV);
+  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl, ACE_TRY_ENV);
+  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 1;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 5f817c207a5..2f661daad58 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -10,48 +10,48 @@
 ACE_RCSID(CEC_Tests, MT_Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      int use_callbacks
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0, ACE_TRY_ENV);
+      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1, ACE_TRY_ENV);
+      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -67,33 +67,33 @@ main (int argc, char* argv[])
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant,
-                    CORBA::Environment &ACE_TRY_ENV)
+deactivate_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_TRY_ENV);
+    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks,
-          CORBA::Environment &ACE_TRY_ENV)
+          int use_callbacks
+          TAO_ENV_ARG_DECL)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (ACE_TRY_ENV);
+  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_TRY_ENV);
+    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Task task (event_channel.in (), use_callbacks);
@@ -106,10 +106,10 @@ run_test (PortableServer::POA_ptr poa,
   // Wait for all the threads to complete and the return
   ACE_Thread_Manager::instance ()->wait ();
 
-  event_channel->destroy (ACE_TRY_ENV);
+  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl, ACE_TRY_ENV);
+  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -128,7 +128,7 @@ Task::svc ()
     {
       ACE_TRY_NEW_ENV
         {
-          this->run_iteration (ACE_TRY_ENV);
+          this->run_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -141,16 +141,16 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (CORBA::Environment &ACE_TRY_ENV)
+Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel->for_consumers (ACE_TRY_ENV);
+    this->event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel->for_suppliers (ACE_TRY_ENV);
+    this->event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -164,38 +164,38 @@ Task::run_iteration (CORBA::Environment &ACE_TRY_ENV)
 
   for (int i = 0; i != iterations; ++i)
     {
-      supplier_0.connect (supplier_admin.in (),
-                          ACE_TRY_ENV);
+      supplier_0.connect (supplier_admin.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.connect (consumer_admin.in (),
-                          ACE_TRY_ENV);
+      consumer_0.connect (consumer_admin.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          supplier_1.connect (supplier_admin.in (),
-                              ACE_TRY_ENV);
+          supplier_1.connect (supplier_admin.in ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          consumer_1.connect (consumer_admin.in (),
-                              ACE_TRY_ENV);
+          consumer_1.connect (consumer_admin.in ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (ACE_TRY_ENV);
+      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (ACE_TRY_ENV);
+      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_TRY_ENV);
+          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (ACE_TRY_ENV);
+          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
-  deactivate_servant (&supplier_0, ACE_TRY_ENV);
+  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0, ACE_TRY_ENV);
+  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index 72f83da7610..bce8e4efbc6 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -12,24 +12,24 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -38,23 +38,23 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -63,32 +63,32 @@ main (int argc, char* argv[])
 
       CEC_Counting_Supplier supplier_00;
 
-      supplier_00.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_00.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_01;
 
-      supplier_01.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_01.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Pull_Counting_Supplier supplier_10;
 
-      supplier_10.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_10.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Pull_Counting_Supplier supplier_11;
 
-      supplier_11.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_11.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -96,22 +96,22 @@ main (int argc, char* argv[])
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
-      consumer_00.connect (consumer_admin.in (),
-                           ACE_TRY_ENV);
+      consumer_00.connect (consumer_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01");
-      consumer_01.connect (consumer_admin.in (),
-                           ACE_TRY_ENV);
+      consumer_01.connect (consumer_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10");
-      consumer_10.connect (consumer_admin.in (),
-                           ACE_TRY_ENV);
+      consumer_10.connect (consumer_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -171,35 +171,35 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_10.disconnect (ACE_TRY_ENV);
+      consumer_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_01.disconnect (ACE_TRY_ENV);
+      consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_00.disconnect (ACE_TRY_ENV);
+      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.disconnect (ACE_TRY_ENV);
+      supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.disconnect (ACE_TRY_ENV);
+      supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.disconnect (ACE_TRY_ENV);
+      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_TRY_ENV);
+      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 7a3841f4f8e..cb46f224cc6 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -12,24 +12,24 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -38,23 +38,23 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -63,32 +63,32 @@ main (int argc, char* argv[])
 
       CEC_Counting_Supplier supplier_00;
 
-      supplier_00.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_00.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_01;
 
-      supplier_01.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_01.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_10;
 
-      supplier_10.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_10.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Counting_Supplier supplier_11;
 
-      supplier_11.connect (supplier_admin.in (),
-                           ACE_TRY_ENV);
+      supplier_11.connect (supplier_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -96,15 +96,15 @@ main (int argc, char* argv[])
       // Create a consumer, intialize its RT_Info structures, and
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
-      consumer_00.connect (consumer_admin.in (),
-                           ACE_TRY_ENV);
+      consumer_00.connect (consumer_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Counting_Consumer consumer_01 ("Consumer/01");
-      consumer_01.connect (consumer_admin.in (),
-                           ACE_TRY_ENV);
+      consumer_01.connect (consumer_admin.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -144,32 +144,32 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_01.disconnect (ACE_TRY_ENV);
+      consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_00.disconnect (ACE_TRY_ENV);
+      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.disconnect (ACE_TRY_ENV);
+      supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.disconnect (ACE_TRY_ENV);
+      supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.disconnect (ACE_TRY_ENV);
+      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_TRY_ENV);
+      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index eded9b188bf..7c3f444bf1d 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -17,16 +17,16 @@ main (int argc, char* argv[])
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant,
-                    CORBA::Environment &ACE_TRY_ENV)
+deactivate_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_TRY_ENV);
+    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -42,11 +42,11 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -103,15 +103,15 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -122,29 +122,29 @@ RND_Driver::run (int argc, char *argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       this->consumer_admin_ =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       this->supplier_admin_ =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      this->supplier_.connect (this->supplier_admin_.in (),
-                               ACE_TRY_ENV);
+      this->supplier_.connect (this->supplier_admin_.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -159,7 +159,7 @@ RND_Driver::run (int argc, char *argv[])
                           1);
 
           CORBA::Object_var obj =
-            this->consumers_[i]->_this (ACE_TRY_ENV);
+            this->consumers_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -176,7 +176,7 @@ RND_Driver::run (int argc, char *argv[])
           this->suppliers_[j]->activate ();
 
           CORBA::Object_var obj =
-            this->suppliers_[j]->_this (ACE_TRY_ENV);
+            this->suppliers_[j]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -186,7 +186,7 @@ RND_Driver::run (int argc, char *argv[])
         {
           ACE_Time_Value tv (0, 50000);
           orb->run (tv);
-          this->supplier_.push_new_event (ACE_TRY_ENV);
+          this->supplier_.push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -197,10 +197,10 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
-            deactivate_servant (this->suppliers_[k],
-                                ACE_TRY_ENV);
+            deactivate_servant (this->suppliers_[k]
+                                TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->suppliers_[k]->_remove_ref (ACE_TRY_ENV);
+            this->suppliers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->suppliers_;
@@ -211,7 +211,7 @@ RND_Driver::run (int argc, char *argv[])
 
       // We destroy now to verify that the callbacks work and do not
       // produce any problems.
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -219,10 +219,10 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nconsumers_; ++k)
           {
-            deactivate_servant (this->consumers_[k],
-                                ACE_TRY_ENV);
+            deactivate_servant (this->consumers_[k]
+                                TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->consumers_[k]->_remove_ref (ACE_TRY_ENV);
+            this->consumers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->consumers_;
@@ -231,18 +231,18 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      deactivate_servant (&ec_impl,
-                          ACE_TRY_ENV);
+      deactivate_servant (&ec_impl
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -255,8 +255,8 @@ RND_Driver::run (int argc, char *argv[])
 }
 
 void
-RND_Driver::timer (const CORBA::Any &e,
-                   CORBA::Environment &ACE_TRY_ENV)
+RND_Driver::timer (const CORBA::Any &e
+                   TAO_ENV_ARG_DECL)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -277,7 +277,7 @@ RND_Driver::timer (const CORBA::Any &e,
             CORBA::Any new_event;
             recursion++;
             new_event <<= recursion;
-            this->supplier_.push (new_event, ACE_TRY_ENV);
+            this->supplier_.push (new_event TAO_ENV_ARG_PARAMETER);
             ACE_CHECK;
           }
       }
@@ -297,8 +297,8 @@ RND_Driver::timer (const CORBA::Any &e,
 
         // ACE_DEBUG ((LM_DEBUG, "Connecting supplier %d\n", n));
 
-        this->suppliers_[n]->connect (this->supplier_admin_.in (),
-                                      ACE_TRY_ENV);
+        this->suppliers_[n]->connect (this->supplier_admin_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -309,8 +309,8 @@ RND_Driver::timer (const CORBA::Any &e,
 
         // ACE_DEBUG ((LM_DEBUG, "Connecting consumer %d\n", n));
 
-        this->consumers_[n]->connect (this->consumer_admin_.in (),
-                                      ACE_TRY_ENV);
+        this->consumers_[n]->connect (this->consumer_admin_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -321,7 +321,7 @@ RND_Driver::timer (const CORBA::Any &e,
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
 
-        this->suppliers_[n]->disconnect (ACE_TRY_ENV);
+        this->suppliers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -332,7 +332,7 @@ RND_Driver::timer (const CORBA::Any &e,
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
 
-        this->consumers_[n]->disconnect (ACE_TRY_ENV);
+        this->consumers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -340,17 +340,17 @@ RND_Driver::timer (const CORBA::Any &e,
 }
 
 void
-RND_Driver::event (const CORBA::Any &e,
-                   CORBA::Environment &ACE_TRY_ENV)
+RND_Driver::event (const CORBA::Any &e
+                   TAO_ENV_ARG_DECL)
 {
-  this->timer (e, ACE_TRY_ENV);
+  this->timer (e TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 void
-RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin,
-                       CORBA::Environment &ACE_TRY_ENV)
+RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
+                       TAO_ENV_ARG_DECL)
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -358,43 +358,43 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_supplier (ACE_TRY_ENV);
+        this->proxy_ = admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
     proxy =
       CosEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
   }
   CosEventComm::PushConsumer_var me =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  proxy->connect_push_consumer (me.in (),
-                                ACE_TRY_ENV);
+  proxy->connect_push_consumer (me.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-RND_Consumer::push (const CORBA::Any &event,
-                    CORBA::Environment &ACE_TRY_ENV)
+RND_Consumer::push (const CORBA::Any &event
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event, ACE_TRY_ENV);
+  this->driver_->event (event TAO_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Consumer::disconnect_push_consumer (CORBA::Environment &)
+RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -402,8 +402,8 @@ RND_Consumer::disconnect_push_consumer (CORBA::Environment &)
 // ****************************************************************
 
 void
-RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin,
-                       CORBA::Environment &ACE_TRY_ENV)
+RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
+                       TAO_ENV_ARG_DECL)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -411,7 +411,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_consumer (ACE_TRY_ENV);
+        this->proxy_ = admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
 
@@ -423,40 +423,40 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin,
   int r = ACE_OS::rand () % 2;
   if (r == 0)
     {
-      me = this->_this (ACE_TRY_ENV);
+      me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
-  proxy->connect_push_supplier (me.in (),
-                                ACE_TRY_ENV);
+  proxy->connect_push_supplier (me.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+RND_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-RND_Supplier::push_new_event (CORBA::Environment &ACE_TRY_ENV)
+RND_Supplier::push_new_event (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any event;
   CORBA::Long recursion = 0;
   event <<= recursion;
 
-  this->push (event, ACE_TRY_ENV);
+  this->push (event TAO_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Supplier::push (CORBA::Any &event,
-                    CORBA::Environment &ACE_TRY_ENV)
+RND_Supplier::push (CORBA::Any &event
+                    TAO_ENV_ARG_DECL)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -469,11 +469,11 @@ RND_Supplier::push (CORBA::Any &event,
       CosEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event, ACE_TRY_ENV);
+  proxy->push (event TAO_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Supplier::disconnect_push_supplier (CORBA::Environment &)
+RND_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -486,13 +486,13 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
-          this->push_new_event (ACE_TRY_ENV);
+          this->push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 3a113cdee5a..d2ee42666bb 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -47,15 +47,15 @@ public:
   RND_Consumer (RND_Driver *driver);
   // Constructor
 
-  void push (const CORBA::Any &event,
-             CORBA::Environment &ACE_TRY_ENV)
+  void push (const CORBA::Any &event
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
 protected:
   RND_Driver *driver_;
@@ -81,8 +81,8 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const CORBA::Any &event,
-             CORBA::Environment &ACE_TRY_ENV)
+  void push (const CORBA::Any &event
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -108,16 +108,16 @@ public:
   RND_Supplier (void);
   // Constructor
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
-  void push_new_event (CORBA::Environment &ACE_TRY_ENV);
-  void push (CORBA::Any &event,
-             CORBA::Environment &ACE_TRY_ENV);
+  void push_new_event (TAO_ENV_SINGLE_ARG_DECL);
+  void push (CORBA::Any &event
+             TAO_ENV_ARG_DECL);
   // Push a single event...
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual int svc (void);
@@ -146,12 +146,12 @@ public:
   int run (int argc, char *argv[]);
   // Run the test
 
-  void timer (const CORBA::Any &e,
-              CORBA::Environment &ACE_TRY_ENV);
+  void timer (const CORBA::Any &e
+              TAO_ENV_ARG_DECL);
   // The main timer has expired
 
-  void event (const CORBA::Any &e,
-              CORBA::Environment &ACE_TRY_ENV);
+  void event (const CORBA::Any &e
+              TAO_ENV_ARG_DECL);
   // One of the consumers has received an event
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index eb3cbcffe51..fa56d3cc978 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -8,48 +8,48 @@
 ACE_RCSID(CEC_Tests_Basic, Shutdown, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int with_callbacks,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      int with_callbacks
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0, ACE_TRY_ENV);
+      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1, ACE_TRY_ENV);
+      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -62,46 +62,46 @@ main (int argc, char* argv[])
 }
 
 void
-deactivate_servant (PortableServer::Servant servant,
-                    CORBA::Environment &ACE_TRY_ENV)
+deactivate_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_TRY_ENV);
+    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 static void
 run_test (PortableServer::POA_ptr poa,
-          int with_callbacks,
-          CORBA::Environment &ACE_TRY_ENV)
+          int with_callbacks
+          TAO_ENV_ARG_DECL)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa,
                                               poa);
   attributes.disconnect_callbacks = with_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (ACE_TRY_ENV);
+  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_TRY_ENV);
+    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (ACE_TRY_ENV);
+    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Obtain the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (ACE_TRY_ENV);
+    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -126,10 +126,10 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      consumer[i]->connect (consumer_admin.in (), ACE_TRY_ENV);
+      consumer[i]->connect (consumer_admin.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      supplier[i]->connect (supplier_admin.in (), ACE_TRY_ENV);
+      supplier[i]->connect (supplier_admin.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -137,7 +137,7 @@ run_test (PortableServer::POA_ptr poa,
 
   // Destroy the event channel, *before* disconnecting the
   // clients.
-  event_channel->destroy (ACE_TRY_ENV);
+  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -163,18 +163,18 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      deactivate_servant (supplier[i], ACE_TRY_ENV);
+      deactivate_servant (supplier[i] TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       delete supplier[i];
 
-      deactivate_servant (consumer[i], ACE_TRY_ENV);
+      deactivate_servant (consumer[i] TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       delete consumer[i];
     }
   delete[] supplier;
   delete[] consumer;
 
-  deactivate_servant (&ec_impl, ACE_TRY_ENV);
+  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 03b818763a6..997b18880c4 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -12,43 +12,43 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                   TAO_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PushConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                ACE_TRY_ENV);
+  this->supplier_proxy_->connect_push_consumer (consumer.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+      this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this, ACE_TRY_ENV);
+    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV);
+  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -76,8 +76,8 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Counting_Consumer::push (const CORBA::Any&,
-                             CORBA::Environment &)
+CEC_Counting_Consumer::push (const CORBA::Any&
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count ++;
@@ -93,7 +93,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&,
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (CORBA::Environment &)
+CEC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -111,43 +111,43 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name)
 }
 
 void
-CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                                     CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                                     TAO_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PullConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_pull_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->supplier_proxy_->connect_pull_consumer (consumer.in (),
-                                                ACE_TRY_ENV);
+  this->supplier_proxy_->connect_pull_consumer (consumer.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_pull_supplier (ACE_TRY_ENV);
+      this->supplier_proxy_->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this, ACE_TRY_ENV);
+    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV);
+  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -155,19 +155,19 @@ CEC_Pull_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::pull (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       return 0;
     }
   this->event_count++;
-  return this->supplier_proxy_->pull (ACE_TRY_ENV);
+  return this->supplier_proxy_->pull (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event,
-                                      CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
+                                      TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -176,7 +176,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event,
     }
 
   CORBA::Any_var event =
-    this->supplier_proxy_->try_pull (has_event, ACE_TRY_ENV);
+    this->supplier_proxy_->try_pull (has_event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (has_event)
@@ -206,7 +206,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (CORBA::Environment &)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -231,7 +231,7 @@ CEC_Counting_Consumer_Task::svc ()
 {
   ACE_TRY_NEW_ENV
     {
-      this->run (ACE_TRY_ENV);
+      this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -256,7 +256,7 @@ CEC_Counting_Consumer_Task::pull_count (void)
 }
 
 void
-CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Consumer_Task::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -265,8 +265,8 @@ CEC_Counting_Consumer_Task::run (CORBA::Environment &ACE_TRY_ENV)
   do {
     CORBA::Boolean has_event;
     CORBA::Any_var event =
-      this->consumer_->try_pull (has_event,
-                                 ACE_TRY_ENV);
+      this->consumer_->try_pull (has_event
+                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->milliseconds_ != 0)
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index 10c921c6693..2d6d5f671e2 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -39,9 +39,9 @@ public:
   CEC_Counting_Consumer (const char* name);
   // Constructor
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
@@ -50,10 +50,10 @@ public:
 
   // = The CosEventComm::PushConsumer methods
 
-  virtual void push (const CORBA::Any& events,
-                     CORBA::Environment &_env)
+  virtual void push (const CORBA::Any& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -85,21 +85,21 @@ public:
   CEC_Pull_Counting_Consumer (const char* name);
   // Constructor
 
-  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
   // Print out an error message if the event count is too far from the
   // expected count.
 
-  CORBA::Any *pull (CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Any *try_pull (CORBA::Boolean_out has_event,
-                        CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any *pull (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Any *try_pull (CORBA::Boolean_out has_event
+                        TAO_ENV_ARG_DECL);
 
   // = The CosEventComm::PullConsumer methods
-  virtual void disconnect_pull_consumer (CORBA::Environment &)
+  virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -132,7 +132,7 @@ public:
   void stop (void);
   CORBA::ULong pull_count (void);
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 774f3177df8..80f15496418 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -12,41 +12,41 @@ CEC_Counting_Supplier::CEC_Counting_Supplier (void)
 
 void
 CEC_Counting_Supplier::connect (
-    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    CORBA::Environment &ACE_TRY_ENV)
+    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+    TAO_ENV_ARG_DECL)
 {
   CosEventComm::PushSupplier_var supplier =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->consumer_proxy_->connect_push_supplier (supplier.in (),
-                                                ACE_TRY_ENV);
+  this->consumer_proxy_->connect_push_supplier (supplier.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+      this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this, ACE_TRY_ENV);
+    supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV);
+  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -54,8 +54,8 @@ CEC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CEC_Counting_Supplier::push (const CORBA::Any&,
-                CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Supplier::push (const CORBA::Any&
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -64,13 +64,13 @@ CEC_Counting_Supplier::push (const CORBA::Any&,
   CORBA::Any event;
   event <<= CORBA::Long(0);
 
-  this->consumer_proxy_->push (event, ACE_TRY_ENV);
+  this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->event_count++;
 }
 
 void
-CEC_Counting_Supplier::disconnect_push_supplier (CORBA::Environment &)
+CEC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -95,7 +95,7 @@ CEC_Counting_Supplier_Task::svc ()
 {
   ACE_TRY_NEW_ENV
     {
-      this->run (ACE_TRY_ENV);
+      this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -120,14 +120,14 @@ CEC_Counting_Supplier_Task::push_count (void)
 }
 
 void
-CEC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV)
+CEC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
 
   int stop = 0;
   do {
-    this->supplier_->push (event, ACE_TRY_ENV);
+    this->supplier_->push (event TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->milliseconds_ != 0)
@@ -159,41 +159,41 @@ CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
 
 void
 CEC_Pull_Counting_Supplier::connect (
-    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    CORBA::Environment &ACE_TRY_ENV)
+    CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+    TAO_ENV_ARG_DECL)
 {
   CosEventComm::PullSupplier_var supplier =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_pull_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->consumer_proxy_->connect_pull_supplier (supplier.in (),
-                                                ACE_TRY_ENV);
+  this->consumer_proxy_->connect_pull_supplier (supplier.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_pull_consumer (ACE_TRY_ENV);
+      this->consumer_proxy_->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this, ACE_TRY_ENV);
+    supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV);
+  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -201,7 +201,7 @@ CEC_Pull_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Supplier::pull (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -221,8 +221,8 @@ CEC_Pull_Counting_Supplier::pull (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event,
-                                      CORBA::Environment &ACE_TRY_ENV)
+CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -247,7 +247,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event,
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (CORBA::Environment &)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 357714a81d5..41fd430d1e3 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -41,17 +41,17 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
-  void push (const CORBA::Any& events,
-             CORBA::Environment &_env)
+  void push (const CORBA::Any& events
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Push an event.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -79,7 +79,7 @@ public:
   void stop (void);
   CORBA::ULong push_count (void);
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
@@ -115,18 +115,18 @@ public:
 
   // = The CosEventComm::PullSupplier methods
 
-  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   // The PullSupplier methods.
-  CORBA::Any* pull (CORBA::Environment &_env)
+  CORBA::Any* pull (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  CORBA::Any* try_pull (CORBA::Boolean_out has_event,
-                        CORBA::Environment &_env)
+  CORBA::Any* try_pull (CORBA::Boolean_out has_event
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (CORBA::Environment &)
+  virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index e79c368a94c..38e9df2019e 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -39,19 +39,19 @@ ECB_Driver::ECB_Driver (void)
 int
 ECB_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->orb_ =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -60,12 +60,12 @@ ECB_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -91,12 +91,12 @@ ECB_Driver::run (int argc, char* argv[])
 
       ACE_Config_Scheduler scheduler_impl;
       RtecScheduler::Scheduler_var scheduler =
-        scheduler_impl._this (ACE_TRY_ENV);
+        scheduler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        this->orb_->object_to_string (scheduler.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->object_to_string (scheduler.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Basic: The (local) scheduler IOR is <%s>\n",
@@ -112,22 +112,22 @@ ECB_Driver::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      str = this->orb_->object_to_string (ec.in (),
-                                          ACE_TRY_ENV);
+      str = this->orb_->object_to_string (ec.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Basic: The (local) EC IOR is <%s>\n",
                   str.in ()));
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var local_ec =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ec_impl.activate ();
@@ -141,8 +141,8 @@ ECB_Driver::run (int argc, char* argv[])
       ECB_SupplierID_Test supplier_id_test;
       supplier_id_test.run (this->orb_.in (),
                             local_ec.in (),
-                            scheduler.in (),
-                            ACE_TRY_ENV);
+                            scheduler.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (supplier_id_test.dump_results () != 0)
@@ -158,8 +158,8 @@ ECB_Driver::run (int argc, char* argv[])
       ECB_Correlation_Test correlation_test;
       correlation_test.run (this->orb_.in (),
                             local_ec.in (),
-                            scheduler.in (),
-                            ACE_TRY_ENV);
+                            scheduler.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (correlation_test.dump_results () != 0)
@@ -233,11 +233,11 @@ ECB_Consumer::ECB_Consumer (ECB_Test *test,
 void
 ECB_Consumer::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    RtecScheduler::Scheduler_ptr scheduler,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    RtecScheduler::Scheduler_ptr scheduler
+                    TAO_ENV_ARG_DECL)
 {
   this->rt_info_ =
-    scheduler->create (name, ACE_TRY_ENV);
+    scheduler->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The worst case execution time is far less than 2
@@ -252,37 +252,37 @@ ECB_Consumer::open (const char* name,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   0,
-                  RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
+                  RtecScheduler::OPERATION
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // = Connect as a consumer.
-  this->consumer_admin_ = ec->for_consumers (ACE_TRY_ENV);
+  this->consumer_admin_ = ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECB_Consumer::connect (const RtecEventChannelAdmin::ConsumerQOS& qos,
-                       CORBA::Environment& ACE_TRY_ENV)
+ECB_Consumer::connect (const RtecEventChannelAdmin::ConsumerQOS& qos
+                       TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
+                                                qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECB_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV)
+ECB_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -290,31 +290,31 @@ ECB_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV)
 
   RtecEventChannelAdmin::ProxyPushSupplier_var tmp =
     this->supplier_proxy_._retn ();
-  tmp->disconnect_push_supplier (ACE_TRY_ENV);
+  tmp->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECB_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+ECB_Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->consumer_admin_ =
     RtecEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-ECB_Consumer::push (const RtecEventComm::EventSet& events,
-                    CORBA::Environment &ACE_TRY_ENV)
+ECB_Consumer::push (const RtecEventComm::EventSet& events
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->test_->push (this->consumer_id_,
-                     events,
-                     ACE_TRY_ENV);
+                     events
+                     TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECB_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECB_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -331,11 +331,11 @@ ECB_Supplier::ECB_Supplier (ECB_Test *test,
 void
 ECB_Supplier::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    RtecScheduler::Scheduler_ptr scheduler,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    RtecScheduler::Scheduler_ptr scheduler
+                    TAO_ENV_ARG_DECL)
 {
   this->rt_info_ =
-    scheduler->create (name, ACE_TRY_ENV);
+    scheduler->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The execution times are set to reasonable values, but actually
@@ -353,48 +353,48 @@ ECB_Supplier::open (const char* name,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   1,
-                  RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
+                  RtecScheduler::OPERATION
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // = Connect as a consumer.
-  this->supplier_admin_ = ec->for_suppliers (ACE_TRY_ENV);
+  this->supplier_admin_ = ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECB_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
-                       CORBA::Environment& ACE_TRY_ENV)
+ECB_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos
+                       TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
+    this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
+                                                qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECB_Supplier::disconnect (CORBA::Environment& ACE_TRY_ENV)
+ECB_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
     this->consumer_proxy_._retn ();
-  proxy->disconnect_push_consumer (ACE_TRY_ENV);
+  proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-ECB_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+ECB_Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
@@ -402,22 +402,22 @@ ECB_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
   this->supplier_admin_ =
     RtecEventChannelAdmin::SupplierAdmin::_nil ();
 
-  this->disconnect (ACE_TRY_ENV);
+  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-ECB_Supplier::send_event (RtecEventComm::EventSet& events,
-                          CORBA::Environment& ACE_TRY_ENV)
+ECB_Supplier::send_event (RtecEventComm::EventSet& events
+                          TAO_ENV_ARG_DECL)
 {
   // RtecEventComm::EventSet copy = events;
-  this->consumer_proxy_->push (events, ACE_TRY_ENV);
+  this->consumer_proxy_->push (events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECB_Supplier::disconnect_push_supplier (CORBA::Environment& /* ACE_TRY_ENV */)
+ECB_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  // this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -433,8 +433,8 @@ ECB_SupplierID_Test::ECB_SupplierID_Test (void)
 void
 ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
                           RtecEventChannelAdmin::EventChannel_ptr ec,
-                          RtecScheduler::Scheduler_ptr scheduler,
-                          CORBA::Environment& ACE_TRY_ENV)
+                          RtecScheduler::Scheduler_ptr scheduler
+                          TAO_ENV_ARG_DECL)
 {
   ACE_UNUSED_ARG (orb);
 
@@ -449,23 +449,23 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
   // Startup
   this->consumer0_.open ("SupplierID/consumer0",
                          ec,
-                         scheduler,
-                         ACE_TRY_ENV);
+                         scheduler
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->consumer1_.open ("SupplierID/consumer1",
                          ec,
-                         scheduler,
-                         ACE_TRY_ENV);
+                         scheduler
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->supplier0_.open ("SupplierID/supplier0",
                          ec,
-                         scheduler,
-                         ACE_TRY_ENV);
+                         scheduler
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->supplier1_.open ("SupplierID/supplier1",
                          ec,
-                         scheduler,
-                         ACE_TRY_ENV);
+                         scheduler
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Precompute the QoS for the consumers and suppliers.
@@ -509,130 +509,130 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
   // multiple suppliers with the same ID...
   this->phase_ = ECB_SupplierID_Test::PHASE_0;
 
-  this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
+  this->consumer0_.connect (consumer0_qos.get_ConsumerQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
+  this->consumer1_.connect (consumer1_qos.get_ConsumerQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
+      this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 1, test disconnection of a single supplier.
   this->phase_ = ECB_SupplierID_Test::PHASE_1;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
+  this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 2, test reconnection of the supplier.
   this->phase_ = ECB_SupplierID_Test::PHASE_2;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
+      this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 3, test disconnect of one consumer
   this->phase_ = ECB_SupplierID_Test::PHASE_3;
-  this->consumer1_.disconnect (ACE_TRY_ENV);
+  this->consumer1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
+      this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 4, test reconnection of one consumer
   this->phase_ = ECB_SupplierID_Test::PHASE_4;
-  this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
+  this->consumer1_.connect (consumer1_qos.get_ConsumerQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
+      this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 5, test disconnection of two consumers.
   this->phase_ = ECB_SupplierID_Test::PHASE_5;
-  this->consumer0_.disconnect (ACE_TRY_ENV);
+  this->consumer0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer1_.disconnect (ACE_TRY_ENV);
+  this->consumer1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
+      this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 6, test reconnection of two consumers.
   this->phase_ = ECB_SupplierID_Test::PHASE_6;
-  this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
+  this->consumer0_.connect (consumer0_qos.get_ConsumerQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (),
-                            ACE_TRY_ENV);
+  this->consumer1_.connect (consumer1_qos.get_ConsumerQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
+      this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 7, test disconnect/reconnect of both suppliers.
   this->phase_ = ECB_SupplierID_Test::PHASE_7;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
+  this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
+  this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (events, ACE_TRY_ENV);
+      this->supplier0_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (events, ACE_TRY_ENV);
+      this->supplier1_.send_event (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -640,13 +640,13 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
   this->phase_ = ECB_SupplierID_Test::PHASE_END;
 
   // Finish
-  this->supplier1_.close (ACE_TRY_ENV);
+  this->supplier1_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.close (ACE_TRY_ENV);
+  this->supplier0_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer1_.close (ACE_TRY_ENV);
+  this->consumer1_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer0_.close (ACE_TRY_ENV);
+  this->consumer0_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -704,8 +704,8 @@ ECB_SupplierID_Test::dump_results (void)
 
 void
 ECB_SupplierID_Test::push (int consumer_id,
-                           const RtecEventComm::EventSet &,
-                           CORBA::Environment &)
+                           const RtecEventComm::EventSet &
+                           TAO_ENV_ARG_DECL_NOT_USED)
 {
   switch (this->phase_)
     {
@@ -763,8 +763,8 @@ ECB_Correlation_Test::ECB_Correlation_Test (void)
 void
 ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
                            RtecEventChannelAdmin::EventChannel_ptr ec,
-                           RtecScheduler::Scheduler_ptr scheduler,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           RtecScheduler::Scheduler_ptr scheduler
+                           TAO_ENV_ARG_DECL)
 {
   ACE_UNUSED_ARG (orb);
 
@@ -779,18 +779,18 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
   // Startup
   this->consumer_.open ("Correlation/consumer",
                         ec,
-                        scheduler,
-                        ACE_TRY_ENV);
+                        scheduler
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->supplier0_.open ("Correlation/supplier0",
                          ec,
-                         scheduler,
-                         ACE_TRY_ENV);
+                         scheduler
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->supplier1_.open ("Correlation/supplier1",
                          ec,
-                         scheduler,
-                         ACE_TRY_ENV);
+                         scheduler
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Precompute the QoS for the consumers and suppliers.
@@ -872,163 +872,163 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
   // PHASE 0
   this->phase_ = ECB_Correlation_Test::PHASE_0;
 
-  this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
+  this->consumer_.connect (consumer_qos.get_ConsumerQOS ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_b, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_b TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 1, test disconnection of a single supplier.
   this->phase_ = ECB_Correlation_Test::PHASE_1;
-  this->consumer_.disconnect (ACE_TRY_ENV);
+  this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
+  this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
+  this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
+  this->consumer_.connect (consumer_qos.get_ConsumerQOS ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_ab, ACE_TRY_ENV);
+      this->supplier0_.send_event (event_ab TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_ab, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_ab TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 2, test reconnection of the supplier.
   this->phase_ = ECB_Correlation_Test::PHASE_2;
-  this->consumer_.disconnect (ACE_TRY_ENV);
+  this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
+  this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
+  this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
+  this->consumer_.connect (consumer_qos.get_ConsumerQOS ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_b, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_b TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier0_.send_event (event_b, ACE_TRY_ENV);
+      this->supplier0_.send_event (event_b TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 3
   this->phase_ = ECB_Correlation_Test::PHASE_3;
-  this->consumer_.disconnect (ACE_TRY_ENV);
+  this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
+  this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
+  this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
+  this->consumer_.connect (consumer_qos.get_ConsumerQOS ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_ab, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_ab TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 4
   this->phase_ = ECB_Correlation_Test::PHASE_4;
-  this->consumer_.disconnect (ACE_TRY_ENV);
+  this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
+  this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
+  this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
+  this->consumer_.connect (consumer_qos.get_ConsumerQOS ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_b, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_b TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // PHASE 5
   this->phase_ = ECB_Correlation_Test::PHASE_5;
-  this->consumer_.disconnect (ACE_TRY_ENV);
+  this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.disconnect (ACE_TRY_ENV);
+  this->supplier0_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.disconnect (ACE_TRY_ENV);
+  this->supplier1_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_.connect (consumer_qos.get_ConsumerQOS (),
-                           ACE_TRY_ENV);
+  this->consumer_.connect (consumer_qos.get_ConsumerQOS ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier0_.connect (supplier0_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier0_.connect (supplier0_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier1_.connect (supplier1_qos.get_SupplierQOS (),
-                            ACE_TRY_ENV);
+  this->supplier1_.connect (supplier1_qos.get_SupplierQOS ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i)
     {
-      this->supplier0_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier0_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      this->supplier1_.send_event (event_a, ACE_TRY_ENV);
+      this->supplier1_.send_event (event_a TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -1036,11 +1036,11 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
   this->phase_ = ECB_Correlation_Test::PHASE_END;
 
   // Finish
-  this->supplier1_.close (ACE_TRY_ENV);
+  this->supplier1_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier0_.close (ACE_TRY_ENV);
+  this->supplier0_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_.close (ACE_TRY_ENV);
+  this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1097,8 +1097,8 @@ ECB_Correlation_Test::dump_results (void)
 
 void
 ECB_Correlation_Test::push (int,
-                            const RtecEventComm::EventSet& events,
-                            CORBA::Environment &)
+                            const RtecEventComm::EventSet& events
+                            TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (events.length () != 2)
     {
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
index 1ea8ce9f1aa..b2d0f9b64b7 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
@@ -46,7 +46,7 @@ public:
   // Run the test.
 
 private:
-  int shutdown (CORBA::Environment&);
+  int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Called when the main thread is about to shutdown.
 
   int parse_args (int argc, char* argv[]);
@@ -84,8 +84,8 @@ public:
   // Destructor
 
   virtual void push (int consumer_number,
-                     const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env) = 0;
+                     const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL) = 0;
   // The callback from the Consumer....
 };
 
@@ -105,27 +105,27 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             RtecScheduler::Scheduler_ptr scheduler,
-             CORBA::Environment& _env);
+             RtecScheduler::Scheduler_ptr scheduler
+             TAO_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (CORBA::Environment &_env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   RtecScheduler::handle_t rt_info (void) const;
   // The RT_Info for this object
 
-  void connect (const RtecEventChannelAdmin::ConsumerQOS& qos,
-                CORBA::Environment &_env);
-  void disconnect (CORBA::Environment &_env);
+  void connect (const RtecEventChannelAdmin::ConsumerQOS& qos
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -157,28 +157,28 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             RtecScheduler::Scheduler_ptr scheduler,
-             CORBA::Environment& _env);
+             RtecScheduler::Scheduler_ptr scheduler
+             TAO_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (CORBA::Environment &_env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   RtecScheduler::handle_t rt_info (void) const;
   // The RT_Info for this object
 
-  void connect (const RtecEventChannelAdmin::SupplierQOS& qos,
-                CORBA::Environment &_env);
-  void disconnect (CORBA::Environment &_env);
+  void connect (const RtecEventChannelAdmin::SupplierQOS& qos
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, but do not forget about it or close
   // it.
 
-  void send_event (RtecEventComm::EventSet& events,
-                   CORBA::Environment &_env);
+  void send_event (RtecEventComm::EventSet& events
+                   TAO_ENV_ARG_DECL);
   // Send one event, the supplier provides the SourceID
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -244,16 +244,16 @@ public:
 
   void run (CORBA::ORB_ptr orb,
             RtecEventChannelAdmin::EventChannel_ptr event_channel,
-            RtecScheduler::Scheduler_ptr scheduler,
-            CORBA::Environment& _env);
+            RtecScheduler::Scheduler_ptr scheduler
+            TAO_ENV_ARG_DECL);
   // Start the test.
 
   int dump_results (void);
   // Print out the results, returns -1 if an error was detected.
 
   virtual void push (int consumer_id,
-                     const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
+                     const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL);
   // The callback from the Consumer....
 
 
@@ -318,16 +318,16 @@ public:
 
   void run (CORBA::ORB_ptr orb,
             RtecEventChannelAdmin::EventChannel_ptr event_channel,
-            RtecScheduler::Scheduler_ptr scheduler,
-            CORBA::Environment& _env);
+            RtecScheduler::Scheduler_ptr scheduler
+            TAO_ENV_ARG_DECL);
   // Start the test.
 
   int dump_results (void);
   // Print out the results, returns -1 if an error was detected.
 
   virtual void push (int consumer_id,
-                     const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
+                     const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL);
   // The callback from the Consumer....
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index c1e7f0d60ea..1b6cfc819b1 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -41,15 +41,15 @@ Driver::Driver (void)
 int
 Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -58,11 +58,11 @@ Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -118,8 +118,8 @@ Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -128,7 +128,7 @@ Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name name (1);
@@ -136,35 +136,35 @@ Driver::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
+        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect_consumers (channel.in (), ACE_TRY_ENV);
+      this->connect_consumers (channel.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      channel->destroy (ACE_TRY_ENV);
+      channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
@@ -182,8 +182,8 @@ Driver::run (int argc, char* argv[])
 void
 Driver::push_consumer (void* /* consumer_cookie */,
                        ACE_hrtime_t /* arrival */,
-                       const RtecEventComm::EventSet& events,
-                       CORBA::Environment &)
+                       const RtecEventComm::EventSet& events
+                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -273,8 +273,8 @@ Driver::push_consumer (void* /* consumer_cookie */,
 }
 
 void
-Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel,
-                           CORBA::Environment &ACE_TRY_ENV)
+Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
+                           TAO_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -286,18 +286,18 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel,
 
       this->consumers_[i]->connect (this->event_a_,
                                     this->event_b_,
-                                    channel,
-                                    ACE_TRY_ENV);
+                                    channel
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
+      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -381,8 +381,8 @@ Test_Consumer::Test_Consumer (Driver *driver, void *cookie)
 void
 Test_Consumer::connect (int event_a,
                         int event_b,
-                        RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment& ACE_TRY_ENV)
+                        RtecEventChannelAdmin::EventChannel_ptr ec
+                        TAO_ENV_ARG_DECL)
 {
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -392,25 +392,25 @@ Test_Consumer::connect (int event_a,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_ConsumerQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 void
-Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -418,20 +418,20 @@ Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
     this->supplier_proxy_._retn ();
 
-  proxy->disconnect_push_supplier (ACE_TRY_ENV);
+  proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->driver_->push_consumer (this->cookie_, arrival, events, ACE_TRY_ENV);
+  this->driver_->push_consumer (this->cookie_, arrival, events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index b1a936966d1..3a5df9b97b2 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -34,17 +34,17 @@ public:
 
   void connect (int event_a,
                 int event_b,
-                RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment& _env);
+                RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void disconnect (CORBA::Environment &_env);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -80,8 +80,8 @@ public:
 
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& events,
-                      CORBA::Environment&);
+                      const RtecEventComm::EventSet& events
+                      TAO_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
@@ -89,9 +89,9 @@ private:
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_consumers (CORBA::Environment &_env);
+  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 2651bab0e04..fb5da0a99f6 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -36,15 +36,15 @@ ECMS_Driver::ECMS_Driver (void)
 int
 ECMS_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,11 +52,11 @@ ECMS_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -116,7 +116,7 @@ ECMS_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -124,7 +124,7 @@ ECMS_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name name (1);
@@ -132,26 +132,26 @@ ECMS_Driver::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
+        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect_suppliers (channel.in (), ACE_TRY_ENV);
+      this->connect_suppliers (channel.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_TRY_ENV);
+      this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -165,7 +165,7 @@ ECMS_Driver::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "suppliers finished\n"));
 
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
@@ -186,7 +186,7 @@ int
 ECMS_Driver::supplier_task (Test_Supplier *supplier,
                             void* /* cookie */)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       ACE_Time_Value tv (0, this->event_period_);
@@ -258,7 +258,7 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
           // in just one memory allocation;
           event[0].data.payload.replace (mblen, mb);
 
-          supplier->consumer_proxy ()->push(event, ACE_TRY_ENV);
+          supplier->consumer_proxy ()->push(event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
@@ -279,8 +279,8 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
 }
 
 void
-ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel,
-                                CORBA::Environment &ACE_TRY_ENV)
+ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
+                                TAO_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -292,14 +292,14 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel,
       this->suppliers_[i]->connect (buf,
                                     this->event_a_,
                                     this->event_b_,
-                                    channel,
-                                    ACE_TRY_ENV);
+                                    channel
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECMS_Driver::activate_suppliers (CORBA::Environment &)
+ECMS_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -308,11 +308,11 @@ ECMS_Driver::activate_suppliers (CORBA::Environment &)
 }
 
 void
-ECMS_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+ECMS_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -416,8 +416,8 @@ void
 Test_Supplier::connect (const char* name,
                         int event_a,
                         int event_b,
-                        RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        RtecEventChannelAdmin::EventChannel_ptr ec
+                        TAO_ENV_ARG_DECL)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG,
@@ -437,25 +437,25 @@ Test_Supplier::connect (const char* name,
               0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
+    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (ACE_TRY_ENV);
+    this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_SupplierQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -465,7 +465,7 @@ Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
@@ -492,7 +492,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (CORBA::Environment &)
+Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 50ba18dc32e..6d66ed280a7 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -39,14 +39,14 @@ public:
   void connect (const char* name,
                 int event_a,
                 int event_b,
-                RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment& _env);
+                RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void disconnect (CORBA::Environment &_env);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The methods in the skeleton.
 
@@ -99,8 +99,8 @@ public:
 
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                      const RtecEventComm::EventSet &events,
-                      CORBA::Environment &);
+                      const RtecEventComm::EventSet &events
+                      TAO_ENV_ARG_DECL_NOT_USED);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -110,12 +110,12 @@ private:
   int parse_args (int argc, char* argv[]);
   // parse the command line args
 
-  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_suppliers (CORBA::Environment &_env);
+  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
-  void activate_suppliers (CORBA::Environment &_env);
+  void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 46d83bb2f59..d8629f4a59b 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -41,16 +41,16 @@ ECM_Driver::ECM_Driver (void)
 int
 ECM_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
+        this->orb_->resolve_initial_references("RootPOA"
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -59,11 +59,11 @@ ECM_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -137,43 +137,43 @@ ECM_Driver::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in (), ACE_TRY_ENV);
+        this->orb_->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
-      this->open_federations (ec.in (),
-                              ACE_TRY_ENV);
+      this->open_federations (ec.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
 
-      this->open_senders (ec.in (),
-                          ACE_TRY_ENV);
+      this->open_senders (ec.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
 
-      this->open_receivers (ec.in (),
-                            ACE_TRY_ENV);
+      this->open_receivers (ec.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
 
-      this->activate_federations (ec.in (),
-                                  ACE_TRY_ENV);
+      this->activate_federations (ec.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
@@ -184,17 +184,17 @@ ECM_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->close_receivers (ACE_TRY_ENV);
+      this->close_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->close_senders (ACE_TRY_ENV);
+      this->close_senders (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->close_federations (ACE_TRY_ENV);
+      this->close_federations (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
 
-      ec_impl.shutdown (ACE_TRY_ENV);
+      ec_impl.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -211,8 +211,8 @@ ECM_Driver::run (int argc, char* argv[])
 }
 
 void
-ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation,
-                                     CORBA::Environment &)
+ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, "Federation <%s> shuting down\n",
               federation->name ()));
@@ -221,20 +221,20 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation,
 }
 
 void
-ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                              CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
+                              TAO_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open (this->event_count_,
-                                         ec, ACE_TRY_ENV);
+                                         ec TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                  CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
+                                  TAO_ENV_ARG_DECL)
 {
   this->federations_running_ = this->local_federations_count_;
   RtecEventComm::Time interval = this->event_period_;
@@ -242,25 +242,25 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->activate (ec,
-                                             interval,
-                                             ACE_TRY_ENV);
+                                             interval
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::close_federations (CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::close_federations (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close (ACE_TRY_ENV);
+      this->local_federations_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
-                          CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
+                          TAO_ENV_ARG_DECL)
 {
   if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1)
     {
@@ -277,42 +277,42 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
       this->all_federations_[i]->open (&this->endpoint_,
-                                       ec,
-                                       ACE_TRY_ENV);
+                                       ec
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::close_senders (CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::close_senders (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
-      this->all_federations_[i]->close (ACE_TRY_ENV);
+      this->all_federations_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   this->endpoint_.dgram ().close ();
 }
 
 void
-ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
-                            CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
+                            TAO_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open_receiver (ec,
-                                                  &this->endpoint_,
-                                                  ACE_TRY_ENV);
+                                                  &this->endpoint_
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::close_receivers (CORBA::Environment &ACE_TRY_ENV)
+ECM_Driver::close_receivers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close_receiver (ACE_TRY_ENV);
+      this->local_federations_[i]->close_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -593,17 +593,17 @@ ECM_Federation::~ECM_Federation (void)
 
 void
 ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
-                      RtecEventChannelAdmin::EventChannel_ptr ec,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      RtecEventChannelAdmin::EventChannel_ptr ec
+                      TAO_ENV_ARG_DECL)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->addr_server (ACE_TRY_ENV);
+    this->addr_server (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->sender_.init (ec,
                       addr_server.in (),
-                      endpoint,
-                      ACE_TRY_ENV);
+                      endpoint
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ TODO Make this a parameter....
@@ -622,23 +622,23 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
       qos.insert_type (this->consumer_ipaddr (i), 0);
     }
   RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
-  this->sender_.open (qos_copy, ACE_TRY_ENV);
+  this->sender_.open (qos_copy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Federation::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Federation::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->sender_.close (ACE_TRY_ENV);
+  this->sender_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->sender_.shutdown (ACE_TRY_ENV);
+  this->sender_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 RtecUDPAdmin::AddrServer_ptr
-ECM_Federation::addr_server (CORBA::Environment &env)
+ECM_Federation::addr_server (TAO_ENV_SINGLE_ARG_DECL)
 {
-  return this->addr_server_._this (env);
+  return this->addr_server_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -651,8 +651,8 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation)
 
 void
 ECM_Supplier::open (const char* name,
-                    RtecEventChannelAdmin::EventChannel_ptr ec,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    RtecEventChannelAdmin::EventChannel_ptr ec
+                    TAO_ENV_ARG_DECL)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -670,29 +670,29 @@ ECM_Supplier::open (const char* name,
               0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
+    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_SupplierQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ = 0;
@@ -700,8 +700,8 @@ ECM_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
 
 void
 ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        RtecEventComm::Time interval,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        RtecEventComm::Time interval
+                        TAO_ENV_ARG_DECL)
 {
   ACE_ConsumerQOS_Factory consumer_qos;
   consumer_qos.start_disjunction_group ();
@@ -711,20 +711,20 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (ACE_TRY_ENV);
+    this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (cref.in (),
-                                                consumer_qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
+                                                consumer_qos.get_ConsumerQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -735,8 +735,8 @@ ECM_Supplier::supplier_id (void) const
 }
 
 void
-ECM_Supplier::push (const RtecEventComm::EventSet& events,
-                    CORBA::Environment& ACE_TRY_ENV)
+ECM_Supplier::push (const RtecEventComm::EventSet& events
+                    TAO_ENV_ARG_DECL)
 {
   for (u_int i = 0; i < events.length (); ++i)
     {
@@ -744,23 +744,21 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events,
       if (e.header.type != ACE_ES_EVENT_INTERVAL_TIMEOUT)
         continue;
 
-      this->federation_->supplier_timeout (this->consumer_proxy_.in (),
-                                           ACE_TRY_ENV);
+      this->federation_->supplier_timeout (this->consumer_proxy_.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Supplier::disconnect_push_supplier (CORBA::Environment& ACE_TRY_ENV)
+ECM_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  // this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  // this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-ECM_Supplier::disconnect_push_consumer (CORBA::Environment &)
+ECM_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
@@ -776,8 +774,8 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_RANDR_TYPE &seed,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    ACE_RANDR_TYPE &seed
+                    TAO_ENV_ARG_DECL)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -786,21 +784,21 @@ ECM_Consumer::open (const char*,
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
 
   // = Connect as a consumer.
-  this->consumer_admin_ = ec->for_consumers (ACE_TRY_ENV);
+  this->consumer_admin_ = ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect (seed, ACE_TRY_ENV);
+  this->connect (seed TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
-                       CORBA::Environment& ACE_TRY_ENV)
+ECM_Consumer::connect (ACE_RANDR_TYPE &seed
+                       TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos;
@@ -827,17 +825,17 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
       qos.insert_type (federation->consumer_ipaddr (i), 0);
     }
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_ConsumerQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV)
+ECM_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -846,16 +844,16 @@ ECM_Consumer::disconnect (CORBA::Environment& ACE_TRY_ENV)
 
   RtecEventChannelAdmin::ProxyPushSupplier_var tmp =
     this->supplier_proxy_._retn ();
-  tmp->disconnect_push_supplier (ACE_TRY_ENV);
+  tmp->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->disconnect (ACE_TRY_ENV);
+      this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->consumer_admin_ =
         RtecEventChannelAdmin::ConsumerAdmin::_nil ();
@@ -870,16 +868,16 @@ ECM_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-ECM_Consumer::push (const RtecEventComm::EventSet& events,
-                    CORBA::Environment &ACE_TRY_ENV)
+ECM_Consumer::push (const RtecEventComm::EventSet& events
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->federation_->consumer_push (arrival, events, ACE_TRY_ENV);
+  this->federation_->consumer_push (arrival, events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECM_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECM_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -915,8 +913,8 @@ ECM_Local_Federation::~ECM_Local_Federation (void)
 
 void
 ECM_Local_Federation::open (int event_count,
-                            RtecEventChannelAdmin::EventChannel_ptr ec,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            RtecEventChannelAdmin::EventChannel_ptr ec
+                            TAO_ENV_ARG_DECL)
 {
   this->event_count_ = event_count;
 
@@ -925,38 +923,38 @@ ECM_Local_Federation::open (int event_count,
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/supplier");
 
-  this->supplier_.open (buf, ec, ACE_TRY_ENV);
+  this->supplier_.open (buf, ec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_, ACE_TRY_ENV);
+  this->consumer_.open (buf, ec, this->seed_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
 
 void
-ECM_Local_Federation::close (CORBA::Environment &ACE_TRY_ENV)
+ECM_Local_Federation::close (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->consumer_.close (ACE_TRY_ENV);
+  this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_.close (ACE_TRY_ENV);
+  this->supplier_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                RtecEventComm::Time interval,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                RtecEventComm::Time interval
+                                TAO_ENV_ARG_DECL)
 {
-  this->supplier_.activate (ec, interval, ACE_TRY_ENV);
+  this->supplier_.activate (ec, interval TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer,
-                                        CORBA::Environment &ACE_TRY_ENV)
+ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
+                                        TAO_ENV_ARG_DECL)
 {
   RtecEventComm::EventSet sent (1);
   sent.length (1);
@@ -975,14 +973,14 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 
   if (this->event_count_ < 0)
     {
-      this->driver_->federation_has_shutdown (this, ACE_TRY_ENV);
+      this->driver_->federation_has_shutdown (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
   int i = this->event_count_ % this->federation_->supplier_types ();
   s.header.type = this->federation_->supplier_ipaddr (i);
 
-  consumer->push (sent, ACE_TRY_ENV);
+  consumer->push (sent TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->send_count_++;
@@ -999,9 +997,9 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
       ACE_DEBUG ((LM_DEBUG,
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
-      this->consumer_.disconnect (ACE_TRY_ENV);
+      this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->consumer_.connect (this->seed_, ACE_TRY_ENV);
+      this->consumer_.connect (this->seed_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
@@ -1009,8 +1007,8 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 
 void
 ECM_Local_Federation::consumer_push (ACE_hrtime_t,
-                                     const RtecEventComm::EventSet &event,
-                                     CORBA::Environment &)
+                                     const RtecEventComm::EventSet &event
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (event.length () == 0)
     {
@@ -1041,11 +1039,11 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t,
 
 void
 ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                     TAO_ECG_UDP_Out_Endpoint* ignore_from,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     TAO_ECG_UDP_Out_Endpoint* ignore_from
+                                     TAO_ENV_ARG_DECL)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->federation_->addr_server (ACE_TRY_ENV);
+    this->federation_->addr_server (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Reactor* reactor = TAO_ORB_Core_instance ()->reactor ();
@@ -1058,8 +1056,8 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                         addr_server.in (),
                         reactor,
                         expire_interval,
-                        max_timeouts,
-                        ACE_TRY_ENV);
+                        max_timeouts
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const int bufsize = 512;
@@ -1071,7 +1069,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->mcast_eh_.reactor (reactor);
 
-  this->mcast_eh_.open (ec, ACE_TRY_ENV);
+  this->mcast_eh_.open (ec TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_SupplierQOS_Factory qos;
@@ -1084,20 +1082,20 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   RtecEventChannelAdmin::SupplierQOS qos_copy =
     qos.get_SupplierQOS ();
-  this->receiver_.open (qos_copy, ACE_TRY_ENV);
+  this->receiver_.open (qos_copy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 
 }
 
 void
-ECM_Local_Federation::close_receiver (CORBA::Environment &ACE_TRY_ENV)
+ECM_Local_Federation::close_receiver (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->receiver_.close (ACE_TRY_ENV);
+  this->receiver_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->receiver_.shutdown (ACE_TRY_ENV);
+  this->receiver_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->mcast_eh_.close (ACE_TRY_ENV);
+  this->mcast_eh_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 9490a558de5..00c4dcb76fe 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -110,17 +110,17 @@ public:
   // The ipaddr (in host byte order) of the event type <i>
 
   void open (TAO_ECG_UDP_Out_Endpoint *endoint,
-             RtecEventChannelAdmin::EventChannel_ptr ec,
-             CORBA::Environment &_env);
+             RtecEventChannelAdmin::EventChannel_ptr ec
+             TAO_ENV_ARG_DECL);
   // Connect the UDP sender to the EC.
 
-  void close (CORBA::Environment &_env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Close the UDP sender, disconnect from the EC
 
   int sender_local_addr (ACE_INET_Addr& addr);
   // Return the sender local address
 
-  RtecUDPAdmin::AddrServer_ptr addr_server (CORBA::Environment &env);
+  RtecUDPAdmin::AddrServer_ptr addr_server (TAO_ENV_SINGLE_ARG_DECL);
   // This address server can be used to convert event headers
   // (type,source) to UDP addresses (ipaddr,port)
 
@@ -163,28 +163,28 @@ public:
   ECM_Supplier (ECM_Local_Federation* federation);
 
   void open (const char* name,
-             RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment& _env);
+             RtecEventChannelAdmin::EventChannel_ptr event_channel
+             TAO_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (CORBA::Environment &_env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval,
-                 CORBA::Environment& _env);
+                 RtecEventComm::Time interval
+                 TAO_ENV_ARG_DECL);
   // Connect as a consumer to start receiving events.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
   // The supplier ID.
 
-  void push (const RtecEventComm::EventSet& events,
-             CORBA::Environment &_env);
-  void disconnect_push_consumer (CORBA::Environment &);
+  void push (const RtecEventComm::EventSet& events
+             TAO_ENV_ARG_DECL);
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -220,24 +220,24 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             ACE_RANDR_TYPE &seed,
-             CORBA::Environment& _env);
+             ACE_RANDR_TYPE &seed
+             TAO_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (CORBA::Environment &_env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (ACE_RANDR_TYPE& seed,
-                CORBA::Environment &_env);
-  void disconnect (CORBA::Environment &_env);
+  void connect (ACE_RANDR_TYPE& seed
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -265,36 +265,36 @@ public:
   // Destructor
 
   void open (int event_count,
-             RtecEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment& _env);
+             RtecEventChannelAdmin::EventChannel_ptr event_channel
+             TAO_ENV_ARG_DECL);
   // Connect both the supplier and the consumer.
 
-  void close (CORBA::Environment& _env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect everybody from the EC
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval,
-                 CORBA::Environment& _env);
+                 RtecEventComm::Time interval
+                 TAO_ENV_ARG_DECL);
   // Activate the supplier
 
-  void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer,
-                         CORBA::Environment& _env);
+  void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
+                         TAO_ENV_ARG_DECL);
   // The supplier is ready to send a new event.
 
   void consumer_push (ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& event,
-                      CORBA::Environment& _env);
+                      const RtecEventComm::EventSet& event
+                      TAO_ENV_ARG_DECL);
   // The consumer just received an event.
 
   const ECM_Federation *federation (void) const;
   // The federation description.
 
   void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
-                      TAO_ECG_UDP_Out_Endpoint* ignore_from,
-                      CORBA::Environment &_env);
+                      TAO_ECG_UDP_Out_Endpoint* ignore_from
+                      TAO_ENV_ARG_DECL);
   // Connect the UDP receiver to the EC.
 
-  void close_receiver (CORBA::Environment &_env);
+  void close_receiver (TAO_ENV_SINGLE_ARG_DECL);
   // Close the UDP receiver, disconnect from the EC
 
   void dump_results (void) const;
@@ -413,41 +413,41 @@ public:
   int run (int argc, char* argv[]);
   // Run the test, read all the configuration files, etc.
 
-  void federation_has_shutdown (ECM_Local_Federation *federation,
-                                CORBA::Environment& _env);
+  void federation_has_shutdown (ECM_Local_Federation *federation
+                                TAO_ENV_ARG_DECL);
   // One of the federations has completed its simulation, once all of
   // them finish the test exists.
 
 
 private:
-  void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                         CORBA::Environment &_env);
+  void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
+                         TAO_ENV_ARG_DECL);
   // Connect the federations to the EC.
 
-  void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
-                             CORBA::Environment &_env);
+  void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
+                             TAO_ENV_ARG_DECL);
   // Activate all the federations
 
-  void close_federations (CORBA::Environment &_env);
+  void close_federations (TAO_ENV_SINGLE_ARG_DECL);
   // Close the federations, i.e. disconnect from the EC, deactivate
   // the objects, etc.
 
-  void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
-                     CORBA::Environment &_env);
+  void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
+                     TAO_ENV_ARG_DECL);
   // Connect all the senders, so we can start multicasting events.
 
-  void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &_env);
+  void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
+                       TAO_ENV_ARG_DECL);
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
 
-  void close_senders (CORBA::Environment &_env);
+  void close_senders (TAO_ENV_SINGLE_ARG_DECL);
   // Close all the senders to cleanup resources.
 
-  void close_receivers (CORBA::Environment &_env);
+  void close_receivers (TAO_ENV_SINGLE_ARG_DECL);
   // Close all the receivers to cleanup resources.
 
-  int shutdown (CORBA::Environment&);
+  int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Called when the main thread.
 
   int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index e51f97f027a..c7c895f046b 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -133,16 +133,16 @@ print_priority_info (const char *const name)
 int
 Test_ECG::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA",
-                                        ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA"
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -151,14 +151,14 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -260,7 +260,7 @@ Test_ECG::run (int argc, char* argv[])
       print_priority_info ("Test_ECG::run (Main after thr_setprio)");
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -269,7 +269,7 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl;
@@ -291,7 +291,7 @@ Test_ECG::run (int argc, char* argv[])
           }
           if (scheduler_impl.get () == 0)
             return -1;
-          scheduler = scheduler_impl->_this (ACE_TRY_ENV);
+          scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
 
@@ -314,7 +314,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
+              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM2") == 0)
@@ -335,7 +335,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
+              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM3") == 0)
@@ -356,7 +356,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
+              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -370,7 +370,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (ACE_TRY_ENV);
+              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           break;
@@ -393,7 +393,7 @@ Test_ECG::run (int argc, char* argv[])
         case Test_ECG::ss_runtime:
           {
             CORBA::String_var str =
-              orb->object_to_string (scheduler.in (), ACE_TRY_ENV);
+              orb->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
             ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                         str.in ()));
@@ -405,7 +405,7 @@ Test_ECG::run (int argc, char* argv[])
             CosNaming::Name schedule_name (1);
             schedule_name.length (1);
             schedule_name[0].id = CORBA::string_dup (buf);
-            naming_context->bind (schedule_name, scheduler.in (), ACE_TRY_ENV);
+            naming_context->bind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (ACE_Scheduler_Factory::use_config (naming_context.in (),
@@ -422,11 +422,11 @@ Test_ECG::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in (), ACE_TRY_ENV);
+        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
@@ -438,7 +438,7 @@ Test_ECG::run (int argc, char* argv[])
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (buf);
-      naming_context->bind (channel_name, ec.in (), ACE_TRY_ENV);
+      naming_context->bind (channel_name, ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
@@ -447,7 +447,7 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          orb->run (&tv, ACE_TRY_ENV);
+          orb->run (&tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -455,23 +455,23 @@ Test_ECG::run (int argc, char* argv[])
 
       RtecEventChannelAdmin::EventChannel_var local_ec =
         this->get_ec (naming_context.in (),
-                      this->lcl_name_,
-                      ACE_TRY_ENV);
+                      this->lcl_name_
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
 
       for (int sd = 0; sd < this->supplier_disconnects_; ++sd)
         {
-          this->connect_suppliers (local_ec.in (), ACE_TRY_ENV);
+          this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          this->disconnect_suppliers (ACE_TRY_ENV);
+          this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd));
         }
 
-      this->connect_suppliers (local_ec.in (), ACE_TRY_ENV);
+      this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier\n"));
@@ -480,13 +480,13 @@ Test_ECG::run (int argc, char* argv[])
       if (this->rmt_name_ != 0)
         {
           tv.set (5, 0);
-          orb->run (&tv, ACE_TRY_ENV);
+          orb->run (&tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecEventChannelAdmin::EventChannel_var remote_ec =
             this->get_ec (naming_context.in (),
-                          this->rmt_name_,
-                          ACE_TRY_ENV);
+                          this->rmt_name_
+                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG, "located remote EC\n"));
 
@@ -500,48 +500,48 @@ Test_ECG::run (int argc, char* argv[])
             }
           rsch_name[0].id = CORBA::string_dup (buf);
           CORBA::Object_var tmpobj =
-            naming_context->resolve (rsch_name, ACE_TRY_ENV);
+            naming_context->resolve (rsch_name TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecScheduler::Scheduler_var remote_sch =
-            RtecScheduler::Scheduler::_narrow (tmpobj.in (), ACE_TRY_ENV);
+            RtecScheduler::Scheduler::_narrow (tmpobj.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->connect_ecg (local_ec.in (),
                              remote_ec.in (),
-                             remote_sch.in (),
-                             ACE_TRY_ENV);
+                             remote_sch.in ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
 
           tv.set (5, 0);
-          orb->run (&tv, ACE_TRY_ENV);
+          orb->run (&tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecEventChannelAdmin::Observer_ptr observer =
-            this->ecg_._this (ACE_TRY_ENV);
+            this->ecg_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          observer_handle = ec_impl.append_observer (observer,
-                                                     ACE_TRY_ENV);
+          observer_handle = ec_impl.append_observer (observer
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       for (int cd = 0; cd < this->consumer_disconnects_; ++cd)
         {
-          this->connect_consumers (local_ec.in (), ACE_TRY_ENV);
+          this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          this->disconnect_consumers (ACE_TRY_ENV);
+          this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd));
         }
-      this->connect_consumers (local_ec.in (), ACE_TRY_ENV);
+      this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer\n"));
 
-      this->activate_suppliers (local_ec.in (), ACE_TRY_ENV);
+      this->activate_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -560,7 +560,7 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          ec_impl.remove_observer (observer_handle, ACE_TRY_ENV);
+          ec_impl.remove_observer (observer_handle TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -568,7 +568,7 @@ Test_ECG::run (int argc, char* argv[])
       ec_impl.activate ();
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->test_stop_ = ACE_OS::gethrtime ();
@@ -603,7 +603,7 @@ Test_ECG::run (int argc, char* argv[])
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out, configs_out, anomalies_out, ACE_TRY_ENV);
+             infos_out, configs_out, anomalies_out TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 #else  /* ! __SUNPRO_CC */
           ACE_Scheduler_Factory::server ()->compute_scheduling
@@ -611,8 +611,8 @@ Test_ECG::run (int argc, char* argv[])
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos.out (), configs.out (), anomalies.out (),
-             ACE_TRY_ENV);
+             infos.out (), configs.out (), anomalies.out ()
+             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 #endif /* ! __SUNPRO_CC */
 
@@ -622,25 +622,25 @@ Test_ECG::run (int argc, char* argv[])
                                                 this->schedule_file_);
         }
 
-      naming_context->unbind (channel_name, ACE_TRY_ENV);
+      naming_context->unbind (channel_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->rmt_name_ != 0)
         {
-          this->ecg_.close (ACE_TRY_ENV);
+          this->ecg_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          this->ecg_.shutdown (ACE_TRY_ENV);
+          this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
       tv.set (5, 0);
-      orb->run (&tv, ACE_TRY_ENV);
+      orb->run (&tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
@@ -657,8 +657,8 @@ Test_ECG::run (int argc, char* argv[])
 
 RtecEventChannelAdmin::EventChannel_ptr
 Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
-                  const char* process_name,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  const char* process_name
+                  TAO_ENV_ARG_DECL)
 {
   const int bufsize = 512;
   char buf[bufsize];
@@ -670,28 +670,28 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
   channel_name[0].id = CORBA::string_dup (buf);
 
   CORBA::Object_var ec_ptr =
-    naming_context->resolve (channel_name, ACE_TRY_ENV);
+    naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (RtecEventChannelAdmin::EventChannel::_nil ());
   if (CORBA::is_nil (ec_ptr.in ()))
     return RtecEventChannelAdmin::EventChannel::_nil ();
 
-  return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in (),
-                                                       ACE_TRY_ENV);
+  return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Test_ECG::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+Test_ECG::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
     {
-      this->suppliers_[i]->close (ACE_TRY_ENV);
+      this->suppliers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                             CORBA::Environment &ACE_TRY_ENV)
+Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                             TAO_ENV_ARG_DECL)
 {
   int i;
   for (i = 0; i < this->hp_suppliers_; ++i)
@@ -712,8 +712,8 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                                  this->hps_event_b_,
                                  mc,
                                  this->hp_interval_ * 10,
-                                 local_ec,
-                                 ACE_TRY_ENV);
+                                 local_ec
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -736,25 +736,25 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                                  this->lps_event_b_,
                                  mc,
                                  this->lp_interval_ * 10,
-                                 local_ec,
-                                 ACE_TRY_ENV);
+                                 local_ec
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Test_ECG::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+Test_ECG::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i)
     {
-      this->consumers_[i]->close (ACE_TRY_ENV);
+      this->consumers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                              CORBA::Environment &ACE_TRY_ENV)
+Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -771,8 +771,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
 
           this->suppliers_[i]->activate (buf,
                                          this->hp_interval_ * 10,
-                                         local_ec,
-                                         ACE_TRY_ENV);
+                                         local_ec
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -789,8 +789,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
 
           this->suppliers_[i]->activate (buf,
                                          this->lp_interval_ * 10,
-                                         local_ec,
-                                         ACE_TRY_ENV);
+                                         local_ec
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -802,8 +802,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
 }
 
 void
-Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                             CORBA::Environment &ACE_TRY_ENV)
+Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                             TAO_ENV_ARG_DECL)
 {
   int i;
   for (i = 0; i < this->hp_consumers_; ++i)
@@ -817,8 +817,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
       this->consumers_[i]->open (buf,
                                  this->hpc_event_a_,
                                  this->hpc_event_b_,
-                                 local_ec,
-                                 ACE_TRY_ENV);
+                                 local_ec
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
@@ -837,8 +837,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
       this->consumers_[i]->open (buf,
                                  this->lpc_event_a_,
                                  this->lpc_event_b_,
-                                 local_ec,
-                                 ACE_TRY_ENV);
+                                 local_ec
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
@@ -850,8 +850,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
 void
 Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                        RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                       RtecScheduler::Scheduler_ptr remote_sch,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       RtecScheduler::Scheduler_ptr remote_sch
+                       TAO_ENV_ARG_DECL)
 {
   RtecScheduler::Scheduler_ptr local_sch =
     ACE_Scheduler_Factory::server ();
@@ -877,22 +877,22 @@ Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
   ACE_OS::strcat (lcl, this->lcl_name_);
 
   this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch,
-                   rmt, lcl, ACE_TRY_ENV);
+                   rmt, lcl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Test_ECG::push_supplier (void * /* cookie */,
                          RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                         const RtecEventComm::EventSet &events,
-                         CORBA::Environment & ACE_TRY_ENV)
+                         const RtecEventComm::EventSet &events
+                         TAO_ENV_ARG_DECL)
 {
   this->wait_until_ready ();
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events sent by supplier\n"));
   // @@ TODO we could keep somekind of stats here...
   if (!this->short_circuit_)
     {
-      consumer->push (events, ACE_TRY_ENV);
+      consumer->push (events TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -900,12 +900,12 @@ Test_ECG::push_supplier (void * /* cookie */,
       int i = 0;
       for (; i < this->hp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events, ACE_TRY_ENV);
+          this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events, ACE_TRY_ENV);
+          this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -914,8 +914,8 @@ Test_ECG::push_supplier (void * /* cookie */,
 void
 Test_ECG::push_consumer (void *consumer_cookie,
                          ACE_hrtime_t arrival,
-                         const RtecEventComm::EventSet &events,
-                         CORBA::Environment &)
+                         const RtecEventComm::EventSet &events
+                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   int ID =
     (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -1008,8 +1008,8 @@ Test_ECG::wait_until_ready (void)
 
 void
 Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
-                             RtecEventComm::PushConsumer_ptr consumer,
-                             CORBA::Environment& ACE_TRY_ENV)
+                             RtecEventComm::PushConsumer_ptr consumer
+                             TAO_ENV_ARG_DECL)
 {
 
   this->running_suppliers_--;
@@ -1027,7 +1027,7 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
   ACE_hrtime_t t = ACE_OS::gethrtime ();
   ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t);
   s.header.type = ACE_ES_EVENT_SHUTDOWN;
-  consumer->push (shutdown, ACE_TRY_ENV);
+  consumer->push (shutdown TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1048,13 +1048,13 @@ Test_ECG::shutdown_consumer (int id)
 }
 
 int
-Test_ECG::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_ECG::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n"));
 
   if (this->rmt_name_ != 0)
     {
-      this->ecg_.shutdown (ACE_TRY_ENV);
+      this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -1306,8 +1306,8 @@ Test_Supplier::open (const char* name,
                      int event_b,
                      int message_count,
                      const RtecScheduler::Period_t& rate,
-                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     RtecEventChannelAdmin::EventChannel_ptr ec
+                     TAO_ENV_ARG_DECL)
 {
   this->event_a_ = event_a;
   this->event_b_ = event_b;
@@ -1317,7 +1317,7 @@ Test_Supplier::open (const char* name,
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name, ACE_TRY_ENV);
+    server->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The execution times are set to reasonable values, but
@@ -1335,8 +1335,8 @@ Test_Supplier::open (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                1,
-                   RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+                   RtecScheduler::OPERATION
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_id_ = ACE::crc32 (name);
@@ -1355,38 +1355,38 @@ Test_Supplier::open (const char* name,
               rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
+    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_SupplierQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+Test_Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
     this->consumer_proxy_._retn ();
-  proxy->disconnect_push_consumer (ACE_TRY_ENV);
+  proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 Test_Supplier::activate (const char* name,
                          const RtecScheduler::Period_t& rate,
-                         RtecEventChannelAdmin::EventChannel_ptr ec,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         RtecEventChannelAdmin::EventChannel_ptr ec
+                         TAO_ENV_ARG_DECL)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
@@ -1396,7 +1396,7 @@ Test_Supplier::activate (const char* name,
   ACE_OS::strcpy (buf, "consumer_");
   ACE_OS::strcat (buf, name);
   RtecScheduler::handle_t rt_info =
-    server->create (buf, ACE_TRY_ENV);
+    server->create (buf TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The execution times are set to reasonable values, but
@@ -1414,8 +1414,8 @@ Test_Supplier::activate (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                1,
-               RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               RtecScheduler::OPERATION
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Also connect our consumer for timeout events from the EC.
@@ -1433,27 +1433,27 @@ Test_Supplier::activate (const char* name,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (ACE_TRY_ENV);
+    this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (
        cref.in (),
-       consumer_qos.get_ConsumerQOS (),
-       ACE_TRY_ENV);
+       consumer_qos.get_ConsumerQOS ()
+       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Supplier::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment& ACE_TRY_ENV)
+Test_Supplier::push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
 {
 #if 0
    const int bufsize = 128;
@@ -1491,11 +1491,11 @@ Test_Supplier::push (const RtecEventComm::EventSet& events,
 
       if (this->message_count_ < 0)
         {
-          //this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-          //if (ACE_TRY_ENV.exception () != 0) return;
+          //this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+          //if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) return;
           this->test_->shutdown_supplier (this->cookie_,
-                                          this->consumer_proxy_.in (),
-                                          ACE_TRY_ENV);
+                                          this->consumer_proxy_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
         }
       if (this->message_count_ % 2 == 0)
         {
@@ -1509,22 +1509,22 @@ Test_Supplier::push (const RtecEventComm::EventSet& events,
     }
   this->test_->push_supplier (this->cookie_,
                               this->consumer_proxy_.in (),
-                              sent,
-                              ACE_TRY_ENV);
+                              sent
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Test_Supplier::disconnect_push_supplier (CORBA::Environment& ACE_TRY_ENV)
+Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Test_Supplier::disconnect_push_consumer (CORBA::Environment &)
+Test_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
@@ -1543,14 +1543,14 @@ Test_Consumer::Test_Consumer (Test_ECG *test,
 void
 Test_Consumer::open (const char* name,
                      int event_a, int event_b,
-                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     RtecEventChannelAdmin::EventChannel_ptr ec
+                     TAO_ENV_ARG_DECL)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name, ACE_TRY_ENV);
+    server->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The worst case execution time is far less than 2
@@ -1566,8 +1566,8 @@ Test_Consumer::open (const char* name,
                RtecScheduler::VERY_LOW_IMPORTANCE,
                time,
                0,
-               RtecScheduler::OPERATION,
-               ACE_TRY_ENV);
+               RtecScheduler::OPERATION
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos;
@@ -1578,44 +1578,44 @@ Test_Consumer::open (const char* name,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_ConsumerQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
     this->supplier_proxy_._retn ();
-  proxy->disconnect_push_supplier (ACE_TRY_ENV);
+  proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->test_->push_consumer (this->cookie_, arrival, events, ACE_TRY_ENV);
+  this->test_->push_consumer (this->cookie_, arrival, events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 9433fd5eaa7..11516552aad 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -49,25 +49,25 @@ public:
              int event_a, int event_b,
              int message_count,
              const RtecScheduler::Period_t& rate,
-             RtecEventChannelAdmin::EventChannel_ptr ec,
-             CORBA::Environment& _env);
+             RtecEventChannelAdmin::EventChannel_ptr ec
+             TAO_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (CORBA::Environment &_env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   void activate (const char* name,
                  const RtecScheduler::Period_t& rate,
-                 RtecEventChannelAdmin::EventChannel_ptr ec,
-                 CORBA::Environment& _env);
+                 RtecEventChannelAdmin::EventChannel_ptr ec
+                 TAO_ENV_ARG_DECL);
 
-  void push (const RtecEventComm::EventSet& events,
-             CORBA::Environment &_env);
-  void disconnect_push_consumer (CORBA::Environment &);
+  void push (const RtecEventComm::EventSet& events
+             TAO_ENV_ARG_DECL);
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The methods in the skeleton.
 
@@ -119,17 +119,17 @@ public:
 
   void open (const char* name,
              int event_a, int event_b,
-             RtecEventChannelAdmin::EventChannel_ptr ec,
-             CORBA::Environment& _env);
+             RtecEventChannelAdmin::EventChannel_ptr ec
+             TAO_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (CORBA::Environment &_env);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -184,8 +184,8 @@ public:
 
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
-                      const RtecEventComm::EventSet &events,
-                      CORBA::Environment &);
+                      const RtecEventComm::EventSet &events
+                      TAO_ENV_ARG_DECL_NOT_USED);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -193,45 +193,45 @@ public:
 
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
-                      const RtecEventComm::EventSet& events,
-                      CORBA::Environment&);
+                      const RtecEventComm::EventSet& events
+                      TAO_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
   void shutdown_supplier (void* supplier_cookie,
-                          RtecEventComm::PushConsumer_ptr consumer,
-                          CORBA::Environment& _env);
+                          RtecEventComm::PushConsumer_ptr consumer
+                          TAO_ENV_ARG_DECL);
   // One of the suppliers has completed its work.
 
 private:
   RtecEventChannelAdmin::EventChannel_ptr
     get_ec (CosNaming::NamingContext_ptr naming_context,
-            const char* ec_name,
-            CORBA::Environment &_env);
+            const char* ec_name
+            TAO_ENV_ARG_DECL);
   // Helper routine to obtain an EC given its name.
 
-  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_suppliers (CORBA::Environment &_env);
+  void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
-  void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                           CORBA::Environment &_env);
+  void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                           TAO_ENV_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
   void connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                     RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                    RtecScheduler::Scheduler_ptr remote_sch,
-                    CORBA::Environment &_env);
+                    RtecScheduler::Scheduler_ptr remote_sch
+                    TAO_ENV_ARG_DECL);
   // Connect the EC gateway, it builds the Subscriptions and the
   // Publications list.
 
-  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_consumers (CORBA::Environment &_env);
+  void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
-  int shutdown (CORBA::Environment&);
+  int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Called when the main thread (i.e. not the scavenger thread) is
   // shutting down.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 79c02ad1adb..346cc25fbe4 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -31,11 +31,11 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                         const char* name,
                         int type_start,
                         int type_count,
-                        RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment& ACE_TRY_ENV)
+                        RtecEventChannelAdmin::EventChannel_ptr ec
+                        TAO_ENV_ARG_DECL)
 {
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name, ACE_TRY_ENV);
+    scheduler->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The worst case execution time is far less than 2
@@ -50,8 +50,8 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   0,
-                  RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
+                  RtecScheduler::OPERATION
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos;
@@ -64,29 +64,29 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (ACE_TRY_ENV);
+    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
+  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_ConsumerQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -94,12 +94,12 @@ Test_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -117,8 +117,8 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const
 }
 
 void
-Test_Consumer::push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &ACE_TRY_ENV)
+Test_Consumer::push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -157,7 +157,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
             {
               // We stop the timer as soon as we realize it is time to
               // do so.
-              this->driver_->shutdown_consumer (this->cookie_, ACE_TRY_ENV);
+              this->driver_->shutdown_consumer (this->cookie_ TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -175,7 +175,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index c8b22e8c1eb..6490b55497b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -44,11 +44,11 @@ public:
                 const char* name,
                 int type_start,
                 int type_count,
-                RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment& _env);
+                RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void disconnect (CORBA::Environment &_env);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   void dump_results (const char* name,
@@ -58,10 +58,10 @@ public:
   void accumulate (ACE_Throughput_Stats& stats) const;
   // Add our throughput and latency statistics to <stats>
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 6f163b98afb..d07f0b23081 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -43,16 +43,16 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void)
 int
 ECT_Consumer_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
+        this->orb_->resolve_initial_references("RootPOA"
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -61,11 +61,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -124,8 +124,8 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("NameService"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -134,7 +134,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name schedule_name (1);
@@ -142,13 +142,13 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name, ACE_TRY_ENV);
+        naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
-        RtecScheduler::Scheduler::_narrow (sched_obj.in (),
-                                           ACE_TRY_ENV);
+        RtecScheduler::Scheduler::_narrow (sched_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name name (1);
@@ -156,21 +156,21 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
+        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect_consumers (scheduler.in (), channel.in (), ACE_TRY_ENV);
+      this->connect_consumers (scheduler.in (), channel.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
@@ -179,7 +179,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       for (;;)
         {
           ACE_Time_Value tv (1, 0);
-          this->orb_->perform_work (tv, ACE_TRY_ENV);
+          this->orb_->perform_work (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
           if (this->active_count_ <= 0)
@@ -189,19 +189,19 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->shutdown_event_channel_ != 0)
         {
-          channel->destroy (ACE_TRY_ENV);
+          channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_->destroy (ACE_TRY_ENV);
+      this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
@@ -217,8 +217,8 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 }
 
 void
-ECT_Consumer_Driver::shutdown_consumer (void*,
-                                        CORBA::Environment &)
+ECT_Consumer_Driver::shutdown_consumer (void*
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -233,8 +233,8 @@ ECT_Consumer_Driver::shutdown_consumer (void*,
 void
 ECT_Consumer_Driver::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      RtecEventChannelAdmin::EventChannel_ptr channel
+      TAO_ENV_ARG_DECL)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -254,8 +254,8 @@ ECT_Consumer_Driver::connect_consumers
                                     buf,
                                     this->type_start_,
                                     this->type_count_,
-                                    channel,
-                                    ACE_TRY_ENV);
+                                    channel
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -278,11 +278,11 @@ ECT_Consumer_Driver::dump_results (void)
 }
 
 void
-ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Consumer_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
+      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       delete this->consumers_[i];
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 9adfb636f6d..67579078b74 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -44,8 +44,8 @@ public:
   int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void shutdown_consumer (void* consumer_cookie,
-                                  CORBA::Environment&);
+  virtual void shutdown_consumer (void* consumer_cookie
+                                  TAO_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -55,9 +55,9 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_consumers (CORBA::Environment &_env);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index f7d923ac230..9d474f5ff65 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -25,8 +25,8 @@ class ECT_Driver
 public:
   virtual ~ECT_Driver (void);
 
-  virtual void shutdown_consumer (void* consumer_cookie,
-                                  CORBA::Environment&) = 0;
+  virtual void shutdown_consumer (void* consumer_cookie
+                                  TAO_ENV_ARG_DECL_NOT_USED) = 0;
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index f2a502edad4..73730d301e1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -43,8 +43,8 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int burst_pause,
                         int type_start,
                         int type_count,
-                        RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        RtecEventChannelAdmin::EventChannel_ptr ec
+                        TAO_ENV_ARG_DECL)
 {
   this->burst_count_ = burst_count;
   this->burst_size_ = burst_size;
@@ -54,7 +54,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
   this->type_count_ = type_count;
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name, ACE_TRY_ENV);
+    scheduler->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Time_Value tv (0, burst_pause);
@@ -74,8 +74,8 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                   RtecScheduler::VERY_LOW_IMPORTANCE,
                   time,
                   1,
-                  RtecScheduler::OPERATION,
-                  ACE_TRY_ENV);
+                  RtecScheduler::OPERATION
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_id_ = ACE::crc32 (name);
@@ -94,30 +94,30 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
               rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (ACE_TRY_ENV);
+    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (ACE_TRY_ENV);
+    this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos.get_SupplierQOS (),
-                                                ACE_TRY_ENV);
+                                                qos.get_SupplierQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -125,19 +125,19 @@ Test_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->supplier_._default_POA (ACE_TRY_ENV);
+    this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (&this->supplier_, ACE_TRY_ENV);
+    poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Test_Supplier::svc ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize a time value to pace the test
@@ -173,7 +173,7 @@ Test_Supplier::svc ()
               ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                              request_start);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
-              this->consumer_proxy ()->push (event, ACE_TRY_ENV);
+              this->consumer_proxy ()->push (event TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
               ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -197,7 +197,7 @@ Test_Supplier::svc ()
       ACE_hrtime_t request_start = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      request_start);
-      this->consumer_proxy ()->push(event, ACE_TRY_ENV);
+      this->consumer_proxy ()->push(event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_hrtime_t end = ACE_OS::gethrtime ();
       this->throughput_.sample (end - test_start,
@@ -220,7 +220,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (CORBA::Environment &)
+Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 6518226d75f..8fb44c736b7 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -45,14 +45,14 @@ public:
                 int burst_pause,
                 int type_start,
                 int type_count,
-                RtecEventChannelAdmin::EventChannel_ptr ec,
-                CORBA::Environment& _env);
+                RtecEventChannelAdmin::EventChannel_ptr ec
+                TAO_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void disconnect (CORBA::Environment &_env);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &);
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index e107c37693b..28e99d96f72 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -42,23 +42,23 @@ ECT_Supplier_Driver::~ECT_Supplier_Driver (void)
 }
 
 void
-ECT_Supplier_Driver::shutdown_consumer (void*,
-                                        CORBA::Environment &)
+ECT_Supplier_Driver::shutdown_consumer (void*
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 int
 ECT_Supplier_Driver::run (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -67,11 +67,11 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -136,7 +136,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -145,7 +145,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name schedule_name (1);
@@ -153,41 +153,41 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name, ACE_TRY_ENV);
+        naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
-        RtecScheduler::Scheduler::_narrow (sched_obj.in (),
-                                           ACE_TRY_ENV);
+        RtecScheduler::Scheduler::_narrow (sched_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name, ACE_TRY_ENV);
+        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
       if (CORBA::is_nil (ec_obj.in ()))
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
-        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                                ACE_TRY_ENV);
+        channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
+                                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->connect_suppliers (scheduler.in (),
-                               channel.in (),
-                               ACE_TRY_ENV);
+                               channel.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_TRY_ENV);
+      this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -203,17 +203,17 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "orb and poa destroyed\n"));
@@ -233,8 +233,8 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 void
 ECT_Supplier_Driver::connect_suppliers
     (RtecScheduler::Scheduler_ptr scheduler,
-     RtecEventChannelAdmin::EventChannel_ptr channel,
-     CORBA::Environment &ACE_TRY_ENV)
+     RtecEventChannelAdmin::EventChannel_ptr channel
+     TAO_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -251,14 +251,14 @@ ECT_Supplier_Driver::connect_suppliers
                                     this->burst_pause_,
                                     this->type_start_,
                                     this->type_count_,
-                                    channel,
-                                    ACE_TRY_ENV);
+                                    channel
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECT_Supplier_Driver::activate_suppliers (CORBA::Environment &)
+ECT_Supplier_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -267,11 +267,11 @@ ECT_Supplier_Driver::activate_suppliers (CORBA::Environment &)
 }
 
 void
-ECT_Supplier_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Supplier_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       delete this->suppliers_[i];
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index a4294e0e929..67efa007c52 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -34,8 +34,8 @@ public:
   ECT_Supplier_Driver (void);
   virtual ~ECT_Supplier_Driver (void);
 
-  virtual void shutdown_consumer (void* consumer_cookie,
-                                  CORBA::Environment&);
+  virtual void shutdown_consumer (void* consumer_cookie
+                                  TAO_ENV_ARG_DECL_NOT_USED);
   // Not used....
 
   enum {
@@ -51,12 +51,12 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_suppliers (CORBA::Environment &_env);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
-  void activate_suppliers (CORBA::Environment &_env);
+  void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index e8819ed904b..850436bb2af 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -70,12 +70,12 @@ ECT_Throughput::run (int argc, char* argv[])
       ACE_High_Res_Timer::calibrate ();
 
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
+        this->orb_->resolve_initial_references("RootPOA"
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -84,14 +84,14 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -189,13 +189,13 @@ ECT_Throughput::run (int argc, char* argv[])
         runtime_infos);
 #endif
       RtecScheduler::Scheduler_var scheduler =
-        scheduler_impl._this (ACE_TRY_ENV);
+        scheduler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if 0
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("NameService"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -204,7 +204,7 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This is the name we (potentially) register the Scheduling
@@ -214,13 +214,13 @@ ECT_Throughput::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::String_var str =
-        this->orb_->object_to_string (scheduler.in (), ACE_TRY_ENV);
+        this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                   str.in ()));
 
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in (), ACE_TRY_ENV);
+      naming_context->rebind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
@@ -263,7 +263,7 @@ ECT_Throughput::run (int argc, char* argv[])
           TAO_EC_Event_Channel *ec =
             new TAO_EC_Event_Channel (attr);
 
-          ec->activate (ACE_TRY_ENV);
+          ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec);
@@ -271,23 +271,23 @@ ECT_Throughput::run (int argc, char* argv[])
         }
 
       RtecEventChannelAdmin::EventChannel_var channel =
-        ec_impl->_this (ACE_TRY_ENV);
+        ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->connect_consumers (scheduler.in (),
-                               channel.in (), ACE_TRY_ENV);
+                               channel.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       this->connect_suppliers (scheduler.in (),
-                               channel.in (),
-                               ACE_TRY_ENV);
+                               channel.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (ACE_TRY_ENV);
+      this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -303,17 +303,17 @@ ECT_Throughput::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "consumers disconnected\n"));
 
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
 
-      channel->destroy (ACE_TRY_ENV);
+      channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "channel destroyed\n"));
@@ -321,12 +321,12 @@ ECT_Throughput::run (int argc, char* argv[])
       {
         // Deactivate the EC
         PortableServer::POA_var poa =
-          ec_impl->_default_POA (ACE_TRY_ENV);
+          ec_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (ec_impl.get (), ACE_TRY_ENV);
+          poa->servant_to_id (ec_impl.get () TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        poa->deactivate_object (id.in (), ACE_TRY_ENV);
+        poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG, "EC deactivated\n"));
@@ -335,12 +335,12 @@ ECT_Throughput::run (int argc, char* argv[])
       {
         // Deactivate the Scheduler
         PortableServer::POA_var poa =
-          scheduler_impl._default_POA (ACE_TRY_ENV);
+          scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (&scheduler_impl, ACE_TRY_ENV);
+          poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        poa->deactivate_object (id.in (), ACE_TRY_ENV);
+        poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
@@ -361,8 +361,8 @@ ECT_Throughput::run (int argc, char* argv[])
 }
 
 void
-ECT_Throughput::shutdown_consumer (void*,
-                                   CORBA::Environment &)
+ECT_Throughput::shutdown_consumer (void*
+                                   TAO_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -376,15 +376,15 @@ ECT_Throughput::shutdown_consumer (void*,
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%t) shutting down the ORB\n"));
-      // Not needed: this->orb_->shutdown (0, ACE_TRY_ENV);
+      // Not needed: this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
     }
 }
 
 void
 ECT_Throughput::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      RtecEventChannelAdmin::EventChannel_ptr channel
+      TAO_ENV_ARG_DECL)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -407,8 +407,8 @@ ECT_Throughput::connect_consumers
                                     buf,
                                     start,
                                     this->consumer_type_count_,
-                                    channel,
-                                    ACE_TRY_ENV);
+                                    channel
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -416,8 +416,8 @@ ECT_Throughput::connect_consumers
 void
 ECT_Throughput::connect_suppliers
      (RtecScheduler::Scheduler_ptr scheduler,
-      RtecEventChannelAdmin::EventChannel_ptr channel,
-      CORBA::Environment &ACE_TRY_ENV)
+      RtecEventChannelAdmin::EventChannel_ptr channel
+      TAO_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -435,14 +435,14 @@ ECT_Throughput::connect_suppliers
                                     this->burst_pause_,
                                     start,
                                     this->supplier_type_count_,
-                                    channel,
-                                    ACE_TRY_ENV);
+                                    channel
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECT_Throughput::activate_suppliers (CORBA::Environment &)
+ECT_Throughput::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -461,21 +461,21 @@ ECT_Throughput::activate_suppliers (CORBA::Environment &)
 }
 
 void
-ECT_Throughput::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Throughput::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECT_Throughput::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+ECT_Throughput::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
+      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index c80c76b7080..99d6f7b15e1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -43,8 +43,8 @@ public:
   int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void shutdown_consumer (void* consumer_cookie,
-                                  CORBA::Environment&);
+  virtual void shutdown_consumer (void* consumer_cookie
+                                  TAO_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -54,18 +54,18 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_consumers (CORBA::Environment &_env);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
-                          RtecEventChannelAdmin::EventChannel_ptr local_ec,
-                          CORBA::Environment &_env);
-  void disconnect_suppliers (CORBA::Environment &_env);
+                          RtecEventChannelAdmin::EventChannel_ptr local_ec
+                          TAO_ENV_ARG_DECL);
+  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
-  void activate_suppliers (CORBA::Environment &_env);
+  void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 5b15f1b2667..d3a33e84377 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -18,24 +18,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -46,11 +46,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -58,12 +58,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -75,16 +75,16 @@ main (int argc, char* argv[])
                          event_source,
                          event_type,
                          event_source,
-                         event_type,
-                         ACE_TRY_ENV);
+                         event_type
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       supplier1.connect (supplier_admin.in (),
                          event_source,
                          event_type + 1,
                          event_source,
-                         event_type + 1,
-                         ACE_TRY_ENV);
+                         event_type + 1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -107,8 +107,8 @@ main (int argc, char* argv[])
       consumer_qos01.insert (event_source, event_type + 1, 0);
 
       consumer01.connect (consumer_admin.in (),
-                          consumer_qos01.get_ConsumerQOS (),
-                          ACE_TRY_ENV);
+                          consumer_qos01.get_ConsumerQOS ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Consumer consumer0 ("Consumer/0", event_type);
@@ -116,8 +116,8 @@ main (int argc, char* argv[])
       // connnect to the event channel....
 
       consumer0.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS (),
-                         ACE_TRY_ENV);
+                         consumer_qos0.get_ConsumerQOS ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Consumer consumer1 ("Consumer/1", event_type);
@@ -125,8 +125,8 @@ main (int argc, char* argv[])
       // connnect to the event channel....
 
       consumer1.connect (consumer_admin.in (),
-                         consumer_qos1.get_ConsumerQOS (),
-                         ACE_TRY_ENV);
+                         consumer_qos1.get_ConsumerQOS ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -145,25 +145,25 @@ main (int argc, char* argv[])
         {
           ACE_Time_Value tv (0, 10000);
           consumer0.connect (consumer_admin.in (),
-                             consumer_qos0.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos0.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           consumer1.connect (consumer_admin.in (),
-                             consumer_qos1.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos1.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (i % 2 == 0)
             {
               consumer01.connect (consumer_admin.in (),
-                                  consumer_qos0.get_ConsumerQOS (),
-                                  ACE_TRY_ENV);
+                                  consumer_qos0.get_ConsumerQOS ()
+                                  TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               consumer01.connect (consumer_admin.in (),
-                                  consumer_qos01.get_ConsumerQOS (),
-                                  ACE_TRY_ENV);
+                                  consumer_qos01.get_ConsumerQOS ()
+                                  TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -180,28 +180,28 @@ main (int argc, char* argv[])
 
       // Cleanup..
 
-      consumer01.disconnect (ACE_TRY_ENV);
+      consumer01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer1.disconnect (ACE_TRY_ENV);
+      consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer0.disconnect (ACE_TRY_ENV);
+      consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      supplier1.disconnect (ACE_TRY_ENV);
+      supplier1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier0.disconnect (ACE_TRY_ENV);
+      supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -290,8 +290,8 @@ Consumer::dump_results (int base_count,
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 11276146cbe..76f5ee25e49 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -44,8 +44,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong event_base_count;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 8d723e09ebe..72b4e7a42ac 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -73,7 +73,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_ECG_UDP_Sender sender;
   TAO_ECG_UDP_Out_Endpoint endpoint;
@@ -82,7 +82,7 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
 
   Simple_Address_Server address_server_impl (udp_addr);
   RtecUDPAdmin::AddrServer_var address_server =
-    address_server_impl._this (ACE_TRY_ENV);
+    address_server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1)
@@ -93,16 +93,16 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
 
   sender.init (this->event_channel_.in (),
                address_server.in (),
-               &endpoint,
-               ACE_TRY_ENV);
+               &endpoint
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS sub;
   int shutdown_event_type;
-  this->build_consumer_qos (0, sub, shutdown_event_type, ACE_TRY_ENV);
+  this->build_consumer_qos (0, sub, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  sender.open (sub, ACE_TRY_ENV);
+  sender.open (sub TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_ECG_UDP_Receiver receiver;
@@ -114,8 +114,8 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
                  &endpoint,
                  address_server.in (),
                  this->orb_->orb_core ()->reactor (),
-                 expire, 5,
-                 ACE_TRY_ENV);
+                 expire, 5
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   udp_eh.reactor (this->orb_->orb_core ()->reactor ());
@@ -126,16 +126,16 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
     }
 
   RtecEventChannelAdmin::SupplierQOS pub;
-  this->build_supplier_qos (0, pub, shutdown_event_type, ACE_TRY_ENV);
+  this->build_supplier_qos (0, pub, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  receiver.open (pub, ACE_TRY_ENV);
+  receiver.open (pub TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (ACE_TRY_ENV);
+  this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -158,10 +158,10 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers finished\n"));
 
-  receiver.close (ACE_TRY_ENV);
+  receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  sender.close (ACE_TRY_ENV);
+  sender.close (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Deactivate all the objects...!
@@ -169,12 +169,12 @@ EC_BCast::execute_test (CORBA::Environment& ACE_TRY_ENV)
   {
     // Deactivate the Address Server
     PortableServer::POA_var poa =
-      address_server_impl._default_POA (ACE_TRY_ENV);
+      address_server_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (&address_server_impl, ACE_TRY_ENV);
+      poa->servant_to_id (&address_server_impl TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
+    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->verbose ())
@@ -199,8 +199,8 @@ Simple_Address_Server (const ACE_INET_Addr& address)
 
 void
 Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&,
-                                 RtecUDPAdmin::UDP_Addr& address,
-                                 CORBA::Environment &)
+                                 RtecUDPAdmin::UDP_Addr& address
+                                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   address = this->address_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 9c4ddfc6b91..91151483da1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -45,7 +45,7 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the bcastion flags
 
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
+  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   void dump_results (void);
@@ -70,8 +70,8 @@ public:
   // constructo
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr& address,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         RtecUDPAdmin::UDP_Addr& address
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 0715b27dd7b..6486aa05c1c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -15,24 +15,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -43,11 +43,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -55,12 +55,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -70,29 +70,29 @@ main (int argc, char* argv[])
       EC_Counting_Supplier first_supplier;
 
       first_supplier.activate (consumer_admin.in (),
-                               milliseconds,
-                               ACE_TRY_ENV);
+                               milliseconds
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       first_supplier.connect (supplier_admin.in (),
                               0x00001111UL,
                               0x11110000UL,
                               0x00001111UL,
-                              0x11110000UL,
-                              ACE_TRY_ENV);
+                              0x11110000UL
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
-                                milliseconds,
-                                ACE_TRY_ENV);
+                                milliseconds
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       second_supplier.connect (supplier_admin.in (),
                                0x01100000UL,
                                0x00000110UL,
                                0x01100000UL,
-                               0x00000110UL,
-                               ACE_TRY_ENV);
+                               0x00000110UL
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -108,8 +108,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (0x01100000, 0x00000110, 0);
 
         consumer_bitmask_reject.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS (),
-                                         ACE_TRY_ENV);
+                                         consumer_qos.get_ConsumerQOS ()
+                                         TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -125,8 +125,8 @@ main (int argc, char* argv[])
         consumer_qos.insert_null_terminator ();
 
         consumer_bitmask_accept.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS (),
-                                         ACE_TRY_ENV);
+                                         consumer_qos.get_ConsumerQOS ()
+                                         TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -142,8 +142,8 @@ main (int argc, char* argv[])
         consumer_qos.insert_null_terminator ();
 
         consumer_bitmask_filter.connect (consumer_admin.in (),
-                                         consumer_qos.get_ConsumerQOS (),
-                                         ACE_TRY_ENV);
+                                         consumer_qos.get_ConsumerQOS ()
+                                         TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -160,8 +160,8 @@ main (int argc, char* argv[])
                                              0x01100000, 0x00000110);
 
         consumer_bitmask_value.connect (consumer_admin.in (),
-                                        consumer_qos.get_ConsumerQOS (),
-                                        ACE_TRY_ENV);
+                                        consumer_qos.get_ConsumerQOS ()
+                                        TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -178,8 +178,8 @@ main (int argc, char* argv[])
                                              0x01100000, 0x00000110);
 
         consumer_bitmask_loose.connect (consumer_admin.in (),
-                                        consumer_qos.get_ConsumerQOS (),
-                                        ACE_TRY_ENV);
+                                        consumer_qos.get_ConsumerQOS ()
+                                        TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -192,36 +192,36 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_bitmask_loose.disconnect (ACE_TRY_ENV);
+      consumer_bitmask_loose.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_value.disconnect (ACE_TRY_ENV);
+      consumer_bitmask_value.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_filter.disconnect (ACE_TRY_ENV);
+      consumer_bitmask_filter.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_accept.disconnect (ACE_TRY_ENV);
+      consumer_bitmask_accept.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_reject.disconnect (ACE_TRY_ENV);
+      consumer_bitmask_reject.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      second_supplier.deactivate (ACE_TRY_ENV);
+      second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      second_supplier.disconnect (ACE_TRY_ENV);
+      second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.deactivate (ACE_TRY_ENV);
+      first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.disconnect (ACE_TRY_ENV);
+      first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -239,7 +239,7 @@ main (int argc, char* argv[])
       expected = second_supplier.event_count;
       consumer_bitmask_loose.dump_results (expected, 5);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 14f2f76483e..af1af27c30f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -14,24 +14,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -40,11 +40,11 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -52,12 +52,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -69,15 +69,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_00;
 
       supplier_00.activate (consumer_admin.in (),
-                            milliseconds,
-                            ACE_TRY_ENV);
+                            milliseconds
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_00.connect (supplier_admin.in (),
                            event_source,
                            event_type,
                            event_source,
-                           event_type,
-                           ACE_TRY_ENV);
+                           event_type
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -85,15 +85,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_01;
 
       supplier_01.activate (consumer_admin.in (),
-                            milliseconds,
-                            ACE_TRY_ENV);
+                            milliseconds
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_01.connect (supplier_admin.in (),
                            event_source,
                            event_type + 1,
                            event_source,
-                           event_type + 1,
-                           ACE_TRY_ENV);
+                           event_type + 1
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -101,15 +101,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_10;
 
       supplier_10.activate (consumer_admin.in (),
-                            milliseconds,
-                            ACE_TRY_ENV);
+                            milliseconds
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_10.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type,
                            event_source + 1,
-                           event_type,
-                           ACE_TRY_ENV);
+                           event_type
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -117,15 +117,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_11;
 
       supplier_11.activate (consumer_admin.in (),
-                            milliseconds,
-                            ACE_TRY_ENV);
+                            milliseconds
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_11.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type + 1,
                            event_source + 1,
-                           event_type + 1,
-                           ACE_TRY_ENV);
+                           event_type + 1
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -143,8 +143,8 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -163,8 +163,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_01.connect (consumer_admin.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -177,41 +177,41 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_01.disconnect (ACE_TRY_ENV);
+      consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_00.disconnect (ACE_TRY_ENV);
+      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.deactivate (ACE_TRY_ENV);
+      supplier_11.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.deactivate (ACE_TRY_ENV);
+      supplier_10.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.deactivate (ACE_TRY_ENV);
+      supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.deactivate (ACE_TRY_ENV);
+      supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.disconnect (ACE_TRY_ENV);
+      supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.disconnect (ACE_TRY_ENV);
+      supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.disconnect (ACE_TRY_ENV);
+      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_TRY_ENV);
+      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index 0cd5c5e78e2..af0ed3d1bde 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -18,24 +18,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -46,11 +46,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -58,12 +58,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -74,8 +74,8 @@ main (int argc, char* argv[])
                          event_source,
                          event_type,
                          event_source,
-                         event_type,
-                         ACE_TRY_ENV);
+                         event_type
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -89,8 +89,8 @@ main (int argc, char* argv[])
       consumer_qos0.insert (event_source, event_type, 0);
 
       consumer0.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS (),
-                         ACE_TRY_ENV);
+                         consumer_qos0.get_ConsumerQOS ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Consumer consumer1 ("Consumer/1", 200);
@@ -98,8 +98,8 @@ main (int argc, char* argv[])
       // connnect to the event channel....
 
       consumer1.connect (consumer_admin.in (),
-                         consumer_qos0.get_ConsumerQOS (),
-                         ACE_TRY_ENV);
+                         consumer_qos0.get_ConsumerQOS ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -124,24 +124,24 @@ main (int argc, char* argv[])
 
       // The consumers should be disconnected already, but make sure
       // that they did...
-      //consumer1.disconnect (ACE_TRY_ENV);
+      //consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       //ACE_TRY_CHECK;
-      //consumer0.disconnect (ACE_TRY_ENV);
+      //consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       //ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      supplier0.disconnect (ACE_TRY_ENV);
+      supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -173,8 +173,8 @@ Consumer::Consumer (const char* name,
 }
 
 void
-Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &ACE_TRY_ENV)
+Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -192,7 +192,7 @@ Consumer::push (const RtecEventComm::EventSet& events,
       return;
   }
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index dec0e8f08b9..9f467e6c711 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -38,8 +38,8 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 9c51cd6b368..c2b2605dd4d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -11,48 +11,48 @@
 ACE_RCSID(EC_Tests, Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      int use_callbacks
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0, ACE_TRY_ENV);
+      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1, ACE_TRY_ENV);
+      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -68,45 +68,45 @@ main (int argc, char* argv[])
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant,
-                    CORBA::Environment &ACE_TRY_ENV)
+deactivate_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_TRY_ENV);
+    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks,
-          CORBA::Environment &ACE_TRY_ENV)
+          int use_callbacks
+          TAO_ENV_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_EC_Event_Channel ec_impl (attributes);
-  ec_impl.activate (ACE_TRY_ENV);
+  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_TRY_ENV);
+    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (ACE_TRY_ENV);
+    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (ACE_TRY_ENV);
+    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -133,56 +133,56 @@ run_test (PortableServer::POA_ptr poa,
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in (),
-                          supplier_qos.get_SupplierQOS (),
-                          ACE_TRY_ENV);
+                          supplier_qos.get_SupplierQOS ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       consumer_0.connect (consumer_admin.in (),
-                          consumer_qos.get_ConsumerQOS (),
-                          ACE_TRY_ENV);
+                          consumer_qos.get_ConsumerQOS ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
-                              supplier_qos.get_SupplierQOS (),
-                              ACE_TRY_ENV);
+                              supplier_qos.get_SupplierQOS ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           consumer_1.connect (consumer_admin.in (),
-                              consumer_qos.get_ConsumerQOS (),
-                              ACE_TRY_ENV);
+                              consumer_qos.get_ConsumerQOS ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (ACE_TRY_ENV);
+      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (ACE_TRY_ENV);
+      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_TRY_ENV);
+          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (ACE_TRY_ENV);
+          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
   supplier_0.connect (supplier_admin.in (),
-                      supplier_qos.get_SupplierQOS (),
-                      ACE_TRY_ENV);
+                      supplier_qos.get_SupplierQOS ()
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   consumer_0.connect (consumer_admin.in (),
-                      consumer_qos.get_ConsumerQOS (),
-                      ACE_TRY_ENV);
+                      consumer_qos.get_ConsumerQOS ()
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  event_channel->destroy (ACE_TRY_ENV);
+  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&supplier_0, ACE_TRY_ENV);
+  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0, ACE_TRY_ENV);
+  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl, ACE_TRY_ENV);
+  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 1;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index f6029e91dc8..b02ef2f8546 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -15,24 +15,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -43,60 +43,60 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl_1 (attributes);
-      ec_impl_1.activate (ACE_TRY_ENV);
+      ec_impl_1.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel_1 =
-        ec_impl_1._this (ACE_TRY_ENV);
+        ec_impl_1._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       TAO_EC_Event_Channel ec_impl_2 (attributes);
-      ec_impl_2.activate (ACE_TRY_ENV);
+      ec_impl_2.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel_2 =
-        ec_impl_2._this (ACE_TRY_ENV);
+        ec_impl_2._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_1 =
-        event_channel_1->for_consumers (ACE_TRY_ENV);
+        event_channel_1->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_1 =
-        event_channel_1->for_suppliers (ACE_TRY_ENV);
+        event_channel_1->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_2 =
-        event_channel_2->for_consumers (ACE_TRY_ENV);
+        event_channel_2->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_2 =
-        event_channel_2->for_suppliers (ACE_TRY_ENV);
+        event_channel_2->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       TAO_EC_Gateway_IIOP gateway;
       gateway.init (event_channel_1.in (),
-                    event_channel_2.in (),
-                    ACE_TRY_ENV);
+                    event_channel_2.in ()
+                    TAO_ENV_ARG_PARAMETER);
 
       RtecEventChannelAdmin::Observer_var obs =
-        gateway._this (ACE_TRY_ENV);
+        gateway._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::Observer_Handle h =
-        event_channel_2->append_observer (obs.in (), ACE_TRY_ENV);
+        event_channel_2->append_observer (obs.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       gateway.observer_handle (h);
@@ -110,29 +110,29 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier_00;
 
       supplier_00.activate (consumer_admin_1.in (),
-                            milliseconds,
-                            ACE_TRY_ENV);
+                            milliseconds
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_00.connect (supplier_admin_1.in (),
                            event_source,
                            event_type,
                            event_source,
-                           event_type,
-                           ACE_TRY_ENV);
+                           event_type
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier supplier_01;
 
       supplier_01.activate (consumer_admin_1.in (),
-                            milliseconds,
-                            ACE_TRY_ENV);
+                            milliseconds
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_01.connect (supplier_admin_1.in (),
                            event_source,
                            event_type + 1,
                            event_source,
-                           event_type + 1,
-                           ACE_TRY_ENV);
+                           event_type + 1
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -148,8 +148,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -179,8 +179,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type + 1, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -206,8 +206,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -226,7 +226,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_00.disconnect (ACE_TRY_ENV);
+      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -237,8 +237,8 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -268,8 +268,8 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type + 1, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -295,8 +295,8 @@ main (int argc, char* argv[])
         consumer_qos.insert_type (event_type, 0);
 
         consumer_00.connect (consumer_admin_2.in (),
-                             consumer_qos.get_ConsumerQOS (),
-                             ACE_TRY_ENV);
+                             consumer_qos.get_ConsumerQOS ()
+                             TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -315,36 +315,36 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_00.disconnect (ACE_TRY_ENV);
+      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_01.deactivate (ACE_TRY_ENV);
+      supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.deactivate (ACE_TRY_ENV);
+      supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_01.disconnect (ACE_TRY_ENV);
+      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (ACE_TRY_ENV);
+      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      gateway.shutdown (ACE_TRY_ENV);
+      gateway.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel_1->destroy (ACE_TRY_ENV);
+      event_channel_1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      event_channel_2->destroy (ACE_TRY_ENV);
+      event_channel_2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 95abf2a614a..104c76200c7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -12,48 +12,48 @@
 ACE_RCSID(EC_Tests, MT_Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
-                      int use_callbacks,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      int use_callbacks
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0, ACE_TRY_ENV);
+      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1, ACE_TRY_ENV);
+      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -69,33 +69,33 @@ main (int argc, char* argv[])
 // ****************************************************************
 
 void
-deactivate_servant (PortableServer::Servant servant,
-                    CORBA::Environment &ACE_TRY_ENV)
+deactivate_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_TRY_ENV);
+    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
-          int use_callbacks,
-          CORBA::Environment &ACE_TRY_ENV)
+          int use_callbacks
+          TAO_ENV_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_EC_Event_Channel ec_impl (attributes);
-  ec_impl.activate (ACE_TRY_ENV);
+  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (ACE_TRY_ENV);
+    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Task task (event_channel.in (), use_callbacks);
@@ -108,10 +108,10 @@ run_test (PortableServer::POA_ptr poa,
   // Wait for all the threads to complete and the return
   ACE_Thread_Manager::instance ()->wait ();
 
-  event_channel->destroy (ACE_TRY_ENV);
+  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl, ACE_TRY_ENV);
+  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -130,7 +130,7 @@ Task::svc ()
     {
       ACE_TRY_NEW_ENV
         {
-          this->run_iteration (ACE_TRY_ENV);
+          this->run_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -143,16 +143,16 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (CORBA::Environment &ACE_TRY_ENV)
+Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel->for_consumers (ACE_TRY_ENV);
+    this->event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel->for_suppliers (ACE_TRY_ENV);
+    this->event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -179,41 +179,41 @@ Task::run_iteration (CORBA::Environment &ACE_TRY_ENV)
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in (),
-                          supplier_qos.get_SupplierQOS (),
-                          ACE_TRY_ENV);
+                          supplier_qos.get_SupplierQOS ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       consumer_0.connect (consumer_admin.in (),
-                          consumer_qos.get_ConsumerQOS (),
-                          ACE_TRY_ENV);
+                          consumer_qos.get_ConsumerQOS ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
-                              supplier_qos.get_SupplierQOS (),
-                              ACE_TRY_ENV);
+                              supplier_qos.get_SupplierQOS ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           consumer_1.connect (consumer_admin.in (),
-                              consumer_qos.get_ConsumerQOS (),
-                              ACE_TRY_ENV);
+                              consumer_qos.get_ConsumerQOS ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (ACE_TRY_ENV);
+      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (ACE_TRY_ENV);
+      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (ACE_TRY_ENV);
+          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (ACE_TRY_ENV);
+          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
-  deactivate_servant (&supplier_0, ACE_TRY_ENV);
+  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0, ACE_TRY_ENV);
+  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 4efc3a0d98d..e8775059df6 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -15,24 +15,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -43,11 +43,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -55,12 +55,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -72,43 +72,43 @@ main (int argc, char* argv[])
       EC_Counting_Supplier first_supplier;
 
       first_supplier.activate (consumer_admin.in (),
-                               milliseconds,
-                               ACE_TRY_ENV);
+                               milliseconds
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       first_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type,
                               event_source,
-                              event_type,
-                              ACE_TRY_ENV);
+                              event_type
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
-                                milliseconds,
-                                ACE_TRY_ENV);
+                                milliseconds
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       second_supplier.connect (supplier_admin.in (),
                                event_source,
                                event_type + 1,
                                event_source,
-                               event_type + 1,
-                               ACE_TRY_ENV);
+                               event_type + 1
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier third_supplier;
 
       third_supplier.activate (consumer_admin.in (),
-                               milliseconds,
-                               ACE_TRY_ENV);
+                               milliseconds
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       third_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type + 1,
                               event_source,
-                              event_type + 1,
-                              ACE_TRY_ENV);
+                              event_type + 1
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -124,8 +124,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         regular_consumer.connect (consumer_admin.in (),
-                                  consumer_qos.get_ConsumerQOS (),
-                                  ACE_TRY_ENV);
+                                  consumer_qos.get_ConsumerQOS ()
+                                  TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -142,8 +142,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         negation_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS (),
-                                   ACE_TRY_ENV);
+                                   consumer_qos.get_ConsumerQOS ()
+                                   TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -156,37 +156,37 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      negation_consumer.disconnect (ACE_TRY_ENV);
+      negation_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      regular_consumer.disconnect (ACE_TRY_ENV);
+      regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      third_supplier.deactivate (ACE_TRY_ENV);
+      third_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      third_supplier.disconnect (ACE_TRY_ENV);
+      third_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      second_supplier.deactivate (ACE_TRY_ENV);
+      second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      second_supplier.disconnect (ACE_TRY_ENV);
+      second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.deactivate (ACE_TRY_ENV);
+      first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.disconnect (ACE_TRY_ENV);
+      first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -199,7 +199,7 @@ main (int argc, char* argv[])
         first_supplier.event_count;
       regular_consumer.dump_results (expected, 5);
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 3a53241333a..b8b90e089fd 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -48,7 +48,7 @@ EC_Master::run (int argc, char* argv[])
 
       this->seed_ = ACE_OS::time (0);
 
-      this->initialize_orb_and_poa (argc, argv, ACE_TRY_ENV);
+      this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -84,7 +84,7 @@ EC_Master::run (int argc, char* argv[])
             int targc = argc;
             for (int j = 0; j < targc; ++j)
               targv[j] = argv[j];
-            this->channels_[i]->run_init (targc, targv, ACE_TRY_ENV);
+            this->channels_[i]->run_init (targc, targv TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] targv;
@@ -93,7 +93,7 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->execute_test (ACE_TRY_ENV);
+            this->channels_[i]->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
@@ -115,7 +115,7 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->run_cleanup (ACE_TRY_ENV);
+            this->channels_[i]->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
@@ -123,13 +123,13 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->disconnect_clients (ACE_TRY_ENV);
+            this->channels_[i]->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->channels_[i]->shutdown_clients (ACE_TRY_ENV);
+            this->channels_[i]->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->channels_[i]->destroy_ec (ACE_TRY_ENV);
+            this->channels_[i]->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->channels_[i]->deactivate_ec (ACE_TRY_ENV);
+            this->channels_[i]->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             this->channels_[i]->cleanup_tasks ();
             this->channels_[i]->cleanup_suppliers ();
@@ -139,11 +139,11 @@ EC_Master::run (int argc, char* argv[])
       }
 
       this->root_poa_->destroy (1,
-                                1,
-                                ACE_TRY_ENV);
+                                1
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_->destroy (ACE_TRY_ENV);
+      this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
    }
   ACE_CATCHANY
@@ -159,15 +159,15 @@ EC_Master::run (int argc, char* argv[])
 }
 
 void
-EC_Master::initialize_orb_and_poa (int &argc, char* argv[],
-                                   CORBA::Environment& ACE_TRY_ENV)
+EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
+                                   TAO_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+    CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object.in ()))
@@ -178,14 +178,14 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[],
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   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;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -249,8 +249,8 @@ EC_Observer::~EC_Observer (void)
 }
 
 void
-EC_Observer::initialize_orb_and_poa (int&, char*[],
-                                     CORBA::Environment&)
+EC_Observer::initialize_orb_and_poa (int&, char*[]
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -273,7 +273,7 @@ EC_Observer::print_usage (void)
 }
 
 void
-EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   int peer_count = this->master_->channel_count ();
   ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]);
@@ -287,15 +287,15 @@ EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV)
         this->master_->channel (i)->event_channel_.in ();
 
       this->gwys_[i].init (rmt_ec,
-                           this->event_channel_.in (),
-                           ACE_TRY_ENV);
+                           this->event_channel_.in ()
+                           TAO_ENV_ARG_PARAMETER);
 
       RtecEventChannelAdmin::Observer_var obs =
-        this->gwys_[i]._this (ACE_TRY_ENV);
+        this->gwys_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       RtecEventChannelAdmin::Observer_Handle h =
-        rmt_ec->append_observer (obs.in (), ACE_TRY_ENV);
+        rmt_ec->append_observer (obs.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->gwys_[i].observer_handle (h);
@@ -306,7 +306,7 @@ EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV)
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (ACE_TRY_ENV);
+  this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -315,7 +315,7 @@ EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-EC_Observer::run_cleanup (CORBA::Environment& ACE_TRY_ENV)
+EC_Observer::run_cleanup (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int j = 0; j != this->master_->channel_count (); ++j)
     {
@@ -324,11 +324,11 @@ EC_Observer::run_cleanup (CORBA::Environment& ACE_TRY_ENV)
 
       RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
         this->master_->channel (j)->event_channel_.in ();
-      rmt_ec->remove_observer (this->gwys_[j].observer_handle (),
-                               ACE_TRY_ENV);
+      rmt_ec->remove_observer (this->gwys_[j].observer_handle ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->gwys_[j].shutdown (ACE_TRY_ENV);
+      this->gwys_[j].shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -362,25 +362,25 @@ EC_Observer::dump_results (void)
 void
 EC_Observer::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
+    int i
+    TAO_ENV_ARG_DECL)
 {
   if (i == 0)
     {
-      this->EC_Driver::connect_consumer (consumer_admin, i,
-                                         ACE_TRY_ENV);
+      this->EC_Driver::connect_consumer (consumer_admin, i
+                                         TAO_ENV_ARG_PARAMETER);
       return;
     }
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < RAND_MAX / 8)
-    this->EC_Driver::connect_consumer (consumer_admin, i,
-                                       ACE_TRY_ENV);
+    this->EC_Driver::connect_consumer (consumer_admin, i
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Observer::consumer_push (void*,
-                            const RtecEventComm::EventSet&,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            const RtecEventComm::EventSet&
+                            TAO_ENV_ARG_DECL)
 {
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < (RAND_MAX / 64))
@@ -390,7 +390,7 @@ EC_Observer::consumer_push (void*,
                     "EC_Observer[%d] (%P|%t) reconnecting\n", this->id_));
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (ACE_TRY_ENV);
+        this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (int i = 1; i < this->n_consumers_; ++i)
@@ -399,13 +399,13 @@ EC_Observer::consumer_push (void*,
 
           if (this->consumers_[i]->connected ())
             {
-              this->consumers_[i]->disconnect (ACE_TRY_ENV);
+              this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
           else
             {
               this->EC_Driver::connect_consumer (consumer_admin.in (),
-                                                 i, ACE_TRY_ENV);
+                                                 i TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index 5b2fe020327..655ad3e9111 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -43,8 +43,8 @@ public:
   virtual int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void initialize_orb_and_poa (int& argc, char* argv[],
-                                       CORBA::Environment& env);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]
+                                       TAO_ENV_ARG_DECL);
   // Obtain the orb and the poa pointers
 
   int channel_count (void) const;
@@ -89,25 +89,25 @@ public:
   // Destructor
 
   // = The EC_Driver methods
-  virtual void initialize_orb_and_poa (int& argc, char* argv[],
-                                       CORBA::Environment& env);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]
+                                       TAO_ENV_ARG_DECL);
   virtual int parse_args (int& argc, char* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
   // add some command line args to enable/disable observerions
 
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  void run_cleanup (CORBA::Environment& ACE_TRY_ENV);
+  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  void run_cleanup (TAO_ENV_SINGLE_ARG_DECL);
   // Run the suppliers, using the <thread_manager> parameter
 
   void dump_results (void);
   void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
+    int i
+    TAO_ENV_ARG_DECL);
   void consumer_push (void*,
-                      const RtecEventComm::EventSet&,
-                      CORBA::Environment& ACE_TRY_ENV);
+                      const RtecEventComm::EventSet&
+                      TAO_ENV_ARG_DECL);
 
 private:
   EC_Master *master_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 942b3a23fc6..5b9b6cbcf73 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -21,16 +21,16 @@ main (int argc, char* argv[])
 const int base_type = 20;
 
 void
-deactivate_servant (PortableServer::Servant servant,
-                    CORBA::Environment &ACE_TRY_ENV)
+deactivate_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (ACE_TRY_ENV);
+    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant, ACE_TRY_ENV);
+    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -49,11 +49,11 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -116,15 +116,15 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -135,23 +135,23 @@ RND_Driver::run (int argc, char *argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       this->consumer_admin_ =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       this->supplier_admin_ =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -172,8 +172,8 @@ RND_Driver::run (int argc, char *argv[])
                          0);
 
         this->timer_.connect (this->consumer_admin_.in (),
-                              qos.get_ConsumerQOS (),
-                              ACE_TRY_ENV);
+                              qos.get_ConsumerQOS ()
+                              TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -184,8 +184,8 @@ RND_Driver::run (int argc, char *argv[])
         qos.insert (0, base_type, 0, 1);
 
         this->supplier_.connect (this->supplier_admin_.in (),
-                                 qos.get_SupplierQOS (),
-                                 ACE_TRY_ENV);
+                                 qos.get_SupplierQOS ()
+                                 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -201,7 +201,7 @@ RND_Driver::run (int argc, char *argv[])
                           1);
 
           CORBA::Object_var obj =
-            this->consumers_[i]->_this (ACE_TRY_ENV);
+            this->consumers_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -218,7 +218,7 @@ RND_Driver::run (int argc, char *argv[])
           this->suppliers_[j]->activate ();
 
           CORBA::Object_var obj =
-            this->suppliers_[j]->_this (ACE_TRY_ENV);
+            this->suppliers_[j]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -234,10 +234,10 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
-            deactivate_servant (this->suppliers_[k],
-                                ACE_TRY_ENV);
+            deactivate_servant (this->suppliers_[k]
+                                TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->suppliers_[k]->_remove_ref (ACE_TRY_ENV);
+            this->suppliers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->suppliers_;
@@ -248,7 +248,7 @@ RND_Driver::run (int argc, char *argv[])
 
       // We destroy now to verify that the callbacks work and do not
       // produce any problems.
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -256,10 +256,10 @@ RND_Driver::run (int argc, char *argv[])
       {
         for (int k = 0; k != this->nconsumers_; ++k)
           {
-            deactivate_servant (this->consumers_[k],
-                                ACE_TRY_ENV);
+            deactivate_servant (this->consumers_[k]
+                                TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->consumers_[k]->_remove_ref (ACE_TRY_ENV);
+            this->consumers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->consumers_;
@@ -268,18 +268,18 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      deactivate_servant (&ec_impl,
-                          ACE_TRY_ENV);
+      deactivate_servant (&ec_impl
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -292,8 +292,8 @@ RND_Driver::run (int argc, char *argv[])
 }
 
 void
-RND_Driver::timer (const RtecEventComm::Event &e,
-                   CORBA::Environment &ACE_TRY_ENV)
+RND_Driver::timer (const RtecEventComm::Event &e
+                   TAO_ENV_ARG_DECL)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -313,7 +313,7 @@ RND_Driver::timer (const RtecEventComm::Event &e,
             event.length (1);
             event[0] = e;
             event[0].header.source ++;
-            this->supplier_.push (event, ACE_TRY_ENV);
+            this->supplier_.push (event TAO_ENV_ARG_PARAMETER);
             ACE_CHECK;
           }
       }
@@ -337,8 +337,8 @@ RND_Driver::timer (const RtecEventComm::Event &e,
         qos.insert (0, base_type, 0, 1);
 
         this->suppliers_[n]->connect (this->supplier_admin_.in (),
-                                      qos.get_SupplierQOS (),
-                                      ACE_TRY_ENV);
+                                      qos.get_SupplierQOS ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -354,8 +354,8 @@ RND_Driver::timer (const RtecEventComm::Event &e,
         qos.insert_type (base_type, 0);
 
         this->consumers_[n]->connect (this->consumer_admin_.in (),
-                                      qos.get_ConsumerQOS (),
-                                      ACE_TRY_ENV);
+                                      qos.get_ConsumerQOS ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -366,7 +366,7 @@ RND_Driver::timer (const RtecEventComm::Event &e,
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
 
-        this->suppliers_[n]->disconnect (ACE_TRY_ENV);
+        this->suppliers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -377,7 +377,7 @@ RND_Driver::timer (const RtecEventComm::Event &e,
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
 
-        this->consumers_[n]->disconnect (ACE_TRY_ENV);
+        this->consumers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -385,22 +385,22 @@ RND_Driver::timer (const RtecEventComm::Event &e,
 }
 
 void
-RND_Driver::event (const RtecEventComm::Event &e,
-                   CORBA::Environment &ACE_TRY_ENV)
+RND_Driver::event (const RtecEventComm::Event &e
+                   TAO_ENV_ARG_DECL)
 {
-  this->timer (e, ACE_TRY_ENV);
+  this->timer (e TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 void
-RND_Timer::push (const RtecEventComm::EventSet &event,
-                 CORBA::Environment &ACE_TRY_ENV)
+RND_Timer::push (const RtecEventComm::EventSet &event
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->driver_->timer (event[0], ACE_TRY_ENV);
+      this->driver_->timer (event[0] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -413,8 +413,8 @@ RND_Timer::push (const RtecEventComm::EventSet &event,
 
 void
 RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
-                       const RtecEventChannelAdmin::ConsumerQOS &qos,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const RtecEventChannelAdmin::ConsumerQOS &qos
+                       TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -422,44 +422,44 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_supplier (ACE_TRY_ENV);
+        this->proxy_ = admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
     proxy =
       RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
   }
   RtecEventComm::PushConsumer_var me =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   proxy->connect_push_consumer (me.in (),
-                                qos,
-                                ACE_TRY_ENV);
+                                qos
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-RND_Consumer::push (const RtecEventComm::EventSet &event,
-                    CORBA::Environment &ACE_TRY_ENV)
+RND_Consumer::push (const RtecEventComm::EventSet &event
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event[0], ACE_TRY_ENV);
+  this->driver_->event (event[0] TAO_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Consumer::disconnect_push_consumer (CORBA::Environment &)
+RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -468,8 +468,8 @@ RND_Consumer::disconnect_push_consumer (CORBA::Environment &)
 
 void
 RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
-                       const RtecEventChannelAdmin::SupplierQOS &qos,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const RtecEventChannelAdmin::SupplierQOS &qos
+                       TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -477,7 +477,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_consumer (ACE_TRY_ENV);
+        this->proxy_ = admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
 
@@ -485,41 +485,41 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
       RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
   RtecEventComm::PushSupplier_var me =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   proxy->connect_push_supplier (me.in (),
-                                qos,
-                                ACE_TRY_ENV);
+                                qos
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+RND_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-RND_Supplier::push_new_event (CORBA::Environment &ACE_TRY_ENV)
+RND_Supplier::push_new_event (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventComm::EventSet event (1);
   event.length (1);
   event[0].header.type   = base_type;
   event[0].header.source = 0;
 
-  this->push (event, ACE_TRY_ENV);
+  this->push (event TAO_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Supplier::push (RtecEventComm::EventSet &event,
-                    CORBA::Environment &ACE_TRY_ENV)
+RND_Supplier::push (RtecEventComm::EventSet &event
+                    TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -532,11 +532,11 @@ RND_Supplier::push (RtecEventComm::EventSet &event,
       RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event, ACE_TRY_ENV);
+  proxy->push (event TAO_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Supplier::disconnect_push_supplier (CORBA::Environment &)
+RND_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -549,13 +549,13 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
-          this->push_new_event (ACE_TRY_ENV);
+          this->push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 9ba7af06e4f..3ef3e1f0bb9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -47,16 +47,16 @@ public:
   RND_Consumer (RND_Driver *driver);
   // Constructor
 
-  void push (const RtecEventComm::EventSet &event,
-             CORBA::Environment &ACE_TRY_ENV)
+  void push (const RtecEventComm::EventSet &event
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
-                const RtecEventChannelAdmin::ConsumerQOS &qos,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+                const RtecEventChannelAdmin::ConsumerQOS &qos
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
 protected:
   RND_Driver *driver_;
@@ -82,8 +82,8 @@ class RND_Timer : public RND_Consumer
 public:
   RND_Timer (RND_Driver *driver);
 
-  void push (const RtecEventComm::EventSet &event,
-             CORBA::Environment &ACE_TRY_ENV)
+  void push (const RtecEventComm::EventSet &event
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -110,16 +110,16 @@ public:
   // Constructor
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
-                const RtecEventChannelAdmin::SupplierQOS &qos,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+                const RtecEventChannelAdmin::SupplierQOS &qos
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
 
-  void push_new_event (CORBA::Environment &ACE_TRY_ENV);
-  void push (RtecEventComm::EventSet &event,
-             CORBA::Environment &ACE_TRY_ENV);
+  void push_new_event (TAO_ENV_SINGLE_ARG_DECL);
+  void push (RtecEventComm::EventSet &event
+             TAO_ENV_ARG_DECL);
   // Push a single event...
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual int svc (void);
@@ -152,12 +152,12 @@ public:
   int run (int argc, char *argv[]);
   // Run the test
 
-  void timer (const RtecEventComm::Event &e,
-              CORBA::Environment &ACE_TRY_ENV);
+  void timer (const RtecEventComm::Event &e
+              TAO_ENV_ARG_DECL);
   // The main timer has expired
 
-  void event (const RtecEventComm::Event &e,
-              CORBA::Environment &ACE_TRY_ENV);
+  void event (const RtecEventComm::Event &e
+              TAO_ENV_ARG_DECL);
   // One of the consumers has received an event
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 07f8ca298d9..3a2533f44d4 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -88,18 +88,18 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Reconnect::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Reconnect::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->execute_consumer_test (ACE_TRY_ENV);
+  this->execute_consumer_test (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->execute_supplier_test (ACE_TRY_ENV);
+  this->execute_supplier_test (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf);
   this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf);
 
-  // this->EC_Driver::execute_test (ACE_TRY_ENV);
+  // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -108,11 +108,11 @@ EC_Reconnect::dump_results (void)
 }
 
 void
-EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (0, qos, shutdown_event_type, ACE_TRY_ENV);
+  this->build_consumer_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allow_consumer_reconnect_)
@@ -122,8 +122,8 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           this->consumers_[0]->connect (qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
+                                        shutdown_event_type
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
@@ -135,8 +135,8 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
       ACE_TRY
         {
           this->consumers_[0]->connect (qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
+                                        shutdown_event_type
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
@@ -153,19 +153,19 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
       ACE_ENDTRY;
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (ACE_TRY_ENV);
+        this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->consumers_[0]->disconnect (ACE_TRY_ENV);
+          this->consumers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->consumers_[0]->connect (consumer_admin.in (),
                                         qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
+                                        shutdown_event_type
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
@@ -175,11 +175,11 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (0, qos, shutdown_event_type, ACE_TRY_ENV);
+  this->build_supplier_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allow_supplier_reconnect_)
@@ -188,8 +188,8 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->connect (qos, shutdown_event_type,
-                                        ACE_TRY_ENV);
+          this->suppliers_[0]->connect (qos, shutdown_event_type
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
@@ -200,8 +200,8 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
     {
       ACE_TRY
         {
-          this->suppliers_[0]->connect (qos, shutdown_event_type,
-                                        ACE_TRY_ENV);
+          this->suppliers_[0]->connect (qos, shutdown_event_type
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
@@ -218,19 +218,19 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
       ACE_ENDTRY;
 
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        this->event_channel_->for_suppliers (ACE_TRY_ENV);
+        this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->disconnect (ACE_TRY_ENV);
+          this->suppliers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->suppliers_[0]->connect (supplier_admin.in (),
                                         qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
+                                        shutdown_event_type
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index 98ced023e05..3b51c048d04 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -49,13 +49,13 @@ EC_Schedule::print_usage (void)
 }
 
 void
-EC_Schedule::initialize_ec_impl (CORBA::Environment &ACE_TRY_ENV)
+EC_Schedule::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->scheduler_impl_ = new ACE_Config_Scheduler;
-  this->scheduler_ = this->scheduler_impl_->_this (ACE_TRY_ENV);
+  this->scheduler_ = this->scheduler_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->EC_Driver::initialize_ec_impl (ACE_TRY_ENV);
+  this->EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -72,7 +72,7 @@ EC_Schedule::cleanup_ec (void)
 }
 
 void
-EC_Schedule::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Schedule::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Long min_priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -90,8 +90,8 @@ EC_Schedule::execute_test (CORBA::Environment& ACE_TRY_ENV)
   this->scheduler_->compute_scheduling (min_priority, max_priority,
                                         infos.out (),
                                         configs.out (),
-                                        anomalies.out (),
-                                        ACE_TRY_ENV);
+                                        anomalies.out ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -112,14 +112,14 @@ void
 EC_Schedule::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type,
-  CORBA::Environment &ACE_TRY_ENV)
+  int& shutdown_event_type
+  TAO_ENV_ARG_DECL)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name, ACE_TRY_ENV);
+    this->scheduler_->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The worst case execution time is far less than 2
@@ -134,8 +134,8 @@ EC_Schedule::build_consumer_qos (
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          time,
                          0,
-                         RtecScheduler::OPERATION,
-                         ACE_TRY_ENV);
+                         RtecScheduler::OPERATION
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int type_start =
@@ -158,14 +158,14 @@ void
 EC_Schedule::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV)
+      int& shutdown_event_type
+      TAO_ENV_ARG_DECL)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name, ACE_TRY_ENV);
+    this->scheduler_->create (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Time_Value tv (0, this->burst_pause_);
@@ -185,8 +185,8 @@ EC_Schedule::build_supplier_qos (
                          RtecScheduler::VERY_LOW_IMPORTANCE,
                          time,
                          1,
-                         RtecScheduler::OPERATION,
-                         ACE_TRY_ENV);
+                         RtecScheduler::OPERATION
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index e78cd815f8f..54a448f532c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -59,12 +59,12 @@ public:
   // add some command line args to change the scheduling service to
   // use.
 
-  void initialize_ec_impl (CORBA::Environment &ACE_TRY_ENV);
+  void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL);
   void cleanup_ec (void);
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // Set the scheduling service attribute
 
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
+  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just compute the schedule.
 
   void dump_results (void);
@@ -73,13 +73,13 @@ public:
   virtual void build_consumer_qos (
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
+      int& shutdown_event_type
+      TAO_ENV_ARG_DECL_NOT_USED);
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
+      int& shutdown_event_type
+      TAO_ENV_ARG_DECL_NOT_USED);
   // This time really connect to the scheduler
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index d61b2bdc526..2dfa9322b2c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -22,18 +22,18 @@ EC_Shutdown::EC_Shutdown (void)
 }
 
 void
-EC_Shutdown::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Shutdown::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n"));
 
-  this->destroy_ec (ACE_TRY_ENV);
+  this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec destroyed\n"));
 
-  this->deactivate_ec (ACE_TRY_ENV);
+  this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -44,16 +44,16 @@ EC_Shutdown::execute_test (CORBA::Environment& ACE_TRY_ENV)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec cleanup\n"));
 
-  this->initialize_ec_impl (ACE_TRY_ENV);
+  this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->connect_consumers (ACE_TRY_ENV);
+  this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->connect_suppliers (ACE_TRY_ENV);
+  this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) status reset\n"));
 
-  // this->EC_Driver::execute_test (ACE_TRY_ENV);
+  // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -71,8 +71,8 @@ EC_Shutdown::dump_results (void)
 }
 
 void
-EC_Shutdown::consumer_disconnect (void* cookie,
-                                  CORBA::Environment&)
+EC_Shutdown::consumer_disconnect (void* cookie
+                                  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->consumer_disconnects_++;
   if (this->verbose ())
@@ -80,8 +80,8 @@ EC_Shutdown::consumer_disconnect (void* cookie,
 }
 
 void
-EC_Shutdown::supplier_disconnect (void* cookie,
-                                  CORBA::Environment&)
+EC_Shutdown::supplier_disconnect (void* cookie
+                                  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->supplier_disconnects_++;
   if (this->verbose ())
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
index b7d1e573d3f..b97deb5536a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
@@ -39,18 +39,18 @@ public:
   // Constructor
 
   // = The EC_Driver methods
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
+  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers just create the EC and then destroy it.
 
   void dump_results (void);
   // Don't dump the EC_Driver results, they are meaningless.
 
-  virtual void consumer_disconnect (void* consumer_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
+  virtual void consumer_disconnect (void* consumer_cookie
+                                    TAO_ENV_ARG_DECL);
   // One of the consumers in the test has been disconnected from the EC
 
-  virtual void supplier_disconnect (void* supplier_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
+  virtual void supplier_disconnect (void* supplier_cookie
+                                    TAO_ENV_ARG_DECL);
   // One of the suppliers in the test has been disconnected from the EC
 
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 93cfe70bb7f..8d2ff984a88 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -17,24 +17,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -43,11 +43,11 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -55,12 +55,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -68,12 +68,12 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier;
 
       supplier.activate (consumer_admin.in (),
-                         50, ACE_TRY_ENV);
+                         50 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier.connect (supplier_admin.in (),
                         0, 20,
-                        0, 20,
-                        ACE_TRY_ENV);
+                        0, 20
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -99,8 +99,8 @@ main (int argc, char* argv[])
                                   0);
 
         interval_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS (),
-                                   ACE_TRY_ENV);
+                                   consumer_qos.get_ConsumerQOS ()
+                                   TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -126,8 +126,8 @@ main (int argc, char* argv[])
                                   0);
 
         conjunction_consumer.connect (consumer_admin.in (),
-                                      consumer_qos.get_ConsumerQOS (),
-                                      ACE_TRY_ENV);
+                                      consumer_qos.get_ConsumerQOS ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -149,8 +149,8 @@ main (int argc, char* argv[])
                                   0);
 
         deadline_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS (),
-                                   ACE_TRY_ENV);
+                                   consumer_qos.get_ConsumerQOS ()
+                                   TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -163,28 +163,28 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      deadline_consumer.disconnect (ACE_TRY_ENV);
+      deadline_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      conjunction_consumer.disconnect (ACE_TRY_ENV);
+      conjunction_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      interval_consumer.disconnect (ACE_TRY_ENV);
+      interval_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier.deactivate (ACE_TRY_ENV);
+      supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier.disconnect (ACE_TRY_ENV);
+      supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 79362be04ca..6a2569745fb 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -14,24 +14,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -40,11 +40,11 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -52,12 +52,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (ACE_TRY_ENV);
+        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (ACE_TRY_ENV);
+        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -69,15 +69,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier;
 
       supplier.activate (consumer_admin.in (),
-                         milliseconds,
-                         ACE_TRY_ENV);
+                         milliseconds
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier.connect (supplier_admin.in (),
                         event_source,
                         event_type,
                         event_source,
-                        event_type,
-                        ACE_TRY_ENV);
+                        event_type
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -85,15 +85,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier other_supplier;
 
       other_supplier.activate (consumer_admin.in (),
-                               milliseconds,
-                               ACE_TRY_ENV);
+                               milliseconds
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       other_supplier.connect (supplier_admin.in (),
                               event_source + 1,
                               event_type + 1,
                               event_source + 1,
-                              event_type + 1,
-                              ACE_TRY_ENV);
+                              event_type + 1
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -101,15 +101,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier any_source_supplier;
 
       any_source_supplier.activate (consumer_admin.in (),
-                                    milliseconds,
-                                    ACE_TRY_ENV);
+                                    milliseconds
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any_source_supplier.connect (supplier_admin.in (),
                                    0,
                                    event_type,
                                    event_source,
-                                   event_type,
-                                   ACE_TRY_ENV);
+                                   event_type
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -117,15 +117,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier any_type_supplier;
 
       any_type_supplier.activate (consumer_admin.in (),
-                                  milliseconds,
-                                  ACE_TRY_ENV);
+                                  milliseconds
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any_type_supplier.connect (supplier_admin.in (),
                                  event_source,
                                  0,
                                  event_source,
-                                 event_type,
-                                 ACE_TRY_ENV);
+                                 event_type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -133,15 +133,15 @@ main (int argc, char* argv[])
       EC_Counting_Supplier wildcard_supplier;
 
       wildcard_supplier.activate (consumer_admin.in (),
-                                  milliseconds,
-                                  ACE_TRY_ENV);
+                                  milliseconds
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       wildcard_supplier.connect (supplier_admin.in (),
                                  0,
                                  0,
                                  event_source,
-                                 event_type,
-                                 ACE_TRY_ENV);
+                                 event_type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -157,8 +157,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, event_type, 0);
 
         regular_consumer.connect (consumer_admin.in (),
-                                  consumer_qos.get_ConsumerQOS (),
-                                  ACE_TRY_ENV);
+                                  consumer_qos.get_ConsumerQOS ()
+                                  TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -175,8 +175,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (event_source, 0, 0);
 
         any_type_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS (),
-                                   ACE_TRY_ENV);
+                                   consumer_qos.get_ConsumerQOS ()
+                                   TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -193,8 +193,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (0, event_type, 0);
 
         any_source_consumer.connect (consumer_admin.in (),
-                                     consumer_qos.get_ConsumerQOS (),
-                                     ACE_TRY_ENV);
+                                     consumer_qos.get_ConsumerQOS ()
+                                     TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -211,8 +211,8 @@ main (int argc, char* argv[])
         consumer_qos.insert (0, 0, 0);
 
         wildcard_consumer.connect (consumer_admin.in (),
-                                   consumer_qos.get_ConsumerQOS (),
-                                   ACE_TRY_ENV);
+                                   consumer_qos.get_ConsumerQOS ()
+                                   TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -225,52 +225,52 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      wildcard_consumer.disconnect (ACE_TRY_ENV);
+      wildcard_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_source_consumer.disconnect (ACE_TRY_ENV);
+      any_source_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_type_consumer.disconnect (ACE_TRY_ENV);
+      any_type_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      regular_consumer.disconnect (ACE_TRY_ENV);
+      regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      wildcard_supplier.deactivate (ACE_TRY_ENV);
+      wildcard_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      wildcard_supplier.disconnect (ACE_TRY_ENV);
+      wildcard_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_type_supplier.deactivate (ACE_TRY_ENV);
+      any_type_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_source_supplier.deactivate (ACE_TRY_ENV);
+      any_source_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      any_source_supplier.disconnect (ACE_TRY_ENV);
+      any_source_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      other_supplier.deactivate (ACE_TRY_ENV);
+      other_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      other_supplier.disconnect (ACE_TRY_ENV);
+      other_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier.deactivate (ACE_TRY_ENV);
+      supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier.disconnect (ACE_TRY_ENV);
+      supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (ACE_TRY_ENV);
+      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 351dcdbc917..a9f009ecf92 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -24,9 +24,9 @@ EC_Connect::EC_Connect (void)
 }
 
 void
-EC_Connect::execute_test (CORBA::Environment&)
+EC_Connect::execute_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
-  // this->EC_Driver::execute_test (ACE_TRY_ENV);
+  // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -108,13 +108,13 @@ EC_Connect::dump_results (void)
 void
 EC_Connect::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
+    int i
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_consumer (consumer_admin,
-                                     i,
-                                     ACE_TRY_ENV);
+                                     i
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->consumer_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -123,13 +123,13 @@ EC_Connect::connect_consumer (
 void
 EC_Connect::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
+    int i
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_supplier (supplier_admin,
-                                     i,
-                                     ACE_TRY_ENV);
+                                     i
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->supplier_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -148,23 +148,23 @@ EC_Connect::allocate_supplier (int i)
 }
 
 void
-EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->start_time_ = ACE_OS::gethrtime ();
   switch (this->order_)
     {
     default:
     case 0:
-      this->connect_consumers (ACE_TRY_ENV);
+      this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->connect_suppliers (ACE_TRY_ENV);
+      this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
     case 1:
-      this->connect_suppliers (ACE_TRY_ENV);
+      this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->connect_consumers (ACE_TRY_ENV);
+      this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
@@ -177,23 +177,23 @@ EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
+    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
+    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (int i = 0; i != max; ++i)
     {
       if (i < this->n_consumers_)
         {
-          this->connect_consumer (consumer_admin.in (), i, ACE_TRY_ENV);
+          this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       if (i < this->n_suppliers_)
         {
-          this->connect_supplier (supplier_admin.in (), i, ACE_TRY_ENV);
+          this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -201,22 +201,22 @@ EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
 {
   switch (this->order_)
     {
     default:
     case 0:
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
     case 1:
-      this->disconnect_consumers (ACE_TRY_ENV);
+      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->disconnect_suppliers (ACE_TRY_ENV);
+      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
@@ -229,11 +229,11 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
+    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
+    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
@@ -243,7 +243,7 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+          this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -254,7 +254,7 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->consumers_[i]->disconnect (ACE_TRY_ENV);
+          this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -268,14 +268,14 @@ EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
+      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -290,14 +290,14 @@ EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Connect::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+EC_Connect::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -323,25 +323,25 @@ void
 ECC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   this->EC_Consumer::connect (consumer_admin,
                               qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 void
 ECC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Consumer::connect (qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
@@ -365,25 +365,25 @@ void
 ECC_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   this->EC_Supplier::connect (supplier_admin,
                               qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 void
 ECC_Supplier::connect (
     const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Supplier::connect (qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
+                              shutdown_event_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index 1b58133482e..5d09185b9ae 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -51,27 +51,27 @@ public:
   virtual void print_usage (void);
   virtual void print_args (void) const;
 
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
+  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   virtual void dump_results (void);
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
+    int i
+    TAO_ENV_ARG_DECL);
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnect_consumers (CORBA::Environment& env);
-  virtual void disconnect_suppliers (CORBA::Environment& env);
+    int i
+    TAO_ENV_ARG_DECL);
+  virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
 
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
-  virtual void connect_clients (CORBA::Environment&);
-  virtual void disconnect_clients (CORBA::Environment&);
+  virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   ACE_hrtime_t start_time_;
@@ -94,12 +94,12 @@ public:
   virtual void connect (
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
@@ -117,12 +117,12 @@ public:
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type,
-        CORBA::Environment& ACE_TRY_ENV);
+        int shutdown_event_type
+        TAO_ENV_ARG_DECL);
   virtual void connect (
       const RtecEventChannelAdmin::SupplierQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index cb9d8629241..8d01cace479 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -54,10 +54,10 @@ EC_Inversion::parse_args (int &argc, char *argv [])
 }
 
 void
-EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
+EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
+    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos0;
@@ -67,8 +67,8 @@ EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
 
   this->consumers_[0]->connect (consumer_admin.in (),
                                 qos0.get_ConsumerQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1,
-                                ACE_TRY_ENV);
+                                ACE_ES_EVENT_UNDEFINED + 1
+                                TAO_ENV_ARG_PARAMETER);
 
   for (int i = 1; i < this->n_consumers_; ++i)
     {
@@ -83,18 +83,18 @@ EC_Inversion::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
 
       this->consumers_[i]->connect (consumer_admin.in (),
                                     qos1.get_ConsumerQOS (),
-                                    base_event + 1,
-                                    ACE_TRY_ENV);
+                                    base_event + 1
+                                    TAO_ENV_ARG_PARAMETER);
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n"));
 }
 
 void
-EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
+    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_SupplierQOS_Factory qos0;
@@ -103,8 +103,8 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 
   this->suppliers_[0]->connect (supplier_admin.in (),
                                 qos0.get_SupplierQOS (),
-                                ACE_ES_EVENT_UNDEFINED + 1,
-                                ACE_TRY_ENV);
+                                ACE_ES_EVENT_UNDEFINED + 1
+                                TAO_ENV_ARG_PARAMETER);
 
   for (int j = 1; j != this->n_suppliers_; ++j)
     {
@@ -118,8 +118,8 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 
       this->suppliers_[j]->connect (supplier_admin.in (),
                                     qos1.get_SupplierQOS (),
-                                    base_event + 1,
-                                    ACE_TRY_ENV);
+                                    base_event + 1
+                                    TAO_ENV_ARG_PARAMETER);
     }
 
   if (this->verbose ())
@@ -127,7 +127,7 @@ EC_Inversion::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Inversion::activate_tasks (CORBA::Environment &)
+EC_Inversion::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   int priority;
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 2a8bd9f6e2e..9cafab8e20e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -49,18 +49,18 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -70,12 +70,12 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       ACE_DEBUG ((LM_DEBUG,
@@ -84,7 +84,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -93,14 +93,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -108,12 +108,12 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ec_ior, ACE_TRY_ENV);
+        orb->string_to_object (ec_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (ec.in ()))
         {
@@ -135,15 +135,15 @@ main (int argc, char *argv [])
       // Connect the consumer
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        ec->for_consumers (ACE_TRY_ENV);
+        ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var consumer_reference =
-        consumer._this (ACE_TRY_ENV);
+        consumer._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple subscription, but usually the helper classes in
@@ -161,8 +161,8 @@ main (int argc, char *argv [])
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
       proxy_supplier->connect_push_consumer (consumer_reference.in (),
-                                             consumer_qos,
-                                             ACE_TRY_ENV);
+                                             consumer_qos
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer\n"));
@@ -172,15 +172,15 @@ main (int argc, char *argv [])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        ec->for_suppliers (ACE_TRY_ENV);
+        ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var supplier_reference =
-        supplier._this (ACE_TRY_ENV);
+        supplier._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple publication, but usually the helper classes in
@@ -193,8 +193,8 @@ main (int argc, char *argv [])
       sh0.source = 1;                      // first free event source
 
       proxy_consumer->connect_push_supplier (supplier_reference.in (),
-                                             supplier_qos,
-                                             ACE_TRY_ENV);
+                                             supplier_qos
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected supplier\n"));
@@ -207,7 +207,7 @@ main (int argc, char *argv [])
       while (!task.done () || !consumer.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -238,24 +238,24 @@ main (int argc, char *argv [])
 
       ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput));
 
-      proxy_supplier->disconnect_push_supplier (ACE_TRY_ENV);
+      proxy_supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      proxy_consumer->disconnect_push_consumer (ACE_TRY_ENV);
+      proxy_consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id;
 
-      id = root_poa->servant_to_id (&consumer, ACE_TRY_ENV);
+      id = root_poa->servant_to_id (&consumer TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      id = root_poa->servant_to_id (&supplier, ACE_TRY_ENV);
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      id = root_poa->servant_to_id (&supplier TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -282,19 +282,19 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'k':
-	ec_ior = get_opts.optarg;
-	break;
+        ec_ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-i <iterations>"
-			   "-k <IOR>"
+                           "-i <iterations>"
+                           "-k <IOR>"
                            "\n",
                            argv [0]),
                           -1);
@@ -322,8 +322,8 @@ EC_Latency_Consumer::done (void)
 }
 
 void
-EC_Latency_Consumer::push (const RtecEventComm::EventSet& events,
-                           CORBA::Environment &)
+EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
+                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t creation;
@@ -343,7 +343,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-EC_Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
+EC_Latency_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -355,7 +355,7 @@ EC_Latency_Supplier::EC_Latency_Supplier (void)
 }
 
 void
-EC_Latency_Supplier::disconnect_push_supplier (CORBA::Environment &)
+EC_Latency_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -393,7 +393,7 @@ Task::svc (void)
           ACE_hrtime_t creation = ACE_OS::gethrtime ();
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
-          this->consumer_->push (event, ACE_TRY_ENV);
+          this->consumer_->push (event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_Time_Value tv (0, 5000);
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index e0aa6fa32f1..4d9b2287736 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -38,11 +38,11 @@ public:
 
   /// Return 1 when all the messages have been received
   int done (void);
-  
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &)
+
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -64,7 +64,7 @@ public:
   /// Constructor
   EC_Latency_Supplier (void);
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 3cf2c2335e5..ce6a4225dc5 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -48,18 +48,18 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -69,12 +69,12 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       ACE_DEBUG ((LM_DEBUG,
@@ -83,7 +83,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -92,14 +92,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -108,38 +108,38 @@ main (int argc, char *argv [])
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
                                             root_poa.in ());
       TAO_EC_Event_Channel ec_impl (attr);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in (), ACE_TRY_ENV);
+        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file_name != 0)
         {
-	  FILE *output_file= ACE_OS::fopen (ior_file_name, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_file_name),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", str.in ());
-	  ACE_OS::fclose (output_file);
+          FILE *output_file= ACE_OS::fopen (ior_file_name, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_file_name),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", str.in ());
+          ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&ec_impl, ACE_TRY_ENV);
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+        root_poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -162,14 +162,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_file_name = get_opts.optarg;
-	break;
+        ior_file_name = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <ior_file_name>"
+                           "-o <ior_file_name>"
                            "\n",
                            argv [0]),
                           -1);
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index 3bd8493fa84..c8fdfc9a2f5 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -22,21 +22,21 @@ void
 EC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect (qos, shutdown_event_type, ACE_TRY_ENV);
+  this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int shutdown_event_type
+    TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return; // @@ Throw?
@@ -45,14 +45,14 @@ EC_Consumer::connect (
 
   if (CORBA::is_nil (this->myself_.in ()))
     {
-      this->myself_ = this->_this (ACE_TRY_ENV);
+      this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   this->is_active_ = 1;
 
   this->supplier_proxy_->connect_push_consumer (this->myself_.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
+                                                qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -63,12 +63,12 @@ EC_Consumer::connected (void) const
 }
 
 void
-EC_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -76,19 +76,19 @@ EC_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Consumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+EC_Consumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!this->is_active_)
     return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->myself_ = RtecEventComm::PushConsumer::_nil ();
   this->is_active_ = 0;
@@ -108,11 +108,11 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const
 }
 
 void
-EC_Consumer::push (const RtecEventComm::EventSet& events,
-                   CORBA::Environment &ACE_TRY_ENV)
+EC_Consumer::push (const RtecEventComm::EventSet& events
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_push (this->cookie_, events, ACE_TRY_ENV);
+  this->driver_->consumer_push (this->cookie_, events TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (events.length () == 0)
@@ -149,16 +149,16 @@ EC_Consumer::push (const RtecEventComm::EventSet& events,
                                 now - creation);
 
       if (e.header.type == this->shutdown_event_type_)
-        this->driver_->consumer_shutdown (this->cookie_, ACE_TRY_ENV);
+        this->driver_->consumer_shutdown (this->cookie_ TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-EC_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+EC_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_disconnect (this->cookie_, ACE_TRY_ENV);
+  this->driver_->consumer_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index ddc4dc35ed9..8aaaed1d37f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -47,15 +47,15 @@ public:
   virtual void connect (
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   // The driver program can build the QoS attributes and obtain the
   // ConsumerAdmin, we do the rest.
 
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
+      int shutdown_event_type
+      TAO_ENV_ARG_DECL);
   // The driver program can build the QoS attributes and we use
   // whatevet supplier_proxy we already have (useful for reconnection
   // tests).
@@ -63,11 +63,11 @@ public:
   virtual int connected (void) const;
   // returns 0 if it is not connected
 
-  void disconnect (CORBA::Environment& ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // The application can invoke this method to disconnect from the EC
   // and deactivate this class.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // The application is shutting down, deactivate the consumer.
 
   void accumulate (ACE_Throughput_Stats& throughput) const;
@@ -79,10 +79,10 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index 8fabe810acc..cfb93e722cf 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -13,51 +13,51 @@ EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
 
 void
 EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                   const RtecEventChannelAdmin::ConsumerQOS &qos,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   const RtecEventChannelAdmin::ConsumerQOS &qos
+                   TAO_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
+                                                qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Counting_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+EC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+      this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       this->supplier_proxy_ =
         RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
     }
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-EC_Counting_Consumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+EC_Counting_Consumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this, ACE_TRY_ENV);
+    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV);
+  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -83,8 +83,8 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-EC_Counting_Consumer::push (const RtecEventComm::EventSet& events,
-                CORBA::Environment &)
+EC_Counting_Consumer::push (const RtecEventComm::EventSet& events
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -107,7 +107,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events,
 }
 
 void
-EC_Counting_Consumer::disconnect_push_consumer (CORBA::Environment &)
+EC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index a10262d44f6..1a87e648171 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -39,10 +39,10 @@ public:
   // Constructor
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                const RtecEventChannelAdmin::ConsumerQOS &qos,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+                const RtecEventChannelAdmin::ConsumerQOS &qos
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
@@ -51,10 +51,10 @@ public:
 
   // = The RtecEventComm::PushConsumer methods
 
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env)
+  virtual void push (const RtecEventComm::EventSet& events
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 9642015c566..696cf024273 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -16,15 +16,15 @@ EC_Counting_Supplier::EC_Counting_Supplier (void)
 
 void
 EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                    int milliseconds,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    int milliseconds
+                    TAO_ENV_ARG_DECL)
 {
   RtecEventComm::PushConsumer_var consumer =
-    this->consumer_adapter_._this (ACE_TRY_ENV);
+    this->consumer_adapter_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
+    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Let's say that the execution time for event 2 is 1
@@ -40,24 +40,24 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
                             0);
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
-                                                consumer_qos.get_ConsumerQOS (),
-                                                ACE_TRY_ENV);
+                                                consumer_qos.get_ConsumerQOS ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Counting_Supplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+EC_Counting_Supplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var consumer_poa =
-    this->consumer_adapter_._default_POA (ACE_TRY_ENV);
+    this->consumer_adapter_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (&this->consumer_adapter_, ACE_TRY_ENV);
+    consumer_poa->servant_to_id (&this->consumer_adapter_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in (), ACE_TRY_ENV);
+  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -67,8 +67,8 @@ EC_Counting_Supplier::connect (
     int published_source,
     int published_type,
     int event_source,
-    int event_type,
-    CORBA::Environment &ACE_TRY_ENV)
+    int event_type
+    TAO_ENV_ARG_DECL)
 {
   this->event_source_ = event_source;
   this->event_type_ = event_type;
@@ -78,49 +78,49 @@ EC_Counting_Supplier::connect (
                        published_type,
                        0, 1);
   this->connect (supplier_admin,
-                 supplier_qos.get_SupplierQOS (),
-                 ACE_TRY_ENV);
+                 supplier_qos.get_SupplierQOS ()
+                 TAO_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Counting_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    const RtecEventChannelAdmin::SupplierQOS &qos,
-    CORBA::Environment &ACE_TRY_ENV)
+    const RtecEventChannelAdmin::SupplierQOS &qos
+    TAO_ENV_ARG_DECL)
 {
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->consumer_proxy_->connect_push_supplier (supplier.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
+                                                qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+EC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+      this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this, ACE_TRY_ENV);
+    supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV);
+  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -128,8 +128,8 @@ EC_Counting_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Counting_Supplier::push (const RtecEventComm::EventSet&,
-                CORBA::Environment &ACE_TRY_ENV)
+EC_Counting_Supplier::push (const RtecEventComm::EventSet&
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -141,19 +141,19 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&,
   event[0].header.type = this->event_type_;
   event[0].header.ttl = 1;
 
-  this->consumer_proxy_->push (event, ACE_TRY_ENV);
+  this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->event_count++;
 }
 
 void
-EC_Counting_Supplier::disconnect_push_consumer (CORBA::Environment &)
+EC_Counting_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-EC_Counting_Supplier::disconnect_push_supplier (CORBA::Environment &)
+EC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -176,7 +176,7 @@ EC_Counting_Supplier_Task::svc ()
 {
   ACE_TRY_NEW_ENV
     {
-      this->run (ACE_TRY_ENV);
+      this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -201,13 +201,13 @@ EC_Counting_Supplier_Task::push_count (void)
 }
 
 void
-EC_Counting_Supplier_Task::run (CORBA::Environment &ACE_TRY_ENV)
+EC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->event_.length (1);
 
   int stop = 0;
   do {
-    this->supplier_->push (this->event_, ACE_TRY_ENV);
+    this->supplier_->push (this->event_ TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     // Sleep for a short time to avoid spinning...
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index ece73ce4db2..813994c5fc0 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -42,9 +42,9 @@ public:
   // = The RtecEventComm::PushSupplier methods
 
   void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-                 int period,
-                 CORBA::Environment &ACE_TRY_ENV);
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+                 int period
+                 TAO_ENV_ARG_DECL);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Connect as a consumer to receive a TIMEOUT every <period>
   // milliseconds.
   // The class pushes an event (in its supplier role) every time it
@@ -54,22 +54,22 @@ public:
                 int published_source,
                 int published_type,
                 int event_source,
-                int event_type,
-                CORBA::Environment &ACE_TRY_ENV);
+                int event_type
+                TAO_ENV_ARG_DECL);
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                const RtecEventChannelAdmin::SupplierQOS &qos,
-                CORBA::Environment &ACE_TRY_ENV);
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+                const RtecEventChannelAdmin::SupplierQOS &qos
+                TAO_ENV_ARG_DECL);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
-  void push (const RtecEventComm::EventSet& events,
-             CORBA::Environment &_env)
+  void push (const RtecEventComm::EventSet& events
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (CORBA::Environment &)
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The Consumer side methods.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -108,7 +108,7 @@ public:
   void stop (void);
   CORBA::ULong push_count (void);
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 06644290629..ee0fcaab316 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -67,15 +67,15 @@ EC_Driver::run (int argc, char* argv[])
       // test.
       ACE_High_Res_Timer::calibrate ();
 
-      this->run_init (argc, argv, ACE_TRY_ENV);
+      this->run_init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->execute_test (ACE_TRY_ENV);
+      this->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->dump_results ();
 
-      this->run_cleanup (ACE_TRY_ENV);
+      this->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -91,10 +91,10 @@ EC_Driver::run (int argc, char* argv[])
 }
 
 void
-EC_Driver::run_init (int &argc, char* argv[],
-                     CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::run_init (int &argc, char* argv[]
+                     TAO_ENV_ARG_DECL)
 {
-  this->initialize_orb_and_poa (argc, argv, ACE_TRY_ENV);
+  this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->parse_args (argc, argv))
@@ -119,7 +119,7 @@ EC_Driver::run_init (int &argc, char* argv[],
     ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
                                 CORBA::COMPLETED_NO));
 
-  this->initialize_ec_impl (ACE_TRY_ENV);
+  this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allocate_consumers () == -1)
@@ -130,26 +130,26 @@ EC_Driver::run_init (int &argc, char* argv[],
     ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                  CORBA::COMPLETED_NO));
 
-  this->connect_clients (ACE_TRY_ENV);
+  this->connect_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::run_cleanup (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::run_cleanup (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect_clients (ACE_TRY_ENV);
+  this->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_clients (ACE_TRY_ENV);
+  this->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->destroy_ec (ACE_TRY_ENV);
+  this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n"));
 
-  this->deactivate_ec (ACE_TRY_ENV);
+  this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -160,25 +160,25 @@ EC_Driver::run_cleanup (CORBA::Environment &ACE_TRY_ENV)
   this->cleanup_consumers ();
   this->cleanup_ec ();
 
-  this->root_poa_->destroy (0, 0, ACE_TRY_ENV);
+  this->root_poa_->destroy (0, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->root_poa_ = PortableServer::POA::_nil ();
 
-  this->orb_->destroy (ACE_TRY_ENV);
+  this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->orb_ = CORBA::ORB::_nil ();
 }
 
 void
-EC_Driver::initialize_orb_and_poa (int &argc, char* argv[],
-                                   CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
+                                   TAO_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+    CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object.in ()))
@@ -189,14 +189,14 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[],
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   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;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -272,12 +272,12 @@ EC_Driver::move_to_rt_class (void)
 }
 
 void
-EC_Driver::initialize_ec_impl (CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL)
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
     {
-      this->obtain_remote_ec (ACE_TRY_ENV);
+      this->obtain_remote_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
@@ -286,21 +286,21 @@ EC_Driver::initialize_ec_impl (CORBA::Environment& ACE_TRY_ENV)
 #if !defined(EC_DISABLE_OLD_EC)
   if (this->use_old_ec_ == 1)
     {
-      this->initialize_old_ec (ACE_TRY_ENV);
+      this->initialize_old_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
 #endif
 
-  this->initialize_new_ec (ACE_TRY_ENV);
+  this->initialize_new_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if !defined(EC_DISABLE_REMOTE_EC)
 void
-EC_Driver::obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (ACE_TRY_ENV);
+    this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNaming::Name channel_name (1);
@@ -308,19 +308,19 @@ EC_Driver::obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV)
   channel_name[0].id = CORBA::string_dup (this->event_service_name_);
 
   CORBA::Object_var tmp =
-    naming_context->resolve (channel_name, ACE_TRY_ENV);
+    naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in (), ACE_TRY_ENV);
+    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::get_naming_context (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   if (CORBA::is_nil (naming_obj.in ()))
@@ -328,16 +328,16 @@ EC_Driver::get_naming_context (CORBA::Environment &ACE_TRY_ENV)
                 "EC_Driver (%P|%t) Unable to obtain the "
                 "Naming Service.\n"));
 
-  return CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+  return CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
 }
 #endif
 
 #if !defined(EC_DISABLE_OLD_EC)
 int
-EC_Driver::initialize_old_ec (CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (ACE_TRY_ENV);
+    this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // This is the name we (potentially) register the Scheduling
@@ -358,11 +358,11 @@ EC_Driver::initialize_old_ec (CORBA::Environment& ACE_TRY_ENV)
 
 
   this->scheduler_ =
-    this->scheduler_impl_._this (ACE_TRY_ENV);
+    this->scheduler_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str =
-    this->orb_->object_to_string (scheduler.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_DEBUG ((LM_DEBUG,
               "EC_Driver (%P|%t) The (local) scheduler IOR is <%s>\n",
@@ -385,13 +385,13 @@ EC_Driver::initialize_old_ec (CORBA::Environment& ACE_TRY_ENV)
                   -1);
 
   this->event_channel_ =
-    this->ec_impl_->_this (ACE_TRY_ENV);
+    this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 }
 #endif /* */
 
 void
-EC_Driver::initialize_new_ec (CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
                                         this->root_poa_.in ());
@@ -401,16 +401,16 @@ EC_Driver::initialize_new_ec (CORBA::Environment& ACE_TRY_ENV)
     new TAO_EC_Event_Channel (attr);
   this->ec_impl_ = ec;
 
-  ec->activate (ACE_TRY_ENV);
+  ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_channel_ =
-    this->ec_impl_->_this (ACE_TRY_ENV);
+    this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL)
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
@@ -420,12 +420,12 @@ EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV)
   {
     // Deactivate the EC
     PortableServer::POA_var poa =
-      this->ec_impl_->_default_POA (ACE_TRY_ENV);
+      this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (this->ec_impl_, ACE_TRY_ENV);
+      poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
+    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -437,12 +437,12 @@ EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV)
     {
       // Deactivate the Scheduler
       PortableServer::POA_var poa =
-        scheduler_impl._default_POA (ACE_TRY_ENV);
+        scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&scheduler_impl, ACE_TRY_ENV);
+        poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->verbose ())
@@ -452,9 +452,9 @@ EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-EC_Driver::destroy_ec (CORBA::Environment& ACE_TRY_ENV)
+EC_Driver::destroy_ec (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->event_channel_->destroy (ACE_TRY_ENV);
+  this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -497,45 +497,45 @@ EC_Driver::allocate_supplier (int i)
 }
 
 void
-EC_Driver::connect_clients (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::connect_clients (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->connect_consumers (ACE_TRY_ENV);
+  this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect_suppliers (ACE_TRY_ENV);
+  this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect_suppliers (ACE_TRY_ENV);
+  this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->disconnect_consumers (ACE_TRY_ENV);
+  this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::shutdown_clients (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::shutdown_clients (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown_suppliers (ACE_TRY_ENV);
+  this->shutdown_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_consumers (ACE_TRY_ENV);
+  this->shutdown_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::connect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
+    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->connect_consumer (consumer_admin.in (), i, ACE_TRY_ENV);
+      this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -545,26 +545,26 @@ EC_Driver::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
 void
 EC_Driver::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
+    int i
+    TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (i, qos, shutdown_event_type, ACE_TRY_ENV);
+  this->build_consumer_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumers_[i]->connect (consumer_admin,
                                 qos,
-                                shutdown_event_type,
-                                ACE_TRY_ENV);
+                                shutdown_event_type
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Driver::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type,
-  CORBA::Environment&)
+  int& shutdown_event_type
+  TAO_ENV_ARG_DECL_NOT_USED)
 {
   RtecBase::handle_t rt_info = 0;
 
@@ -585,15 +585,15 @@ EC_Driver::build_consumer_qos (
 }
 
 void
-EC_Driver::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
+    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->connect_supplier (supplier_admin.in (), i, ACE_TRY_ENV);
+      this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -604,26 +604,26 @@ EC_Driver::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 void
 EC_Driver::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
+    int i
+    TAO_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (i, qos, shutdown_event_type, ACE_TRY_ENV);
+  this->build_supplier_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->suppliers_[i]->connect (supplier_admin,
                                 qos,
-                                shutdown_event_type,
-                                ACE_TRY_ENV);
+                                shutdown_event_type
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Driver::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&)
+      int& shutdown_event_type
+      TAO_ENV_ARG_DECL_NOT_USED)
 {
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
   int supplier_id = i + 1;
@@ -645,12 +645,12 @@ EC_Driver::build_supplier_qos (
 }
 
 void
-EC_Driver::execute_test (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (ACE_TRY_ENV);
+  this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -697,7 +697,7 @@ EC_Driver::allocate_task (int i)
 }
 
 void
-EC_Driver::activate_tasks (CORBA::Environment &)
+EC_Driver::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -723,13 +723,13 @@ EC_Driver::activate_tasks (CORBA::Environment &)
 }
 
 void
-EC_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->suppliers_ == 0)
     return;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
+      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -737,13 +737,13 @@ EC_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->consumers_ == 0)
     return;
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
+      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -751,13 +751,13 @@ EC_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Driver::shutdown_suppliers (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->suppliers_ == 0)
     return;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->shutdown (ACE_TRY_ENV);
+      this->suppliers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -765,13 +765,13 @@ EC_Driver::shutdown_suppliers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Driver::shutdown_consumers (CORBA::Environment &ACE_TRY_ENV)
+EC_Driver::shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->consumers_ == 0)
     return;
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->shutdown (ACE_TRY_ENV);
+      this->consumers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -1122,25 +1122,25 @@ EC_Driver::decode_supplier_cookie (void* cookie) const
 
 void
 EC_Driver::consumer_push (void*,
-                          const RtecEventComm::EventSet&,
-                          CORBA::Environment&)
+                          const RtecEventComm::EventSet&
+                          TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-EC_Driver::consumer_shutdown (void*,
-                              CORBA::Environment&)
+EC_Driver::consumer_shutdown (void*
+                              TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-EC_Driver::consumer_disconnect (void*,
-                                CORBA::Environment&)
+EC_Driver::consumer_disconnect (void*
+                                TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-EC_Driver::supplier_disconnect (void*,
-                                CORBA::Environment&)
+EC_Driver::supplier_disconnect (void*
+                                TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 9903856dfe6..3f94e1f799f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -64,15 +64,15 @@ public:
   virtual int run (int argc, char* argv[]);
   // Execute the test.
 
-  virtual void run_init (int& argc, char* argv[],
-                         CORBA::Environment& ACE_TRY_ENV);
+  virtual void run_init (int& argc, char* argv[]
+                         TAO_ENV_ARG_DECL);
   // The initialization section
 
-  virtual void run_cleanup (CORBA::Environment& ACE_TRY_ENV);
+  virtual void run_cleanup (TAO_ENV_SINGLE_ARG_DECL);
   // The cleanup section
 
-  virtual void initialize_orb_and_poa (int& argc, char* argv[],
-                                       CORBA::Environment& env);
+  virtual void initialize_orb_and_poa (int& argc, char* argv[]
+                                       TAO_ENV_ARG_DECL);
   // Initialize the ORB and obtain the RootPOA object
 
   virtual int parse_args (int& argc, char* argv[]);
@@ -87,57 +87,57 @@ public:
   virtual int move_to_rt_class (void);
   // Run the test in the real-time class, return -1 on error.
 
-  virtual void initialize_ec_impl (CORBA::Environment& env);
+  virtual void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL);
   // Construct the EC and its helper objects, also activates the EC in
   // the RootPOA.
 
-  virtual void connect_clients (CORBA::Environment& env);
+  virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL);
   // By default connect the consumers and then the suppliers, other
   // orders should work too.
 
-  virtual void disconnect_clients (CORBA::Environment &env);
+  virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL);
   // By default disconnect the suppliers and then the consumers, other
   // orders should work too.
 
-  virtual void shutdown_clients (CORBA::Environment &env);
+  virtual void shutdown_clients (TAO_ENV_SINGLE_ARG_DECL);
   // By default deactivate the suppliers and then the consumers, other
   // orders should work too.
 
-  virtual void connect_consumers (CORBA::Environment& env);
+  virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect all the consumers, by default it lets each consumer
   // connect itself.
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
+    int i
+    TAO_ENV_ARG_DECL);
   // Connect consumer number <i> using the consumer_admin provided.
 
   virtual void build_consumer_qos (
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
+      int& shutdown_event_type
+      TAO_ENV_ARG_DECL_NOT_USED);
   // Build the QoS requirements for consumer <i>
 
-  virtual void connect_suppliers (CORBA::Environment& env);
+  virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Connect all the suppliers, by default it lets each supplier
   // connect itself.
 
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
+    int i
+    TAO_ENV_ARG_DECL);
   // Connect supplier number <i> using the supplier_admin provided.
 
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
+      int& shutdown_event_type
+      TAO_ENV_ARG_DECL_NOT_USED);
   // Build the QoS requirements for supplier <i>
 
-  virtual void execute_test (CORBA::Environment &env);
+  virtual void execute_test (TAO_ENV_SINGLE_ARG_DECL);
   // Execute the test, by default simply call activate_suppliers()
 
   virtual void dump_results (void);
@@ -145,22 +145,22 @@ public:
   // and consumers, collect the latency and throughput results for
   // each and print the totals too.
 
-  virtual void disconnect_consumers (CORBA::Environment& env);
+  virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect all the consumers.
 
-  virtual void disconnect_suppliers (CORBA::Environment& env);
+  virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect all the suppliers.
 
-  virtual void shutdown_consumers (CORBA::Environment& env);
+  virtual void shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivate all the consumers.
 
-  virtual void shutdown_suppliers (CORBA::Environment& env);
+  virtual void shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivate all the suppliers.
 
-  virtual void destroy_ec (CORBA::Environment& env);
+  virtual void destroy_ec (TAO_ENV_SINGLE_ARG_DECL);
   // Call EC->destroy
 
-  virtual void deactivate_ec (CORBA::Environment& env);
+  virtual void deactivate_ec (TAO_ENV_SINGLE_ARG_DECL);
   // De-activate the EC (and its helper classes).
 
   virtual void cleanup_ec (void);
@@ -179,36 +179,36 @@ public:
   // Returns the index of the supplier for <cookie>
 
   virtual void consumer_push (void* consumer_cookie,
-                              const RtecEventComm::EventSet& event,
-                              CORBA::Environment& ACE_TRY_ENV);
+                              const RtecEventComm::EventSet& event
+                              TAO_ENV_ARG_DECL);
   // One of the consumers in the test has received an event
 
-  virtual void consumer_shutdown (void* consumer_cookie,
-                                  CORBA::Environment& ACE_TRY_ENV);
+  virtual void consumer_shutdown (void* consumer_cookie
+                                  TAO_ENV_ARG_DECL);
   // One of the consumers has received a shutdown event
 
-  virtual void consumer_disconnect (void* consumer_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
+  virtual void consumer_disconnect (void* consumer_cookie
+                                    TAO_ENV_ARG_DECL);
   // One of the consumers in the test has been disconnected from the EC
 
-  virtual void supplier_disconnect (void* supplier_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
+  virtual void supplier_disconnect (void* supplier_cookie
+                                    TAO_ENV_ARG_DECL);
   // One of the suppliers in the test has been disconnected from the EC
 
 #if !defined(EC_DISABLE_REMOTE_EC)
-  virtual void obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV);
+  virtual void obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL);
   // Obtain the EC from the Naming service
 
   virtual CosNaming::NamingContext_ptr
-       get_naming_context (CORBA::Environment &ACE_TRY_ENV);
+       get_naming_context (TAO_ENV_SINGLE_ARG_DECL);
 #endif
 
 #if !defined(EC_DISABLE_OLD_EC)
-  virtual void initialize_old_ec (CORBA::Environment& ACE_TRY_ENV);
+  virtual void initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize the EC using the old implementation
 #endif
 
-  virtual void initialize_new_ec (CORBA::Environment& ACE_TRY_ENV);
+  virtual void initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize the EC using the old implementation
 
   virtual int allocate_consumers (void);
@@ -223,7 +223,7 @@ public:
   virtual ACE_Task_Base* allocate_task (int i);
   // Allocate one task for supplier number <i>
 
-  virtual void activate_tasks (CORBA::Environment& env);
+  virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL);
   // Activate all the tasks, by default runs each supplier on its
   // own thread.
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 0de3b668b5d..dc58d8ffe24 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -23,8 +23,8 @@ EC_Supplier::EC_Supplier (EC_Driver *driver,
 }
 
 void
-EC_Supplier::send_event (int event_number,
-                         CORBA::Environment &ACE_TRY_ENV)
+EC_Supplier::send_event (int event_number
+                         TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -45,12 +45,12 @@ EC_Supplier::send_event (int event_number,
 
   this->event_type (event_number, event[0]);
 
-  this->send_event (event, ACE_TRY_ENV);
+  this->send_event (event TAO_ENV_ARG_PARAMETER);
 }
 
 void
-EC_Supplier::send_event (const RtecEventComm::EventSet& event,
-                         CORBA::Environment &ACE_TRY_ENV)
+EC_Supplier::send_event (const RtecEventComm::EventSet& event
+                         TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -69,7 +69,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event,
 
   ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-  this->consumer_proxy_->push (event, ACE_TRY_ENV);
+  this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -106,21 +106,21 @@ EC_Supplier::event_type (int event_number,
 void
 EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                       const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      int shutdown_event_type
+                      TAO_ENV_ARG_DECL)
 {
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
+    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect (qos, shutdown_event_type, ACE_TRY_ENV);
+  this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      int shutdown_event_type
+                      TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return; // @@ Throw?
@@ -130,24 +130,24 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
 
   if (CORBA::is_nil (this->myself_.in ()))
     {
-      this->myself_ = this->_this (ACE_TRY_ENV);
+      this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   this->is_active_ = 1;
 
   this->consumer_proxy_->connect_push_supplier (this->myself_.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
+                                                qos
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+EC_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -155,29 +155,29 @@ EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-EC_Supplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
+EC_Supplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!this->is_active_)
     return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->is_active_ = 0;
   this->myself_ = RtecEventComm::PushSupplier::_nil ();
 }
 
 void
-EC_Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+EC_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->supplier_disconnect (this->cookie_, ACE_TRY_ENV);
+  this->driver_->supplier_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -222,7 +222,7 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
 int
 EC_Supplier_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // Initialize a time value to pace the test
   ACE_Time_Value tv (0, this->burst_pause_);
@@ -252,7 +252,7 @@ EC_Supplier_Task::svc (void)
                                              now);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
-              this->supplier_->send_event (event, ACE_TRY_ENV);
+              this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
             }
@@ -276,7 +276,7 @@ EC_Supplier_Task::svc (void)
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      now);
-      this->supplier_->send_event (event, ACE_TRY_ENV);
+      this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SHUTDOWN);
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index d20ca80723c..d66ab89d90e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -53,40 +53,40 @@ public:
   // Notice that the user can connect to the EC using other
   // publications, this is useful for filtering tests.
 
-  void send_event (int event_number,
-                   CORBA::Environment& ACE_TRY_ENV);
+  void send_event (int event_number
+                   TAO_ENV_ARG_DECL);
   // The types of the event is chosen by the driver, based on the
   // cookie and the <event_number>
 
-  void send_event (const RtecEventComm::EventSet& event,
-                   CORBA::Environment& ACE_TRY_ENV);
+  void send_event (const RtecEventComm::EventSet& event
+                   TAO_ENV_ARG_DECL);
   // Send <event> to the EC.
 
   void send_event (int event_number,
                    const RtecEventComm::Event& event);
   // Set the event type and source in <event>
 
-  void send_shutdown (CORBA::Environment& ACE_TRY_ENV);
+  void send_shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Send a shutdown event.
 
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type,
-        CORBA::Environment& ACE_TRY_ENV);
+        int shutdown_event_type
+        TAO_ENV_ARG_DECL);
   // Connect using a <supplier_admin> and publications (<qos>)
   // computed by the user
 
   virtual void connect (
         const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type,
-        CORBA::Environment& ACE_TRY_ENV);
+        int shutdown_event_type
+        TAO_ENV_ARG_DECL);
   // Connect using the current consumer_proxy (useful for reconnect test)
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, also deactivates the object
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, also deactivates the object
 
   virtual void dump_results (const char* name,
@@ -101,7 +101,7 @@ public:
   // Return an event type to push....
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (CORBA::Environment &)
+  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index 75c27a3d6ac..da32b0c1dcc 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -93,7 +93,7 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                                  const char *my_name)
 {
   entry_point (my_name);
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // No scheduling for this test...
@@ -110,20 +110,20 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
       // = Connect as a consumer.
       this->consumer_admin_ =
-        channel_admin_->for_consumers (ACE_TRY_ENV);
+        channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var objref =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS (),
-                                               ACE_TRY_ENV);
+                                               dependencies.get_ConsumerQOS ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
@@ -144,36 +144,36 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 void
-Latency_Consumer::close (CORBA::Environment &ACE_TRY_ENV)
+Latency_Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) %s closing down.\n",
               this->entry_point ()));
 
-  this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
+Latency_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n"));
 }
 
 void
-Latency_Consumer::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &)
+Latency_Consumer::push (const RtecEventComm::EventSet &events
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Latency_Consumer:push - "));
@@ -354,10 +354,10 @@ Latency_Supplier::Supplier::Supplier (Latency_Supplier* impl)
 
 void
 Latency_Supplier::Supplier::disconnect_push_supplier (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->impl_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->impl_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
@@ -367,19 +367,19 @@ Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
 
 void
 Latency_Supplier::Consumer::disconnect_push_consumer (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->impl_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->impl_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 Latency_Supplier::Consumer::push (
-    const RtecEventComm::EventSet &events,
-    CORBA::Environment &ACE_TRY_ENV)
+    const RtecEventComm::EventSet &events
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->impl_->push (events, ACE_TRY_ENV);
+  this->impl_->push (events TAO_ENV_ARG_PARAMETER);
 }
 
 // ************************************************************
@@ -403,7 +403,7 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
 {
   this->entry_point (name);
   master_ = master;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->channel_admin_ =
@@ -421,20 +421,20 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
 
       // = Connect as a supplier.
       this->supplier_admin_ =
-        channel_admin_->for_suppliers (ACE_TRY_ENV);
+        channel_admin_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->consumers_ =
-        supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
+        supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var objref =
-        this->supplier_._this (ACE_TRY_ENV);
+        this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       consumers_->connect_push_supplier (objref.in (),
-                                         publications.get_SupplierQOS (),
-                                         ACE_TRY_ENV);
+                                         publications.get_SupplierQOS ()
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -448,53 +448,53 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 void
-Latency_Supplier::close (CORBA::Environment &ACE_TRY_ENV)
+Latency_Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) %s closing down.\n",
               this->entry_point ()));
 
-  this->suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumers_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumers_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
     PortableServer::POA_var poa =
-      this->supplier_._default_POA (ACE_TRY_ENV);
+      this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (&this->supplier_, ACE_TRY_ENV);
+      poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
+    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   {
     PortableServer::POA_var poa =
-      this->consumer_._default_POA (ACE_TRY_ENV);
+      this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (&this->consumer_, ACE_TRY_ENV);
+      poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
+    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 }
 
 void
-Latency_Supplier::disconnect_push_consumer (CORBA::Environment &)
+Latency_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Supplier-consumer received disconnect from channel.\n"));
 }
 
 void
-Latency_Supplier::disconnect_push_supplier (CORBA::Environment &)
+Latency_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, "Supplier received disconnect from channel.\n"));
 }
@@ -508,7 +508,7 @@ Latency_Supplier::start_generating_events (void)
                                          ACE_CU64_TO_CU32 (now) % 1000000000 /
                                            1000));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       ACE_Time_Value tv_timeout (0, timeout_interval * 1000);
@@ -534,19 +534,19 @@ Latency_Supplier::start_generating_events (void)
 
       // = Connect as a consumer.
       consumer_admin_ =
-        channel_admin_->for_consumers (ACE_TRY_ENV);
+        channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       suppliers_ =
-        consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
+        consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var objref =
-        this->consumer_._this (ACE_TRY_ENV);
+        this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->suppliers_->connect_push_consumer (objref.in (),
-                                               dependencies.get_ConsumerQOS (),
-                                               ACE_TRY_ENV);
+                                               dependencies.get_ConsumerQOS ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -561,8 +561,8 @@ Latency_Supplier::start_generating_events (void)
 }
 
 void
-Latency_Supplier::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &ACE_TRY_ENV)
+Latency_Supplier::push (const RtecEventComm::EventSet &events
+                        TAO_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "Latency_Supplier::push - "));
 
@@ -606,7 +606,7 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
                     {
                       // This constructor is fast.
                       const RtecEventComm::EventSet es (1, 1, &event);
-                      consumer [cons]->push (es, ACE_TRY_ENV);
+                      consumer [cons]->push (es TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
                     }
                 }
@@ -626,7 +626,7 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
                   RtecEventComm::EventSet events (1);
                   events.length (1);
                   events[0] = event;
-                  consumers_->push (events, ACE_TRY_ENV);
+                  consumers_->push (events TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   ACE_TIMEPROBE (EVENT_LATENCY_SUPPLIER_ENDS_PUSHING_EVENT);
@@ -682,7 +682,7 @@ Latency_Supplier::shutdown (void)
       return;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (master_)
@@ -696,7 +696,7 @@ Latency_Supplier::shutdown (void)
           RtecEventComm::EventSet events (1);
           events.length (1);
           events[0] = event;
-          consumers_->push (events, ACE_TRY_ENV);
+          consumers_->push (events TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -857,16 +857,16 @@ main (int argc, char *argv [])
 
   u_int i;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -875,18 +875,18 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -895,7 +895,7 @@ main (int argc, char *argv [])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (get_options (argc, argv))
@@ -911,22 +911,22 @@ main (int argc, char *argv [])
       channel_name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (channel_name, ACE_TRY_ENV);
+        naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
-                                                      ACE_TRY_ENV);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       TAO_EC_Event_Channel_Attributes attr(root_poa.in (),
                                            root_poa.in ());
       TAO_EC_Event_Channel ec_impl  (attr);
-      ec_impl.activate (ACE_TRY_ENV);
+      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (ACE_TRY_ENV);
+        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -990,13 +990,13 @@ main (int argc, char *argv [])
 
       for (i = 0; i < suppliers; ++i)
         {
-          supplier[i]->close (ACE_TRY_ENV);
+          supplier[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       for (i = 0; i < consumers; ++i)
         {
-          consumer [i]->close (ACE_TRY_ENV);
+          consumer [i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1014,12 +1014,12 @@ main (int argc, char *argv [])
         }
       delete [] consumer;
 
-      ec->destroy (ACE_TRY_ENV);
+      ec->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_TIMEPROBE_PRINT;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
index 71095dd35ef..15abe63a525 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
@@ -55,7 +55,7 @@ public:
                      const char *my_name);
 
   /// Disconnect from the Event Service and deactivate the object
-  void close (CORBA::Environment &);
+  void close (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   void entry_point (const char*);
   const char *entry_point () const;
@@ -63,7 +63,7 @@ public:
   /// Print timing statistics.
   void print_stats () /* const */;
 
-  virtual void disconnect_push_consumer (CORBA::Environment &)
+  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -71,8 +71,8 @@ public:
    * the supplier.  If its a shutdown message, the consumer
    * disconnects from the channel.
    */
-  virtual void push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &)
+  virtual void push (const RtecEventComm::EventSet &events
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -145,7 +145,7 @@ public:
     , public PortableServer::RefCountServantBase
   {
   public:
-    virtual void disconnect_push_supplier (CORBA::Environment &)
+    virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -164,11 +164,11 @@ public:
     , public PortableServer::RefCountServantBase
   {
   public:
-    virtual void push (const RtecEventComm::EventSet &events,
-                       CORBA::Environment &)
+    virtual void push (const RtecEventComm::EventSet &events
+                       TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void disconnect_push_consumer (CORBA::Environment &)
+    virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -203,18 +203,18 @@ public:
 
   /// Disconnect from the Event Service, deactivate the supplier and
   /// consumer personalities
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (TAO_ENV_SINGLE_ARG_DECL);
 
   /// The channel is disconnecting.
-  void disconnect_push_supplier (CORBA::Environment &);
+  void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// The channel is disconnecting.
-  void disconnect_push_consumer (CORBA::Environment &);
+  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Takes a timestamp and then pushes event_ to all consumers, either
   /// directly, or via a channel.
-  void push (const RtecEventComm::EventSet &events,
-             CORBA::Environment &);
+  void push (const RtecEventComm::EventSet &events
+             TAO_ENV_ARG_DECL_NOT_USED);
 
   /**
    * Called when the supplier should start generating events.
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 00f059b858e..2d24fddbe2e 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -61,7 +61,7 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   Manager manager;
 
@@ -69,8 +69,8 @@ main (int argc,
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv,
-                    ACE_TRY_ENV);
+                    argv
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // the command line arguments
@@ -78,13 +78,13 @@ main (int argc,
         return -1;
 
       // Merge the different IORS
-      manager.make_merged_iors (ACE_TRY_ENV);
+      manager.make_merged_iors (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       cout << "Merged IORS" <<endl;
       // Set properties. This is the most important portion of the
       // test
-      manager.set_properties (ACE_TRY_ENV);
+      manager.set_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       cout << "Set prop" <<endl;
 
@@ -94,7 +94,7 @@ main (int argc,
       // Client, who is going to use the merged IOR
       // Construct that with the managers ORB
       Client_i client_imp (manager.orb ());
-      client_imp.init (ACE_TRY_ENV);
+      client_imp.init (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -117,59 +117,59 @@ Manager::Manager (void)
 
 void
 Manager::init (int argc,
-               char *argv[],
-               CORBA::Environment &ACE_TRY_ENV)
+               char *argv[]
+               TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0,
-                                ACE_TRY_ENV);
+                                0
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RootPOA"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in (), ACE_TRY_ENV);
+    PortableServer::POA::_narrow (obj_var.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (ACE_TRY_ENV);
+    root_poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager_var->activate (ACE_TRY_ENV);
+  poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
-Manager::make_merged_iors (CORBA::Environment &ACE_TRY_ENV)
+Manager::make_merged_iors (TAO_ENV_SINGLE_ARG_DECL)
 {
   // First  server
   object_primary =
-    this->orb_->string_to_object (first_ior,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (first_ior
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //Second server
   object_secondary =
-    this->orb_->string_to_object (second_ior,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (second_ior
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA_Object_ptr IORM =
     this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM, ACE_TRY_ENV);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -181,14 +181,14 @@ Manager::make_merged_iors (CORBA::Environment &ACE_TRY_ENV)
 
   // Create a merged set 1;
   merged_set_ =
-    iorm->merge_iors (iors, ACE_TRY_ENV);
+    iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Manager::set_properties (CORBA::Environment &ACE_TRY_ENV)
+Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -215,8 +215,8 @@ Manager::set_properties (CORBA::Environment &ACE_TRY_ENV)
 
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              this->merged_set_.in (),
-                                              ACE_TRY_ENV);
+                                              this->merged_set_.in ()
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Set the primary
@@ -225,8 +225,8 @@ Manager::set_properties (CORBA::Environment &ACE_TRY_ENV)
     {
       retval = iorm->set_primary (&iogr_prop,
                                   object_secondary.in (),
-                                  this->merged_set_.in (),
-                                  ACE_TRY_ENV);
+                                  this->merged_set_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -234,11 +234,11 @@ Manager::set_properties (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Manager::run (CORBA::Environment &ACE_TRY_ENV)
+Manager::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -286,11 +286,11 @@ Client_i::Client_i (CORBA::ORB_ptr orb)
 }
 
 void
-run_test (Simple_Server_ptr server,
-          CORBA::Environment &ACE_TRY_ENV);
+run_test (Simple_Server_ptr server
+          TAO_ENV_ARG_DECL);
 
 void
-Client_i::init (CORBA::Environment &ACE_TRY_ENV)
+Client_i::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
@@ -314,19 +314,19 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV)
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0,
-                                ACE_TRY_ENV);
+                                0
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (data,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (data
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Combined IOR stuff
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in (),
-                            ACE_TRY_ENV);
+    Simple_Server::_narrow (object.in ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -336,8 +336,8 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV)
                   data));
     }
 
-  run_test (server.in (),
-            ACE_TRY_ENV);
+  run_test (server.in ()
+            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ior_buffer.alloc ()->free (data);
@@ -345,8 +345,8 @@ Client_i::init (CORBA::Environment &ACE_TRY_ENV)
 }
 
 
-void run_test (Simple_Server_ptr server,
-               CORBA::Environment &ACE_TRY_ENV)
+void run_test (Simple_Server_ptr server
+               TAO_ENV_ARG_DECL)
 {
   // We do this twice as we know that there are only two servers.
   for (CORBA::ULong i = 0;
@@ -360,7 +360,7 @@ void run_test (Simple_Server_ptr server,
                j++)
             {
               // Make a remote call
-              server->remote_call (ACE_TRY_ENV);
+              server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -368,7 +368,7 @@ void run_test (Simple_Server_ptr server,
                       ACE_TEXT ("*********************************\n")));
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("I am going to shutdown the server\n")));
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (2);
         }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index 8c6099b29e1..a82d46c1537 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -43,18 +43,18 @@ public:
   // Ctor
 
   void init (int argc,
-             char *argv[],
-             CORBA::Environment & ACE_TRY_ENV);
+             char *argv[]
+             TAO_ENV_ARG_DECL);
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (CORBA::Environment &);
+  int make_merged_iors (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Merges the different IORS
 
-  int set_properties (CORBA::Environment &);
+  int set_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Sets the properties for the profiles
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the  ORB event loop..
 
   int write_to_file (void);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index bc47e11a576..1c984b1de4b 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -35,18 +35,18 @@ main (int argc, char *argv[])
 {
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -55,22 +55,22 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate the LCD_Display implementation class
       Simple_Server_i display_impl (orb.in ());
 
       Simple_Server_var server =
-        display_impl._this (ACE_TRY_ENV);
+        display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run ();
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 2ea3e0b0c09..1de598a218f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -32,38 +32,38 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
                                              argv,
-                                             0,
-                                             ACE_TRY_ENV);
+                                             0
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // **********************************************************************
 
       // Get an object reference for the ORBs IORManipulation object!
       CORBA::Object_var IORM =
         orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                          0,
-                                          ACE_TRY_ENV);
+                                          0
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation_var iorm =
-               TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in (),
-                                                       ACE_TRY_ENV);
+               TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // **********************************************************************
 
       // Create a few fictitious IORs
       CORBA::Object_var name1 =
-        orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz",
-                                ACE_TRY_ENV);
+        orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz"
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Object_var name2 =
-        orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz",
-                                ACE_TRY_ENV);
+        orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz"
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
       // **********************************************************************
 
       CORBA::Object_var merged =
-        iorm->merge_iors (iors, ACE_TRY_ENV);
+        iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for set and get primaries
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
       TAO_FT_IOGR_Property prop (ft_tag_component);
 
       CORBA::Boolean retval =
-        iorm->set_primary (&prop, name2.in (), merged.in (), ACE_TRY_ENV);
+        iorm->set_primary (&prop, name2.in (), merged.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
@@ -99,8 +99,8 @@ main (int argc, char *argv[])
 
       // Check whether a primary has been set
       retval = iorm->is_primary_set (&prop,
-                                     merged.in (),
-                                     ACE_TRY_ENV);
+                                     merged.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval)
@@ -119,8 +119,8 @@ main (int argc, char *argv[])
       // Get the primary
       CORBA::Object_var prim =
         iorm->get_primary (&prop,
-                           merged.in (),
-                           ACE_TRY_ENV);
+                           merged.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check whether we got back the right primary
@@ -159,8 +159,8 @@ main (int argc, char *argv[])
 
       // Set the property
       retval = iorm->set_property (&prop,
-                                   merged.in (),
-                                   ACE_TRY_ENV);
+                                   merged.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index 09bbb6960c3..e47a63655c0 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -5,7 +5,7 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -13,7 +13,7 @@ int main (int argc, char *argv [])
       ior_mcast_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv, ACE_TRY_ENV);
+      init_result = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index 63f346939f5..b1110e009cb 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -15,8 +15,8 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void)
 
 int
 ior_mcast_Client_i::init (int& argc,
-                          char *argv[],
-                          CORBA::Environment &ACE_TRY_ENV)
+                          char *argv[]
+                          TAO_ENV_ARG_DECL)
 {
 
   ACE_TRY
@@ -25,21 +25,21 @@ ior_mcast_Client_i::init (int& argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var mcast_server_object =
-        orb->resolve_initial_references ("MCASTServer", ACE_TRY_ENV);
+        orb->resolve_initial_references ("MCASTServer" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (CORBA::is_nil (mcast_server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot resolve MCast Server\n : client"),
                           -1);
 
       MCast::Server_var mcast_srvr =
-        MCast::Server::_narrow (mcast_server_object.in (), ACE_TRY_ENV);
+        MCast::Server::_narrow (mcast_server_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mcast_srvr.in ()))
@@ -49,7 +49,7 @@ ior_mcast_Client_i::init (int& argc,
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        mcast_srvr->connect_server (ACE_TRY_ENV);
+        mcast_srvr->connect_server (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value != 0)
@@ -57,7 +57,7 @@ ior_mcast_Client_i::init (int& argc,
           ACE_DEBUG ((LM_DEBUG,
                       "The server has not been contacted. Error!!\n",
                       0));
-	}
+        }
     }
   ACE_CATCH (CORBA::SystemException, ex)
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 68e8ece6575..d28da2f6c73 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -20,10 +20,10 @@ class ior_mcast_Client_i
   ior_mcast_Client_i (void);
   ~ior_mcast_Client_i (void);
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[], CORBA::Environment &ACE_TRY_ENV);
+  int init (int& argc, char *argv[] TAO_ENV_ARG_DECL);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index 12a52993a9f..f25de786656 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -4,14 +4,14 @@
 
 int main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       Server_i svr_i;
 
       int init_result;
 
-      init_result = svr_i.init (argc, argv, ACE_TRY_ENV);
+      init_result = svr_i.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (init_result != 0)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index 17432f44284..ec0094ed072 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -23,8 +23,8 @@ Server_i::~Server_i (void)
 
 int
 Server_i::init (int &argc,
-                char **&argv,
-                CORBA::Environment &ACE_TRY_ENV)
+                char **&argv
+                TAO_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -35,46 +35,46 @@ Server_i::init (int &argc,
       this->orb_ =
         CORBA::ORB_init (this->argc_,
                          this->argv_,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to the correct reference.
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set a POA Manager.
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA Manager.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior;
 
       // Create the servant
       MCast_Server_i server_i;
-      
+
       // Activate it to obtain the reference
       MCast::Server_var mcast_server =
         server_i._this ();
-      
+
       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_TRY_CHECK;
-      
+
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
@@ -82,21 +82,21 @@ Server_i::init (int &argc,
       else
         {
           ior =
-            this->orb_->object_to_string (mcast_server.in (),
-                                          ACE_TRY_ENV);
+            this->orb_->object_to_string (mcast_server.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          adapter->bind ("MCASTServer", ior.in (), ACE_TRY_ENV);
+          adapter->bind ("MCASTServer", ior.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-      
+
       // Enable such that the server can listen for multicast requests
       // at the specified address.
-      this->enable_multicast (ior.in (),
-                              ACE_TRY_ENV);
+      this->enable_multicast (ior.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Destroy the POA, waiting until the destruction terminates.
@@ -114,29 +114,29 @@ Server_i::init (int &argc,
 }
 
 int
-Server_i::enable_multicast (const char *ior,
-                            CORBA::Environment &)
+Server_i::enable_multicast (const char *ior
+                            TAO_ENV_ARG_DECL_NOT_USED)
 {
 
   ACE_TRY
     {
       this->parse_args (this->argc_, this->argv_);
-      
+
       // Get reactor instance from TAO.
       ACE_Reactor *reactor =
         this->orb_->orb_core ()->reactor ();
-      
+
       // Instantiate a handler which will handle client requests for
       // the bottstrappable service, received on the multicast port.
       ACE_NEW_RETURN (this->ior_multicast_,
                       TAO_IOR_Multicast (),
                       -1);
-      
+
       if (this->ior_multicast_->init (ior,
                                       this->mcast_address_.in (),
                                       TAO_SERVICEID_MCASTSERVER) == -1)
         return -1;
-      
+
       // Register event handler for the ior multicast.
       if (reactor->register_handler (this->ior_multicast_,
                                      ACE_Event_Handler::READ_MASK) == -1)
@@ -146,7 +146,7 @@ Server_i::enable_multicast (const char *ior,
                         "MCast_Server: cannot register Event handler\n"));
           return -1;
         }
-      
+
     }
   ACE_CATCH (CORBA::SystemException, ex)
     {
@@ -167,14 +167,14 @@ Server_i::parse_args (int argc, char *argv [])
     switch (c)
       {
       case 'a':
-	this->mcast_address_ = get_opts.optarg;
-	break;
+        this->mcast_address_ = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-a <mcast_address>"
+                           "-a <mcast_address>"
                            "\n",
                            argv [0]),
                           -1);
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 0becc1f3854..77b16b86153 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -18,13 +18,13 @@ class Server_i
   Server_i (void);
   ~Server_i (void);
 
-  int init (int &argc, char **&argv, CORBA::Environment &);
+  int init (int &argc, char **&argv TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize the server multicast.
 
  private:
 
-  int enable_multicast (const char *ior,
-                        CORBA::Environment &ACE_TRY_ENV);
+  int enable_multicast (const char *ior
+                        TAO_ENV_ARG_DECL);
   // Sets the IOR_Multicast class to listen for multicast requests
   // for this server.
 
@@ -49,7 +49,7 @@ class Server_i
   CORBA::String_var mcast_address_;
   // Address of the multicast address where to listen for requests for */
   // the server. */
-  
+
 
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index 30954cdb64c..df08d623bd9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -9,11 +9,11 @@ int main (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var ns_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ns_obj.in ()))
@@ -22,8 +22,8 @@ int main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var inc =
-        CosNaming::NamingContext::_narrow (ns_obj.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (ns_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (inc.in ()))
@@ -35,7 +35,7 @@ int main (int argc, char *argv[])
       name.length (1);
       name[0].id = CORBA::string_dup ("yourself");
 
-      inc->bind (name, ns_obj.in (), ACE_TRY_ENV);
+      inc->bind (name, ns_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Test Successful\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index c7f601f37a0..a138972dd69 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -59,11 +59,11 @@ Airplane_Client_i::get_planes (size_t count)
 {
   for (size_t i = 0; i < count; i++)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           CORBA::String_var response =
-            this->server_->get_plane (ACE_TRY_ENV);
+            this->server_->get_plane (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
@@ -103,14 +103,14 @@ Airplane_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -124,10 +124,10 @@ Airplane_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_, ACE_TRY_ENV);
+        this->orb_->string_to_object (this->server_key_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->server_ = Paper_Airplane_Server::_narrow (server_object.in(), ACE_TRY_ENV);
+      this->server_ = Paper_Airplane_Server::_narrow (server_object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_object.in ()))
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index e5d8e49f3b9..f0947997b2d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -11,17 +11,17 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int retval = server.init (argc, argv, ACE_TRY_ENV);
+      int retval = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return -1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index f19f500bb36..d0864f3e575 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -55,7 +55,7 @@ Airplane_Server_i::parse_args (void)
 }
 
 int
-Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
+Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 {
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
@@ -64,7 +64,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
   ACE_TRY
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Save pointers to the command line arguments
@@ -79,8 +79,8 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check the POA object.
@@ -91,11 +91,11 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 
       // Narrow the object to a POA.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_Manager.
-      this->poa_manager_ = root_poa->the_POAManager (ACE_TRY_ENV);
+      this->poa_manager_ = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We now need to create a POA with the persistent and user_id policies,
@@ -105,32 +105,32 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->airplane_poa_ =
         root_poa->create_POA (poa_name,
                               this->poa_manager_.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Make sure the POA manager is activated.
-      this->poa_manager_->activate (ACE_TRY_ENV);
+      this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (this->server_impl_,
@@ -141,31 +141,31 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
         PortableServer::string_to_ObjectId ("server");
 
       this->airplane_poa_->activate_object_with_id (server_id.in (),
-                                                    this->server_impl_,
-                                                    ACE_TRY_ENV);
+                                                    this->server_impl_
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server_obj =
-        this->airplane_poa_->id_to_reference (server_id.in (),
-                                              ACE_TRY_ENV);
+        this->airplane_poa_->id_to_reference (server_id.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an IOR from the server object.
       CORBA::String_var server_str =
-        this->orb_->object_to_string (server_obj.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->object_to_string (server_obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", server_str.in ()));
 
       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_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -173,7 +173,7 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
         }
       else
         {
-          adapter->bind (poa_name, server_str.in (), ACE_TRY_ENV);
+          adapter->bind (poa_name, server_str.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -196,11 +196,11 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Airplane_Server_i::run (CORBA::Environment &ACE_TRY_ENV)
+Airplane_Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -221,7 +221,7 @@ Airplane_Server_i::~Airplane_Server_i (void)
     {
     if (!CORBA::is_nil (this->airplane_poa_.in ()))
       {
-        this->airplane_poa_->destroy (1, 1, ACE_TRY_ENV);
+        this->airplane_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index e3cedf8b798..19880a002c3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -26,7 +26,7 @@
  *
  * @brief Paper Airplane Server Implementation Class
  *
- * Sets up everything necessary to get the Paper Airplane Server 
+ * Sets up everything necessary to get the Paper Airplane Server
  * running.
  */
 class Airplane_Server_i
@@ -40,10 +40,10 @@ public:
   ~Airplane_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV);
+  int init (int argc, char **argv TAO_ENV_ARG_DECL);
 
-  /// Run the orb 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  /// Run the orb
+  int run (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Parses the commandline arguments.
@@ -64,7 +64,7 @@ private:
   /// The POA manager.
   PortableServer::POAManager_var poa_manager_;
 
-  /// The Paper Airplane Server Implementation.  
+  /// The Paper Airplane Server Implementation.
   Airplane_i *server_impl_;
 
   /// File where the IOR of the server object is stored.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index b3d9f61a41a..f0c05263d59 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -87,14 +87,14 @@ Nestea_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -108,10 +108,10 @@ Nestea_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_, ACE_TRY_ENV);
+        this->orb_->string_to_object (this->server_key_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->server_ = Nestea_Bookshelf::_narrow (server_object.in(), ACE_TRY_ENV);
+      this->server_ = Nestea_Bookshelf::_narrow (server_object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_object.in ()))
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index ddee142a311..56d0454efd8 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -34,8 +34,8 @@ Nestea_i::~Nestea_i (void)
 // Add <cans> number of cans to the bookshelf.
 
 void
-Nestea_i::drink (CORBA::Long cans,
-                 CORBA::Environment &)
+Nestea_i::drink (CORBA::Long cans
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -50,8 +50,8 @@ Nestea_i::drink (CORBA::Long cans,
 // Removes <cans> number of cans from the bookshelf.
 
 void
-Nestea_i::crush (CORBA::Long cans,
-                 CORBA::Environment &)
+Nestea_i::crush (CORBA::Long cans
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -69,7 +69,7 @@ Nestea_i::crush (CORBA::Long cans,
 // Returns the number of cans in the bookshelf.
 
 CORBA::Long
-Nestea_i::bookshelf_size (CORBA::Environment &)
+Nestea_i::bookshelf_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -81,7 +81,7 @@ Nestea_i::bookshelf_size (CORBA::Environment &)
 // Returns comments about your collection.
 
 char *
-Nestea_i::get_praise (CORBA::Environment &)
+Nestea_i::get_praise (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 1754576175f..88c2da374b4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -15,7 +15,7 @@
 
 
 #if !defined (NESTEA_I_H)
-#define	NESTEA_I_H
+#define NESTEA_I_H
 
 #include "NesteaS.h"
 
@@ -45,25 +45,21 @@ public:
   virtual ~Nestea_i (void);
 
   /// Add <cans> number of cans to the bookshelf.
-  virtual void drink (CORBA::Long cans,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ())
+  virtual void drink (CORBA::Long cans
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Removes <cans> number of cans from the bookshelf.
-  virtual void crush (CORBA::Long cans,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ())
+  virtual void crush (CORBA::Long cans
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of cans in the bookshelf.
-  virtual CORBA::Long bookshelf_size (CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ())
+  virtual CORBA::Long bookshelf_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns comments about your collection.
-  virtual char *get_praise (CORBA::Environment &ACE_TRY_ENV = 
-                              TAO_default_environment ())
+  virtual char *get_praise (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index c8b0795079b..48bf74ed1a7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -11,17 +11,17 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int retval = server.init (argc, argv, ACE_TRY_ENV);
+      int retval = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return -1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 88e9d7a1bff..9387ac9edcd 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -27,7 +27,7 @@ Nestea_Server_i::~Nestea_Server_i (void)
     {
       if (!CORBA::is_nil (this->nestea_poa_.in ()))
         {
-          this->nestea_poa_->destroy (1, 1, ACE_TRY_ENV);
+          this->nestea_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -86,7 +86,7 @@ Nestea_Server_i::parse_args (void)
 // - Creates an IOR from the servant and outputs it to a file
 
 int
-Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
+Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 {
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
@@ -95,7 +95,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
   ACE_TRY
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Save pointers to the command line arguments
@@ -110,8 +110,8 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check the POA object.
@@ -122,11 +122,11 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 
       // Narrow the object to a POA.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_Manager.
-      this->poa_manager_ = root_poa->the_POAManager (ACE_TRY_ENV);
+      this->poa_manager_ = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We now need to create a POA with the persistent and user_id policies,
@@ -136,32 +136,32 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
       policies.length (2);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK
 
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->nestea_poa_ =
         root_poa->create_POA (poa_name,
                               this->poa_manager_.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Make sure the POA manager is activated.
-      this->poa_manager_->activate (ACE_TRY_ENV);
+      this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (this->server_impl_,
@@ -172,31 +172,31 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
         PortableServer::string_to_ObjectId ("server");
 
       this->nestea_poa_->activate_object_with_id (server_id.in (),
-                                                  this->server_impl_,
-                                                  ACE_TRY_ENV);
+                                                  this->server_impl_
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server_obj =
-        this->nestea_poa_->id_to_reference (server_id.in (),
-                                            ACE_TRY_ENV);
+        this->nestea_poa_->id_to_reference (server_id.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an IOR from the server object.
       CORBA::String_var server_str =
-        this->orb_->object_to_string (server_obj.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->object_to_string (server_obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", server_str.in ()));
 
       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_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -204,7 +204,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
         }
       else
         {
-          adapter->bind (poa_name, server_str.in (), ACE_TRY_ENV);
+          adapter->bind (poa_name, server_str.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -227,13 +227,13 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Nestea_Server_i::run (CORBA::Environment &ACE_TRY_ENV)
+Nestea_Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   int status = 0;
 
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index d340cbd0499..e4ba216abe9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -26,7 +26,7 @@
  *
  * @brief Nestea Bookshelf Server Implementation Class
  *
- * Sets up everything necessary to get the Nestea Bookshelf Server 
+ * Sets up everything necessary to get the Nestea Bookshelf Server
  * running.
  */
 class Nestea_Server_i
@@ -40,10 +40,10 @@ public:
   ~Nestea_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV);
+  int init (int argc, char **argv TAO_ENV_ARG_DECL);
 
-  /// Run the orb 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  /// Run the orb
+  int run (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Parses the commandline arguments.
@@ -63,8 +63,8 @@ private:
 
   /// The POA manager.
   PortableServer::POAManager_var poa_manager_;
-  
-  /// The Nestea Bookshelf Server Implementation.  
+
+  /// The Nestea Bookshelf Server Implementation.
   Nestea_i *server_impl_;
 
   /// File where the IOR of the server object is stored.
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index a38d0d88fb8..b6d30158d55 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -10,25 +10,25 @@ main (int argc, char *argv[])
 {
   IFR_DII_Client client;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      if (client.init (argc, 
-                       argv, 
-                       ACE_TRY_ENV) 
+      if (client.init (argc,
+                       argv
+                       TAO_ENV_ARG_PARAMETER)
            == -1)
         {
           return 1;
         }
       else
         {
-          client.run (ACE_TRY_ENV);
+          client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Client Exception");
       return -1;
     }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index f5b6a4d10e5..91b2602ff01 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -18,25 +18,25 @@ IFR_DII_Client::~IFR_DII_Client (void)
 {
 }
 
-int 
+int
 IFR_DII_Client::init (int argc,
-                      char *argv[],
-                      CORBA::Environment &ACE_TRY_ENV)
+                      char *argv[]
+                      TAO_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc, 
-                                argv, 
-                                0, 
-                                ACE_TRY_ENV);
+  this->orb_ = CORBA::ORB_init (argc,
+                                argv,
+                                0
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // In a reall application, we would get the scoped or
   // local name from the Interface Repository and use that
-  // to get the object reference of the target via the Naming 
+  // to get the object reference of the target via the Naming
   // Service. Since we're not testing the Naming Service here,
   // we just use the IOR which is stored in a file by the server.
-  this->target_ = 
-    this->orb_->string_to_object ("file://iorfile",
-                                  ACE_TRY_ENV);
+  this->target_ =
+    this->orb_->string_to_object ("file://iorfile"
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->parse_args (argc, argv) == -1)
@@ -47,27 +47,27 @@ IFR_DII_Client::init (int argc,
   return 0;
 }
 
-int 
-IFR_DII_Client::run (CORBA::Environment &ACE_TRY_ENV)
+int
+IFR_DII_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->lookup_by_name_)
     {
-      this->lookup_interface_def (ACE_TRY_ENV);
+      this->lookup_interface_def (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   else
     {
-      this->find_interface_def (ACE_TRY_ENV);
+      this->find_interface_def (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
-  this->get_operation_def (ACE_TRY_ENV);
+  this->get_operation_def (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->create_dii_request (ACE_TRY_ENV);
+  this->create_dii_request (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->invoke_and_display (ACE_TRY_ENV);
+  this->invoke_and_display (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -99,22 +99,22 @@ IFR_DII_Client::parse_args (int argc,
   return 0;
 }
 
-void 
-IFR_DII_Client::find_interface_def (CORBA::Environment &ACE_TRY_ENV)
+void
+IFR_DII_Client::find_interface_def (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->target_def_ = this->target_->_get_interface (ACE_TRY_ENV);
+  this->target_def_ = this->target_->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV)
+void
+IFR_DII_Client::lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("InterfaceRepository",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("InterfaceRepository"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->repo_ = CORBA::Repository::_narrow (obj.in (),
-                                            ACE_TRY_ENV);
+  this->repo_ = CORBA::Repository::_narrow (obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Is there a contained object of some kind at any level in the
@@ -123,8 +123,8 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV)
     this->repo_->lookup_name (this->namespace_name.in (),
                               -1,               // Unlimited level recursion.
                               CORBA::dk_all,    // Any type of contained object.
-                              1,                // Exclude parents of interfaces.
-                              ACE_TRY_ENV);
+                              1                 // Exclude parents of interfaces.
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = candidates->length ();
@@ -138,8 +138,8 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       candidate =
-        CORBA::Container::_narrow (candidates[i],
-                                   ACE_TRY_ENV);
+        CORBA::Container::_narrow (candidates[i]
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Is this contained item itself a container?
@@ -147,8 +147,8 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV)
         {
           // Does this container contain any interfaces?
           interfaces = candidate->contents (CORBA::dk_Interface,
-                                            1,    // Exclude parents.
-                                            ACE_TRY_ENV);
+                                            1     // Exclude parents.
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           n_interfaces = interfaces->length ();
@@ -169,27 +169,27 @@ IFR_DII_Client::lookup_interface_def (CORBA::Environment &ACE_TRY_ENV)
   // be any length.
   for (CORBA::ULong j = 0; j < n_interfaces; ++j)
     {
-      name = interfaces[j]->name (ACE_TRY_ENV);
+      name = interfaces[j]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!ACE_OS::strcmp (name.in (), this->interface_name.in ()))
         {
-          this->target_def_ = 
-            CORBA::InterfaceDef::_narrow (interfaces[j].in (),
-                                          ACE_TRY_ENV);
+          this->target_def_ =
+            CORBA::InterfaceDef::_narrow (interfaces[j].in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 }
 
-void 
-IFR_DII_Client::get_operation_def (CORBA::Environment &ACE_TRY_ENV)
+void
+IFR_DII_Client::get_operation_def (TAO_ENV_SINGLE_ARG_DECL)
 {
   // What operation(s) does this interface contain?
-  CORBA::ContainedSeq_var operations = 
+  CORBA::ContainedSeq_var operations =
     this->target_def_->contents (CORBA::dk_Operation,
-                                 1,
-                                 ACE_TRY_ENV);
+                                 1
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong n_operations = operations->length ();
@@ -198,38 +198,38 @@ IFR_DII_Client::get_operation_def (CORBA::Environment &ACE_TRY_ENV)
   // be any length.
   for (CORBA::ULong i = 0; i < n_operations; ++i)
     {
-      op_name = operations[i]->name (ACE_TRY_ENV);
+      op_name = operations[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!ACE_OS::strcmp (op_name.in (), this->op_name.in ()))
         {
           this->op_ =
-            CORBA::OperationDef::_narrow (operations[i],
-                                          ACE_TRY_ENV);
+            CORBA::OperationDef::_narrow (operations[i]
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 }
 
-void 
-IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV)
+void
+IFR_DII_Client::create_dii_request (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->req_ = this->target_->_request (this->op_name.in (),
-                                        ACE_TRY_ENV);
+  this->req_ = this->target_->_request (this->op_name.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->result_ = this->op_->result (ACE_TRY_ENV);
+  this->result_ = this->op_->result (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->req_->set_return_type (this->result_.in ());
 
-  CORBA::ParDescriptionSeq_var params = this->op_->params (ACE_TRY_ENV);
+  CORBA::ParDescriptionSeq_var params = this->op_->params (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = params->length ();
 
-  // This example of the discovery of parameter information is 
-  // purposely contrived for the sake of brevity. A real 
+  // This example of the discovery of parameter information is
+  // purposely contrived for the sake of brevity. A real
   // application would have more versatile code here, and much
   // more of it.
   for (CORBA::ULong i = 0; i < length; ++i)
@@ -258,7 +258,7 @@ IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV)
         case CORBA::PARAM_OUT:
           {
             // It doesn't matter for basic types, like float, but for
-            // cases where it does, this is an alternative method of 
+            // cases where it does, this is an alternative method of
             // adding an OUT argument without initializing it.
             if (params[i].type->kind () == CORBA::tk_float
                 && ACE_OS::strcmp (params[i].name, "price") == 0)
@@ -268,8 +268,8 @@ IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV)
                 // The servant will return 0.0 if the title is not found.
                 this->req_->arguments ()->add_value (params[i].name,
                                                      any,
-                                                     CORBA::ARG_OUT,
-                                                     ACE_TRY_ENV);
+                                                     CORBA::ARG_OUT
+                                                     TAO_ENV_ARG_PARAMETER);
                 ACE_CHECK;
               }
 
@@ -279,10 +279,10 @@ IFR_DII_Client::create_dii_request (CORBA::Environment &ACE_TRY_ENV)
     }
 }
 
-void 
-IFR_DII_Client::invoke_and_display (CORBA::Environment &ACE_TRY_ENV)
+void
+IFR_DII_Client::invoke_and_display (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->req_->invoke (ACE_TRY_ENV);
+  this->req_->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = this->req_->return_value ().type ();
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index 2ac8ace4029..0e829e77eb7 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -19,11 +19,11 @@ public:
   ~IFR_DII_Client (void);
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the client.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the client.
 
 private:
@@ -31,20 +31,20 @@ private:
                   char *argv[]);
   // Process the command line arguments.
 
-  void find_interface_def (CORBA::Environment &ACE_TRY_ENV);
+  void find_interface_def (TAO_ENV_SINGLE_ARG_DECL);
   // Query the object reference to get its InterfaceDef in the IFR.
 
-  void lookup_interface_def (CORBA::Environment &ACE_TRY_ENV);
+  void lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL);
   // Look up the InterfaceDef by name in the IFR.
 
-  void get_operation_def (CORBA::Environment &ACE_TRY_ENV);
+  void get_operation_def (TAO_ENV_SINGLE_ARG_DECL);
   // Find the desired operation in the interface definition.
 
-  void create_dii_request (CORBA::Environment &ACE_TRY_ENV);
+  void create_dii_request (TAO_ENV_SINGLE_ARG_DECL);
   // Query the interface definition to get the info needed
   // to construct a CORBA::Request.
 
-  void invoke_and_display (CORBA::Environment &ACE_TRY_ENV);
+  void invoke_and_display (TAO_ENV_SINGLE_ARG_DECL);
   // Do the invocation and display the results.
 
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index e01b51ef00a..fe9bac72a49 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -40,40 +40,40 @@ write_ior_to_file (const char *ior)
 int
 main (int argc, char *argv[])
 {
-	ACE_TRY_NEW_ENV
-	  {
+        ACE_TRY_NEW_ENV
+          {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "",
-                                            ACE_TRY_ENV);
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       inventory_i servant_impl;
 
       warehouse::inventory_var servant =
-        servant_impl._this (ACE_TRY_ENV);
+        servant_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (servant.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (servant.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int write_result = write_ior_to_file (ior.in ());
@@ -90,12 +90,12 @@ main (int argc, char *argv[])
                   "IOR is: <%s>\n",
                   ior.in ()));
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index c3614e55389..3191162c35b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -8,8 +8,8 @@ ACE_RCSID(Application_Test, test_i, "$Id$")
 CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
                         char *& title,
-                        CORBA::Float_out price,
-                        CORBA::Environment &)
+                        CORBA::Float_out price
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean in_stock = 0;
@@ -24,7 +24,7 @@ inventory_i::getCDinfo (const char * artist,
 
       if (working_title.strstr (title_key) != -1)
         {
-          title = 
+          title =
             CORBA::string_dup ("Sgt. Pepper's Lonely Hearts Club Band");
 
           price = 13.49f;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
index 48a89ccde9f..acd62f8d1dc 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
@@ -12,9 +12,8 @@ class inventory_i : public POA_warehouse::inventory
 public:
   CORBA::Boolean getCDinfo (const char * artist,
                             char *& title,
-                            CORBA::Float_out price,
-                            CORBA::Environment &ACE_TRY_ENV = 
-                              TAO_default_environment ())
+                            CORBA::Float_out price
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 9dd2c7183e6..e66b8396231 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -55,8 +55,8 @@ Admin_Client::init (int argc,
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int retval = this->parse_args (argc,
@@ -66,8 +66,8 @@ Admin_Client::init (int argc,
         return retval;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("InterfaceRepository"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -81,8 +81,8 @@ Admin_Client::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in (),
-                                    ACE_TRY_ENV);
+        CORBA::Repository::_narrow (object.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->repo_.in ()))
@@ -117,7 +117,7 @@ Admin_Client::run (void)
               // CORBA::BAD_PARAM exception the second time.
               for (CORBA::ULong j = 0; j < this->iterations_; ++j)
                 {
-                  (this->*test_array_[i])(ACE_TRY_ENV);
+                  (this->*test_array_[i])(TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -126,7 +126,7 @@ Admin_Client::run (void)
         {
           for (CORBA::ULong j = 0; j < this->iterations_; ++j)
             {
-              (this->*test_array_[this->which_test_])(ACE_TRY_ENV);
+              (this->*test_array_[this->which_test_])(TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -193,23 +193,23 @@ Admin_Client::parse_args (int argc,
 }
 
 void
-Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT ("\n============== ARRAY TEST ==============\n\n")
     ));
 
-  CORBA::IDLType_var atype = this->repo_->create_string (7,
-                                                         ACE_TRY_ENV);
+  CORBA::IDLType_var atype = this->repo_->create_string (7
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ArrayDef_var avar = this->repo_->create_array (5,
-                                                        atype.in (),
-                                                        ACE_TRY_ENV);
+                                                        atype.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong bound = avar->length (ACE_TRY_ENV);
+  CORBA::ULong bound = avar->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -219,10 +219,10 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (bound == 5);
 
-  CORBA::TypeCode_var tc = avar->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = avar->type (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;
 
   if (this->debug_)
@@ -232,9 +232,9 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
-  tc = avar->element_type (ACE_TRY_ENV);
+  tc = avar->element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  kind = tc->kind (ACE_TRY_ENV);
+  kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -244,9 +244,9 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_string);
 
-  CORBA::IDLType_var tdef = avar->element_type_def (ACE_TRY_ENV);
+  CORBA::IDLType_var tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::DefinitionKind dk = tdef->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -258,10 +258,10 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (dk == CORBA::dk_String);
 
-  CORBA::StringDef_var pvar = CORBA::StringDef::_narrow (tdef.in (),
-                                                         ACE_TRY_ENV);
+  CORBA::StringDef_var pvar = CORBA::StringDef::_narrow (tdef.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  bound = pvar->bound (ACE_TRY_ENV);
+  bound = pvar->bound (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -271,21 +271,21 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (bound == 7);
 
-  CORBA::PrimitiveDef_var pdef = 
-    this->repo_->get_primitive (CORBA::pk_short,
-                                ACE_TRY_ENV);
+  CORBA::PrimitiveDef_var pdef =
+    this->repo_->get_primitive (CORBA::pk_short
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  avar->element_type_def (pdef.in (),
-                          ACE_TRY_ENV);
+  avar->element_type_def (pdef.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ArrayDef::element_type_def (set)\n")));
 
-  tc = avar->type (ACE_TRY_ENV);
+  tc = avar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  kind = tc->kind (ACE_TRY_ENV);
+  kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -295,9 +295,9 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
-  tdef = avar->element_type_def (ACE_TRY_ENV);
+  tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  dk = tdef->def_kind (ACE_TRY_ENV);
+  dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -307,11 +307,11 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (dk == CORBA::dk_Primitive);
 
-  CORBA::PrimitiveDef_var zvar = 
-    CORBA::PrimitiveDef::_narrow (tdef.in (),
-                                  ACE_TRY_ENV);
+  CORBA::PrimitiveDef_var zvar =
+    CORBA::PrimitiveDef::_narrow (tdef.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::PrimitiveKind pkind = zvar->kind (ACE_TRY_ENV);
+  CORBA::PrimitiveKind pkind = zvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -321,12 +321,12 @@ Admin_Client::array_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (pkind == CORBA::pk_short);
 
-  avar->destroy (ACE_TRY_ENV);
+  avar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -343,11 +343,11 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::EnumDef_var evar = this->repo_->create_enum ("IDL:my_enum:1.0",
                                                       "my_enum",
                                                       "1.0",
-                                                      members,
-                                                      ACE_TRY_ENV);
+                                                      members
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = evar->id (ACE_TRY_ENV);
+  CORBA::String_var str = evar->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -357,7 +357,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0"));
 
-  str = evar->name (ACE_TRY_ENV);
+  str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -367,7 +367,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_enum"));
 
-  str = evar->absolute_name (ACE_TRY_ENV);
+  str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -377,7 +377,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_enum"));
 
-  str = evar->version (ACE_TRY_ENV);
+  str = evar->version (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -387,7 +387,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0"));
 
-  CORBA::DefinitionKind dkind = evar->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind dkind = evar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -397,7 +397,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (dkind == CORBA::dk_Enum);
 
-  CORBA::Contained::Description_var desc = evar->describe (ACE_TRY_ENV);
+  CORBA::Contained::Description_var desc = evar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   dkind = desc->kind;
@@ -440,7 +440,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.0"));
 
-  CORBA::TCKind kind = td->type->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -450,7 +450,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_enum);
 
-  str = td->type->id (ACE_TRY_ENV);
+  str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -460,7 +460,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0"));
 
-  str = td->type->name (ACE_TRY_ENV);
+  str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -485,7 +485,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < count; i++)
     {
-      str = td->type->member_name (i, ACE_TRY_ENV);
+      str = td->type->member_name (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -505,15 +505,15 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
   members[2] = CORBA::string_dup ("DUALITY");
   members[3] = CORBA::string_dup ("TRINITY");
 
-  evar->members (members,
-                 ACE_TRY_ENV);
+  evar->members (members
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\nEnumDef::members (set)\n\n")));
 
-  CORBA::EnumMemberSeq_var fellows = evar->members (ACE_TRY_ENV);
+  CORBA::EnumMemberSeq_var fellows = evar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   count = fellows->length ();
@@ -533,10 +533,10 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
       ACE_ASSERT (!ACE_OS::strcmp (fellows[i], members[i]));
     }
 
-  evar->name ("another_enum",
-              ACE_TRY_ENV);
+  evar->name ("another_enum"
+              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  str = evar->name (ACE_TRY_ENV);
+  str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -550,7 +550,7 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "another_enum"));
 
-  str = evar->absolute_name (ACE_TRY_ENV);
+  str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -560,12 +560,12 @@ Admin_Client::enum_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::another_enum"));
 
-  evar->destroy (ACE_TRY_ENV);
+  evar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -574,25 +574,25 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   // This test also tests WstringDef and SequenceDef.
 
-  CORBA::IDLType_var sq_elem = this->repo_->create_wstring (7,
-                                                            ACE_TRY_ENV);
+  CORBA::IDLType_var sq_elem = this->repo_->create_wstring (7
+                                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::SequenceDef_var sq_var = 
+  CORBA::SequenceDef_var sq_var =
     this->repo_->create_sequence (5,
-                                  sq_elem.in (),
-                                  ACE_TRY_ENV);
+                                  sq_elem.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::AliasDef_var a_var = 
+  CORBA::AliasDef_var a_var =
     this->repo_->create_alias ("IDL:my_alias:1.0",
                                "my_alias",
                                "1.0",
-                               sq_var.in (),
-                               ACE_TRY_ENV);
+                               sq_var.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = a_var->id (ACE_TRY_ENV);
+  CORBA::String_var str = a_var->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -602,7 +602,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0"));
 
-  str = a_var->name (ACE_TRY_ENV);
+  str = a_var->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -612,7 +612,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
 
-  str = a_var->absolute_name (ACE_TRY_ENV);
+  str = a_var->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -622,7 +622,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_alias"));
 
-  str = a_var->version (ACE_TRY_ENV);
+  str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -636,11 +636,11 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("AliasDef::version (set)\n")));
 
-  a_var->version ("1.1",
-                  ACE_TRY_ENV);
+  a_var->version ("1.1"
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = a_var->version (ACE_TRY_ENV);
+  str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -650,10 +650,10 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.1"));
 
-  CORBA::TypeCode_var tc = a_var->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = a_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = tc->name (ACE_TRY_ENV);
+  str = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -663,7 +663,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
 
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -673,10 +673,10 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_alias);
 
-  CORBA::TypeCode_var ct = tc->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var ct = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  kind = ct->kind (ACE_TRY_ENV);
+  kind = ct->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -686,7 +686,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_sequence);
 
-  CORBA::ULong length = ct->length (ACE_TRY_ENV);
+  CORBA::ULong length = ct->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -696,10 +696,10 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (length == 5);
 
-  CORBA::TypeCode_var ct2 = ct->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var ct2 = ct->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  kind = ct2->kind (ACE_TRY_ENV);
+  kind = ct2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -710,7 +710,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_wstring);
 
-  length = ct2->length (ACE_TRY_ENV);
+  length = ct2->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -721,7 +721,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (length == 7);
 
-  CORBA::Contained::Description_var desc = a_var->describe (ACE_TRY_ENV);
+  CORBA::Contained::Description_var desc = a_var->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeDescription *td;
@@ -741,7 +741,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.1"));
 
-  kind = td->type->kind (ACE_TRY_ENV);
+  kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -751,7 +751,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_alias);
 
-  str = td->type->id (ACE_TRY_ENV);
+  str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -761,7 +761,7 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0"));
 
-  str = td->type->name (ACE_TRY_ENV);
+  str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -771,15 +771,15 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
 
-  CORBA::IDLType_var i_var = a_var->original_type_def (ACE_TRY_ENV);
+  CORBA::IDLType_var i_var = a_var->original_type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::SequenceDef_var seq_var = 
-    CORBA::SequenceDef::_narrow (i_var.in (),
-                                 ACE_TRY_ENV);
+  CORBA::SequenceDef_var seq_var =
+    CORBA::SequenceDef::_narrow (i_var.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  length = seq_var->bound (ACE_TRY_ENV);
+  length = seq_var->bound (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -789,26 +789,26 @@ Admin_Client::alias_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (length == 5);
 
-  a_var->destroy (ACE_TRY_ENV);
+  a_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT ("\n============== NATIVE TEST ==============\n\n")
     ));
 
-  CORBA::NativeDef_var nvar = 
+  CORBA::NativeDef_var nvar =
     this->repo_->create_native ("IDL:my_native:1.0",
                                 "my_native",
-                                "1.0",
-                                ACE_TRY_ENV);
+                                "1.0"
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = nvar->id (ACE_TRY_ENV);
+  CORBA::String_var str = nvar->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -818,7 +818,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_native:1.0"));
 
-  str = nvar->name (ACE_TRY_ENV);
+  str = nvar->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -828,7 +828,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_native"));
 
-  str = nvar->version (ACE_TRY_ENV);
+  str = nvar->version (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -838,7 +838,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0"));
 
-  str = nvar->absolute_name (ACE_TRY_ENV);
+  str = nvar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -848,7 +848,7 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_native"));
 
-  CORBA::DefinitionKind kind = nvar->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind kind = nvar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -858,12 +858,12 @@ Admin_Client::native_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::dk_Native);
 
-  nvar->destroy (ACE_TRY_ENV);
+  nvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -874,14 +874,14 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
   members.length (3);
 
   members[0].name = CORBA::string_dup ("ub_string");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string,
-                                                    ACE_TRY_ENV);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   members[1].name = CORBA::string_dup ("bd_string");
-  members[1].type_def = this->repo_->create_string (5,
-                                                    ACE_TRY_ENV);
+  members[1].type_def = this->repo_->create_string (5
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -893,29 +893,29 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   members[2].name = CORBA::string_dup ("my_struct_enum");
 
-  CORBA::EnumDef_var e_var = 
+  CORBA::EnumDef_var e_var =
     this->repo_->create_enum ("IDL:my_enum:1.0",
                               "my_enum",
                               "1.0",
-                              e_members,
-                              ACE_TRY_ENV);
+                              e_members
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
   members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-  CORBA::StructDef_var svar = 
+  CORBA::StructDef_var svar =
     this->repo_->create_struct ("IDL:my_struct:1.0",
                                 "my_struct",
                                 "1.0",
-                                members,
-                                ACE_TRY_ENV);
+                                members
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This also tests the members() function.
-  CORBA::TypeCode_var tc = svar->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = svar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -930,7 +930,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = tc->member_name (i, ACE_TRY_ENV);
+      str = tc->member_name (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -942,7 +942,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name));
     }
 
-  CORBA::Contained::Description_var desc = svar->describe (ACE_TRY_ENV);
+  CORBA::Contained::Description_var desc = svar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeDescription *td;
@@ -971,21 +971,21 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long,
-                                                    ACE_TRY_ENV);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   members[1].name = CORBA::string_dup ("array_mem");
-  members[1].type_def = 
+  members[1].type_def =
     this->repo_->create_array (5,
-                               members[0].type_def.in (),
-                               ACE_TRY_ENV);
+                               members[0].type_def.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-  svar->members (members,
-                 ACE_TRY_ENV);
+  svar->members (members
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1001,11 +1001,11 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0",
                                                     "my_enum",
                                                     "1.0",
-                                                    def_members,
-                                                    ACE_TRY_ENV);
+                                                    def_members
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq_var out_members = svar->members (ACE_TRY_ENV);
+  CORBA::StructMemberSeq_var out_members = svar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_members->length ();
@@ -1024,11 +1024,11 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
         ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name));
     }
 
-  CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum",
-                                                  ACE_TRY_ENV);
+  CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum"
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (ACE_TRY_ENV);
+  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1038,11 +1038,11 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum"));
 
-  fox = svar->lookup ("my_enum",
-                      ACE_TRY_ENV);
+  fox = svar->lookup ("my_enum"
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (ACE_TRY_ENV);
+  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1052,13 +1052,13 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum"));
 
-  CORBA::Container_var outer = fox->defined_in (ACE_TRY_ENV);
+  CORBA::Container_var outer = fox->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::Contained_var schizo = CORBA::Contained::_narrow (outer.in (),
-                                                           ACE_TRY_ENV);
+  CORBA::Contained_var schizo = CORBA::Contained::_narrow (outer.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = schizo->absolute_name (ACE_TRY_ENV);
+  str = schizo->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1070,8 +1070,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct"));
 
   CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
-                                                            0,
-                                                            ACE_TRY_ENV);
+                                                            0
+                                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1084,8 +1084,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (length == 2);
 
   contents = svar->contents (CORBA::dk_all,
-                             0,
-                             ACE_TRY_ENV);
+                             0
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1099,7 +1099,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (ACE_TRY_ENV);
+      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1123,8 +1123,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
   contents = this->repo_->lookup_name ("my_enum",
                                        -1,
                                        CORBA::dk_all,
-                                       0,
-                                       ACE_TRY_ENV);
+                                       0
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1138,7 +1138,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (ACE_TRY_ENV);
+      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1156,8 +1156,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Container::DescriptionSeq_var cont_desc =
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
-                                    -1,
-                                    ACE_TRY_ENV);
+                                    -1
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cont_desc->length ();
@@ -1174,7 +1174,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
       CORBA::TypeDescription *td;
       cont_desc[i].value >>= td;
 
-      str = td->type->id (ACE_TRY_ENV);
+      str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1211,8 +1211,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
         }
     }
 
-  svar->name ("your_struct",
-              ACE_TRY_ENV);
+  svar->name ("your_struct"
+              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1220,8 +1220,8 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
                 ACE_TEXT ("\nStructDef::name (set)\n")));
 
   contents = svar->contents (CORBA::dk_all,
-                             0,
-                             ACE_TRY_ENV);
+                             0
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1237,7 +1237,7 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (ACE_TRY_ENV);
+      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1260,14 +1260,14 @@ Admin_Client::struct_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_UNUSED_ARG (tmp);
 #endif /* ACE_NDEBUG */
 
-  e_var->destroy (ACE_TRY_ENV);
+  e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  svar->destroy (ACE_TRY_ENV);
+  svar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -1282,19 +1282,19 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
   d_members[2] = CORBA::string_dup ("TWO");
   d_members[3] = CORBA::string_dup ("THREE");
 
-  CORBA::EnumDef_var d_var = 
+  CORBA::EnumDef_var d_var =
     this->repo_->create_enum ("IDL:disc_enum:1.0",
                               "disc_enum",
                               "1.0",
-                              d_members,
-                              ACE_TRY_ENV);
+                              d_members
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StructMemberSeq s_members (1);
   s_members.length (1);
   s_members[0].name = CORBA::string_dup ("string_in_struct");
-  s_members[0].type_def = this->repo_->create_string (6,
-                                                      ACE_TRY_ENV);
+  s_members[0].type_def = this->repo_->create_string (6
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -1302,19 +1302,19 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
     this->repo_->create_struct ("IDL:struct_in_union:1.0",
                                 "struct_in_union",
                                 "1.0",
-                                s_members,
-                                ACE_TRY_ENV);
+                                s_members
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::UnionMemberSeq u_members (4);
   u_members.length (4);
 
   u_members[0].name = CORBA::string_dup ("longval");
-  u_members[0].type_def = this->repo_->get_primitive (CORBA::pk_long,
-                                                      ACE_TRY_ENV);
+  u_members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
-  CORBA::TypeCode_var d_type = d_var->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var d_type = d_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   TAO_OutputCDR maker2;
   maker2.write_ulong (3);  // THREE
@@ -1325,8 +1325,8 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
   u_members[0].label = any2;
 
   u_members[1].name = CORBA::string_dup ("longval");
-  u_members[1].type_def = this->repo_->get_primitive (CORBA::pk_long,
-                                                      ACE_TRY_ENV);
+  u_members[1].type_def = this->repo_->get_primitive (CORBA::pk_long
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   TAO_OutputCDR maker0;
@@ -1350,25 +1350,25 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
   u_members[2].label = any1;
 
   u_members[3].name = CORBA::string_dup ("stringval");
-  u_members[3].type_def = this->repo_->create_string (17,
-                                                      ACE_TRY_ENV);
+  u_members[3].type_def = this->repo_->create_string (17
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   u_members[3].label <<= CORBA::Any::from_octet (0);   // default case (ONE)
 
-  CORBA::UnionDef_var u_var = 
+  CORBA::UnionDef_var u_var =
     this->repo_->create_union ("IDL:my_union:1.0",
                                "my_union",
                                "1.0",
                                d_var.in (),
-                               u_members,
-                               ACE_TRY_ENV);
+                               u_members
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var disc_tc = u_var->discriminator_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var disc_tc = u_var->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
    ACE_CHECK;
 
-  CORBA::ULong length = disc_tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong length = disc_tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1380,10 +1380,10 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (length == 4);
 
-  CORBA::TypeCode_var tc = u_var->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = u_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  length = tc->member_count (ACE_TRY_ENV);
+  length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1393,7 +1393,7 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (length == 3);
 
-  CORBA::Long slot = tc->default_index (ACE_TRY_ENV);
+  CORBA::Long slot = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1408,8 +1408,8 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      str = tc->member_name (i,
-                             ACE_TRY_ENV);
+      str = tc->member_name (i
+                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1421,8 +1421,8 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
       // Multiple labels for first member shifts index by 1.
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), u_members[i + 1].name));
 
-      CORBA::Any_var label = tc->member_label (i,
-                                               ACE_TRY_ENV);
+      CORBA::Any_var label = tc->member_label (i
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       TAO_InputCDR cdr (label->_tao_get_cdr ());
@@ -1456,16 +1456,16 @@ Admin_Client::union_test (CORBA::Environment &ACE_TRY_ENV)
       }
     }
 
-  u_var->destroy (ACE_TRY_ENV);
+  u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  s_var->destroy (ACE_TRY_ENV);
+  s_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  d_var->destroy (ACE_TRY_ENV);
+  d_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -1476,17 +1476,17 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   members.length (3);
 
   members[0].name = CORBA::string_dup ("ub_string");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string,
-                                                    ACE_TRY_ENV);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (ACE_TRY_ENV);
+  members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("bd_string");
-  members[1].type_def = this->repo_->create_string (5,
-                                                    ACE_TRY_ENV);
+  members[1].type_def = this->repo_->create_string (5
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[1].type = members[1].type_def->type (ACE_TRY_ENV);
+  members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::EnumMemberSeq e_members (2);
@@ -1499,27 +1499,27 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::EnumDef_var e_var = this->repo_->create_enum ("IDL:my_enum:1.0",
                                                        "my_enum",
                                                        "1.0",
-                                                       e_members,
-                                                       ACE_TRY_ENV);
+                                                       e_members
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
 
-  members[2].type = members[2].type_def->type (ACE_TRY_ENV);
+  members[2].type = members[2].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDef_var exvar =
     this->repo_->create_exception ("IDL:my_exception:1.0",
                                    "my_exception",
                                    "1.0",
-                                   members,
-                                   ACE_TRY_ENV);
+                                   members
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var tc = exvar->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = exvar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1534,7 +1534,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = tc->member_name (i, ACE_TRY_ENV);
+      str = tc->member_name (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1546,7 +1546,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name));
     }
 
-  CORBA::Contained::Description_var desc = exvar->describe (ACE_TRY_ENV);
+  CORBA::Contained::Description_var desc = exvar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDescription *ed;
@@ -1582,24 +1582,24 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long,
-                                                    ACE_TRY_ENV);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (ACE_TRY_ENV);
+  members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("array_mem");
-  CORBA::ArrayDef_ptr a_ptr = 
+  CORBA::ArrayDef_ptr a_ptr =
     this->repo_->create_array (5,
-                               members[0].type_def.in (),
-                               ACE_TRY_ENV);
+                               members[0].type_def.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[1].type_def = a_ptr;
-  members[1].type = members[1].type_def->type (ACE_TRY_ENV);
+  members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  exvar->members (members,
-                  ACE_TRY_ENV);
+  exvar->members (members
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1615,11 +1615,11 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::EnumDef_var e_def_var = exvar->create_enum ("IDL:my_def_enum:1.0",
                                                      "my_enum",
                                                      "1.0",
-                                                     def_members,
-                                                     ACE_TRY_ENV);
+                                                     def_members
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq_var out_members = exvar->members (ACE_TRY_ENV);
+  CORBA::StructMemberSeq_var out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   length = out_members->length ();
 
@@ -1637,14 +1637,14 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
         ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name));
     }
 
-  a_ptr->destroy (ACE_TRY_ENV);
+  a_ptr->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\nArrayDef::destroy\n\n")));
 
-  out_members = exvar->members (ACE_TRY_ENV);
+  out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   length = out_members->length ();
 
@@ -1662,11 +1662,11 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
         ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name));
     }
 
-  CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum",
-                                                  ACE_TRY_ENV);
+  CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum"
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (ACE_TRY_ENV);
+  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1676,11 +1676,11 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum"));
 
-  fox = exvar->lookup ("my_enum",
-                       ACE_TRY_ENV);
+  fox = exvar->lookup ("my_enum"
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (ACE_TRY_ENV);
+  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1691,8 +1691,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum"));
 
   CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
-                                                            0,
-                                                            ACE_TRY_ENV);
+                                                            0
+                                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1705,8 +1705,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (length == 2);
 
   contents = exvar->contents (CORBA::dk_all,
-                              0,
-                              ACE_TRY_ENV);
+                              0
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1720,7 +1720,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (ACE_TRY_ENV);
+      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1738,8 +1738,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   contents = this->repo_->lookup_name ("my_enum",
                                        -1,
                                        CORBA::dk_all,
-                                       0,
-                                       ACE_TRY_ENV);
+                                       0
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1753,7 +1753,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (ACE_TRY_ENV);
+      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1770,8 +1770,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Container::DescriptionSeq_var cont_desc =
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
-                                    -1,
-                                    ACE_TRY_ENV);
+                                    -1
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cont_desc->length ();
@@ -1792,7 +1792,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
           cont_desc[i].value >>= ed;
           CORBA::TypeCode_ptr tc = ed->type.in ();
 
-          length = tc->member_count (ACE_TRY_ENV);
+          length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (this->debug_)
@@ -1818,7 +1818,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
           cont_desc[i].value >>= td;
           CORBA::TypeCode_ptr tc = td->type.in ();
 
-          length = tc->member_count (ACE_TRY_ENV);
+          length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (this->debug_)
@@ -1841,8 +1841,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
         }
     }
 
-  exvar->name ("your_exception",
-               ACE_TRY_ENV);
+  exvar->name ("your_exception"
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1850,8 +1850,8 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
                 ACE_TEXT ("\nExceptionDef::name (set)\n\n")));
 
   contents = exvar->contents (CORBA::dk_all,
-                              0,
-                              ACE_TRY_ENV);
+                              0
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1859,7 +1859,7 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (ACE_TRY_ENV);
+      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1878,22 +1878,22 @@ Admin_Client::exception_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_UNUSED_ARG (tmp);
 #endif /* ACE_NDEBUG */
 
-  e_var->destroy (ACE_TRY_ENV);
+  e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  exvar->destroy (ACE_TRY_ENV);
+  exvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT ("\n============== CONSTANT TEST ==============\n\n")
     ));
 
-  CORBA::IDLType_var ivar = this->repo_->get_primitive (CORBA::pk_string,
-                                                        ACE_TRY_ENV);
+  CORBA::IDLType_var ivar = this->repo_->get_primitive (CORBA::pk_string
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Any any;
@@ -1905,13 +1905,13 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
                                   "my_constant",
                                   "1.0",
                                   ivar.in (),
-                                  any,
-                                  ACE_TRY_ENV);
+                                  any
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var tc = cvar->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = cvar->type (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;
 
   if (this->debug_)
@@ -1921,9 +1921,9 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (kind == CORBA::tk_string);
 
-  CORBA::IDLType_var tdef = cvar->type_def (ACE_TRY_ENV);
+  CORBA::IDLType_var tdef = cvar->type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::DefinitionKind def_kind = tdef->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1934,7 +1934,7 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (def_kind == CORBA::dk_Primitive);
 
   CORBA::Any_var out_any;
-  out_any = cvar->value (ACE_TRY_ENV);
+  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *out_s;
@@ -1947,17 +1947,17 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (!ACE_OS::strcmp (out_s, s));
 
-  ivar = this->repo_->get_primitive (CORBA::pk_double,
-                                     ACE_TRY_ENV);
+  ivar = this->repo_->get_primitive (CORBA::pk_double
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  cvar->type_def (ivar.in (),
-                  ACE_TRY_ENV);
+  cvar->type_def (ivar.in ()
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Double double_val = -1223.42256;
   any <<= double_val;
-  cvar->value (any,
-               ACE_TRY_ENV);
+  cvar->value (any
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1965,7 +1965,7 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
                 ACE_TEXT ("\nConstantDef::type_def (set)\n")
                 ACE_TEXT ("ConstantDef::value (set)\n")));
 
-  out_any = cvar->value (ACE_TRY_ENV);
+  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Double out_double_val;
@@ -1978,10 +1978,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (out_double_val == double_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_short,
-                                     ACE_TRY_ENV);
-  cvar->type_def (ivar.in (),
-                  ACE_TRY_ENV);
+  ivar = this->repo_->get_primitive (CORBA::pk_short
+                                     TAO_ENV_ARG_PARAMETER);
+  cvar->type_def (ivar.in ()
+                  TAO_ENV_ARG_PARAMETER);
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
@@ -1991,10 +1991,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Short short_val = -65;
   any <<= short_val;
 
-  cvar->value (any,
-               ACE_TRY_ENV);
+  cvar->value (any
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  out_any = cvar->value (ACE_TRY_ENV);
+  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Short out_short_val;
@@ -2007,11 +2007,11 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (out_short_val == short_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_float,
-                                     ACE_TRY_ENV);
+  ivar = this->repo_->get_primitive (CORBA::pk_float
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  cvar->type_def (ivar.in (),
-                  ACE_TRY_ENV);
+  cvar->type_def (ivar.in ()
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2022,10 +2022,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Float float_val = 2.33f;
   any <<= float_val;
 
-  cvar->value (any,
-               ACE_TRY_ENV);
+  cvar->value (any
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  out_any = cvar->value (ACE_TRY_ENV);
+  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Float out_float_val;
@@ -2038,11 +2038,11 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (out_float_val == float_val);
 
-  ivar = this->repo_->get_primitive (CORBA::pk_ulonglong,
-                                     ACE_TRY_ENV);
+  ivar = this->repo_->get_primitive (CORBA::pk_ulonglong
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  cvar->type_def (ivar.in (),
-                  ACE_TRY_ENV);
+  cvar->type_def (ivar.in ()
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2053,10 +2053,10 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::ULongLong ull_val = 1234567890;
   any <<= ull_val;
 
-  cvar->value (any,
-               ACE_TRY_ENV);
+  cvar->value (any
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  out_any = cvar->value (ACE_TRY_ENV);
+  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULongLong out_ull_val;
@@ -2077,12 +2077,12 @@ Admin_Client::constant_test (CORBA::Environment &ACE_TRY_ENV)
     }
   ACE_ASSERT (out_ull_val == ull_val);
 
-  cvar->destroy (ACE_TRY_ENV);
+  cvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2098,13 +2098,13 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
     this->repo_->create_interface ("IDL:gp_iface:1.0",
                                    "gp_iface",
                                    "1.0",
-                                   in_bases,
-                                   ACE_TRY_ENV);
+                                   in_bases
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::PrimitiveDef_var p_long = 
-    this->repo_->get_primitive (CORBA::pk_long,
-                                ACE_TRY_ENV);
+  CORBA::PrimitiveDef_var p_long =
+    this->repo_->get_primitive (CORBA::pk_long
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::AttributeDef_var gp_attr =
@@ -2112,8 +2112,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
                                "gp_attr",
                                "1.0",
                                p_long.in (),
-                               CORBA::ATTR_NORMAL,
-                               ACE_TRY_ENV);
+                               CORBA::ATTR_NORMAL
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   in_bases.length (1);
@@ -2123,12 +2123,12 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
     this->repo_->create_interface ("IDL:p_iface:1.0",
                                    "p_iface",
                                    "1.0",
-                                   in_bases,
-                                   ACE_TRY_ENV);
+                                   in_bases
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StringDef_var p_string = this->repo_->create_string (5,
-                                                              ACE_TRY_ENV);
+  CORBA::StringDef_var p_string = this->repo_->create_string (5
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::AttributeDef_var p_attr =
@@ -2136,8 +2136,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
                               "p_attr",
                               "1.0",
                               p_string.in (),
-                              CORBA::ATTR_READONLY,
-                              ACE_TRY_ENV);
+                              CORBA::ATTR_READONLY
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *names[] = {"inarg", "inoutarg", "outarg"};
@@ -2158,8 +2158,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
     this->repo_->create_exception ("IDL:if_exception:1.0",
                                    "if_exception",
                                    "1.0",
-                                   members,
-                                   ACE_TRY_ENV);
+                                   members
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDefSeq get_seq (1);
@@ -2173,7 +2173,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
     {
       par_seq[i].name = names[i];
       par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
-      par_seq[i].type = p_long->type (ACE_TRY_ENV);
+      par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       par_seq[i].mode = modes[i];
       con_seq[i] = contexts[i];
@@ -2187,11 +2187,11 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
                               CORBA::OP_NORMAL,
                               par_seq,
                               get_seq,
-                              con_seq,
-                              ACE_TRY_ENV);
+                              con_seq
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Contained::Description_var desc = p_op->describe (ACE_TRY_ENV);
+  CORBA::Contained::Description_var desc = p_op->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::OperationDescription *od;
@@ -2206,7 +2206,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (!ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0"));
 
   CORBA::TypeCode_var result = od->result;
-  CORBA::TCKind kind = result->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = result->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2252,8 +2252,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
       ACE_ASSERT (od->parameters[i].mode == modes[i]);
     }
 
-  CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0",
-                                       ACE_TRY_ENV);
+  CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0"
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2263,8 +2263,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (is_it == 1);
 
-  is_it = p_ivar->is_a ("IDL:gp_iface:1.0",
-                        ACE_TRY_ENV);
+  is_it = p_ivar->is_a ("IDL:gp_iface:1.0"
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2274,8 +2274,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (is_it == 1);
 
-  is_it = gp_ivar->is_a ("IDL:p_iface:1.0",
-                         ACE_TRY_ENV);
+  is_it = gp_ivar->is_a ("IDL:p_iface:1.0"
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2286,10 +2286,10 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (is_it == 0);
 
   CORBA::InterfaceDef::FullInterfaceDescription_var fifd =
-    p_ivar->describe_interface (ACE_TRY_ENV);
+    p_ivar->describe_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = fifd->type->id (ACE_TRY_ENV);
+  CORBA::String_var str = fifd->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2374,11 +2374,11 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
     this->repo_->create_interface ("IDL:iface:1.0",
                                    "iface",
                                    "1.0",
-                                   in_bases,
-                                   ACE_TRY_ENV);
+                                   in_bases
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  desc = ivar->describe (ACE_TRY_ENV);
+  desc = ivar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::InterfaceDescription *ifd;
@@ -2399,7 +2399,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
   for (i = 0; i < length; i++)
     {
       base_iface_id = ifd->base_interfaces[i].in ();
-  
+
       if (this->debug_)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("InterfaceDef::describe::")
@@ -2408,8 +2408,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
                     base_iface_id));
     }
 
-  CORBA::InterfaceDefSeq_var out_bases = 
-    ivar->base_interfaces (ACE_TRY_ENV);
+  CORBA::InterfaceDefSeq_var out_bases =
+    ivar->base_interfaces (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_bases->length ();
@@ -2423,7 +2423,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = out_bases[i]->name (ACE_TRY_ENV);
+      str = out_bases[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2436,8 +2436,8 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
     }
 
   CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all,
-                                                     0,
-                                                     ACE_TRY_ENV);
+                                                     0
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -2451,7 +2451,7 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->name (ACE_TRY_ENV);
+      str = contents[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2460,14 +2460,14 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
                     i,
                     str.in ()));
 
-      CORBA::Container_var cr = contents[i]->defined_in (ACE_TRY_ENV);
+      CORBA::Container_var cr = contents[i]->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Contained_var cd = CORBA::Contained::_narrow (cr.in (),
-                                                           ACE_TRY_ENV);
+      CORBA::Contained_var cd = CORBA::Contained::_narrow (cr.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      str = cd->name (ACE_TRY_ENV);
+      str = cd->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2481,18 +2481,18 @@ Admin_Client::interface_test (CORBA::Environment &ACE_TRY_ENV)
                   || !ACE_OS::strcmp (str.in (), "gp_iface"));
     }
 
-  ex_var->destroy (ACE_TRY_ENV);
+  ex_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  ivar->destroy (ACE_TRY_ENV);
+  ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  gp_ivar->destroy (ACE_TRY_ENV);
+  gp_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  p_ivar->destroy (ACE_TRY_ENV);
+  p_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2508,8 +2508,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::EnumDef_var e_var = this->repo_->create_enum ("IDL:o_enum:1.0",
                                                        "o_enum",
                                                        "1.0",
-                                                       e_members,
-                                                       ACE_TRY_ENV);
+                                                       e_members
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   e_members[0] = CORBA::string_dup ("TEN");
@@ -2518,8 +2518,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::EnumDef_var e_var2 = this->repo_->create_enum ("IDL:i_enum:1.0",
                                                         "i_enum",
                                                         "1.0",
-                                                        e_members,
-                                                        ACE_TRY_ENV);
+                                                        e_members
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StructMemberSeq s_members (2);
@@ -2528,23 +2528,23 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
   const char *s_names[] = {"s_string", "s_enum"};
 
   s_members[0].name = s_names[0];
-  s_members[0].type_def = this->repo_->get_primitive (CORBA::pk_string,
-                                                      ACE_TRY_ENV);
+  s_members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  s_members[0].type = s_members[0].type_def->type (ACE_TRY_ENV);
+  s_members[0].type = s_members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   s_members[1].name = s_names[1];
   s_members[1].type_def = CORBA::EnumDef::_duplicate (e_var2.in ());
-  s_members[1].type = s_members[1].type_def->type (ACE_TRY_ENV);
+  s_members[1].type = s_members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructDef_var s_var = 
+  CORBA::StructDef_var s_var =
     this->repo_->create_struct ("IDL:o_struct:1.0",
                                 "o_struct",
                                 "1.0",
-                                s_members,
-                                ACE_TRY_ENV);
+                                s_members
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::UnionMemberSeq u_members (2);
@@ -2554,7 +2554,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   u_members[0].name = u_names[0];
   u_members[0].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
-  u_members[0].type = e_var->type (ACE_TRY_ENV);
+  u_members[0].type = e_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::Long label = 0;
   CORBA::Any any;
@@ -2563,27 +2563,27 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   u_members[1].name = u_names[1];
   u_members[1].type_def = CORBA::StructDef::_duplicate (s_var.in ());
-  u_members[1].type = s_var->type (ACE_TRY_ENV);
+  u_members[1].type = s_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   label = 1;
   any <<= label;
   u_members[1].label = any;
 
-  CORBA::PrimitiveDef_var d_var = 
-    this->repo_->get_primitive (CORBA::pk_long,
-                                ACE_TRY_ENV);
+  CORBA::PrimitiveDef_var d_var =
+    this->repo_->get_primitive (CORBA::pk_long
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::UnionDef_var u_var = 
+  CORBA::UnionDef_var u_var =
     this->repo_->create_union ("IDL:the_union:1.0",
                                "the_union",
                                "1.0",
                                d_var.in (),
-                               u_members,
-                               ACE_TRY_ENV);
+                               u_members
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::UnionMemberSeq_var out_u_members = u_var->members (ACE_TRY_ENV);
+  CORBA::UnionMemberSeq_var out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = out_u_members->length ();
@@ -2612,8 +2612,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
     }
 
   CORBA::ContainedSeq_var out_contents = u_var->contents (CORBA::dk_all,
-                                                          1,
-                                                          ACE_TRY_ENV);
+                                                          1
+                                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2627,15 +2627,15 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   e_var->move (u_var.in (),
                u_names[0],
-               "1.0",
-               ACE_TRY_ENV);
+               "1.0"
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\nEnumDef::move (into union)\n")));
 
-  out_u_members = u_var->members (ACE_TRY_ENV);
+  out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_u_members->length ();
@@ -2684,8 +2684,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
     }
 
   out_contents = u_var->contents (CORBA::dk_all,
-                                  1,
-                                  ACE_TRY_ENV);
+                                  1
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2701,7 +2701,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = out_contents[i]->absolute_name (ACE_TRY_ENV);
+      str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2726,14 +2726,14 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   e_var2->move (s_var.in (),
                 s_names[1],
-                "1.0",
-                ACE_TRY_ENV);
+                "1.0"
+                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   s_var->move (u_var.in (),
                u_names[1],
-               "1.0",
-                ACE_TRY_ENV);
+               "1.0"
+                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2742,8 +2742,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
                 ACE_TEXT ("StructDef::move (into union)\n")));
 
   out_contents = this->repo_->contents (CORBA::dk_all,
-                                        1,
-                                        ACE_TRY_ENV);
+                                        1
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2755,7 +2755,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_ASSERT (length == 1);
 
-  out_u_members = u_var->members (ACE_TRY_ENV);
+  out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_u_members->length ();
@@ -2781,8 +2781,8 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
     }
 
   out_contents = u_var->contents (CORBA::dk_all,
-                                  1,
-                                  ACE_TRY_ENV);
+                                  1
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2799,7 +2799,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = out_contents[i]->absolute_name (ACE_TRY_ENV);
+      str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2813,15 +2813,15 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
       if (i == 1)
         {
-          s_tmp = CORBA::StructDef::_narrow (out_contents[i],
-                                             ACE_TRY_ENV);
+          s_tmp = CORBA::StructDef::_narrow (out_contents[i]
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
   out_contents = s_tmp->contents (CORBA::dk_all,
-                                  0,
-                                  ACE_TRY_ENV);
+                                  0
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2837,7 +2837,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = out_contents[i]->absolute_name (ACE_TRY_ENV);
+      str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2856,7 +2856,7 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_UNUSED_ARG (base);
 #endif /* ACE_NDEBUG */
 
-  CORBA::StructMemberSeq_var out_s_members = s_tmp->members (ACE_TRY_ENV);
+  CORBA::StructMemberSeq_var out_s_members = s_tmp->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_s_members->length ();
@@ -2881,12 +2881,12 @@ Admin_Client::move_test (CORBA::Environment &ACE_TRY_ENV)
       ACE_ASSERT (!ACE_OS::strcmp (tmp, s_names[i]));
    }
 
-  u_var->destroy (ACE_TRY_ENV);
+  u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
+Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2895,60 +2895,60 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::ModuleDef_var outer = this->repo_->create_module ("IDL:outer:1.0",
                                                            "outer",
-                                                           "1.0",
-                                                           ACE_TRY_ENV);
+                                                           "1.0"
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ModuleDef_var middle = outer->create_module ("IDL:middle:1.0",
                                                       "middle",
-                                                      "1.0",
-                                                      ACE_TRY_ENV);
+                                                      "1.0"
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ModuleDef_var inner = middle->create_module ("IDL:inner:1.0",
                                                       "inner",
-                                                      "1.0",
-                                                      ACE_TRY_ENV);
+                                                      "1.0"
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::InterfaceDefSeq in_bases (1);
   in_bases.length (0);
 
-  CORBA::InterfaceDef_var p_iface = 
+  CORBA::InterfaceDef_var p_iface =
     outer->create_interface ("IDL:p_iface:1.0",
                              "p_iface",
                              "1.0",
-                             in_bases,
-                             ACE_TRY_ENV);
+                             in_bases
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   in_bases.length (1);
   in_bases[0] = CORBA::InterfaceDef::_duplicate (p_iface.in ());
 
-  CORBA::InterfaceDef_var iface = 
+  CORBA::InterfaceDef_var iface =
     inner->create_interface ("IDL:iface:1.0",
                              "iface",
                              "1.0",
-                             in_bases,
-                             ACE_TRY_ENV);
+                             in_bases
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::PrimitiveDef_var p_void = 
-    this->repo_->get_primitive (CORBA::pk_void,
-                                ACE_TRY_ENV);
+  CORBA::PrimitiveDef_var p_void =
+    this->repo_->get_primitive (CORBA::pk_void
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::PrimitiveDef_var p_long = 
-    this->repo_->get_primitive (CORBA::pk_long,
-                                ACE_TRY_ENV);
+  CORBA::PrimitiveDef_var p_long =
+    this->repo_->get_primitive (CORBA::pk_long
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::AttributeDef_var attr = 
+  CORBA::AttributeDef_var attr =
     p_iface->create_attribute ("IDL:iface/attr:1.0",
                                "attr",
                                "1.0",
                                p_void.in (),
-                               CORBA::ATTR_NORMAL,
-                               ACE_TRY_ENV);
+                               CORBA::ATTR_NORMAL
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = 3;
@@ -2967,7 +2967,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
     {
       par_seq[i].name = p_names[i];
       par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
-      par_seq[i].type = p_long->type (ACE_TRY_ENV);
+      par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       par_seq[i].mode = ACE_static_cast (CORBA::ParameterMode, i);
 
@@ -2981,15 +2981,15 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
     this->repo_->create_exception ("IDL:if_exception:1.0",
                                    "if_exception",
                                    "1.0",
-                                   members,
-                                   ACE_TRY_ENV);
+                                   members
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDefSeq get_seq (1);
   get_seq.length (1);
   get_seq[0] = CORBA::ExceptionDef::_duplicate (ex_var.in ());
 
-  CORBA::OperationDef_var op = 
+  CORBA::OperationDef_var op =
     iface->create_operation ("IDL:iface/op:1.0",
                              "op",
                              "1.0",
@@ -2997,18 +2997,18 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
                              CORBA::OP_NORMAL,
                              par_seq,
                              get_seq,
-                             con_seq,
-                             ACE_TRY_ENV);
+                             con_seq
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str;
 
   CORBA::Contained_var result =
-    inner->lookup ("::outer::middle::inner::iface::op",
-                   ACE_TRY_ENV);
+    inner->lookup ("::outer::middle::inner::iface::op"
+                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = result->absolute_name (ACE_TRY_ENV);
+  str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -3021,11 +3021,11 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
   ACE_ASSERT (!ACE_OS::strcmp (str.in (),
                                "::outer::middle::inner::iface::op"));
 
-  result = middle->lookup ("inner::iface::op",
-                           ACE_TRY_ENV);
+  result = middle->lookup ("inner::iface::op"
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = result->absolute_name (ACE_TRY_ENV);
+  str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -3041,8 +3041,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
   CORBA::ContainedSeq_var cseq = this->repo_->lookup_name ("op",
                                                            -1,
                                                            CORBA::dk_all,
-                                                           0,
-                                                           ACE_TRY_ENV);
+                                                           0
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cseq->length ();
@@ -3056,7 +3056,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = cseq[i]->absolute_name (ACE_TRY_ENV);
+      str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -3074,8 +3074,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
   cseq = middle->lookup_name ("attr",
                               3,
                               CORBA::dk_Attribute,
-                              0,
-                              ACE_TRY_ENV);
+                              0
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cseq->length ();
@@ -3089,7 +3089,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = cseq[i]->absolute_name (ACE_TRY_ENV);
+      str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -3105,8 +3105,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
 
   iface->move (outer.in (),
                "iface",
-               "1.0",
-               ACE_TRY_ENV);
+               "1.0"
+               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -3116,8 +3116,8 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
   cseq = this->repo_->lookup_name ("op",
                                    -1,
                                    CORBA::dk_all,
-                                   0,
-                                   ACE_TRY_ENV);
+                                   0
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cseq->length ();
@@ -3131,7 +3131,7 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; i++)
     {
-      str = cseq[i]->absolute_name (ACE_TRY_ENV);
+      str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -3145,6 +3145,6 @@ Admin_Client::module_test (CORBA::Environment &ACE_TRY_ENV)
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::outer::iface::op"));
     }
 
-  outer->destroy (ACE_TRY_ENV);
+  outer->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index fea922f6372..8a3f9375f72 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -24,8 +24,8 @@ Ptest::init (int argc,
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int retval = this->parse_args (argc,
@@ -35,8 +35,8 @@ Ptest::init (int argc,
         return retval;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("InterfaceRepository",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("InterfaceRepository"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -50,8 +50,8 @@ Ptest::init (int argc,
         }
 
       this->repo_ =
-        CORBA::Repository::_narrow (object.in (),
-                                    ACE_TRY_ENV);
+        CORBA::Repository::_narrow (object.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->repo_.in ()))
@@ -75,17 +75,17 @@ Ptest::init (int argc,
 int
 Ptest::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (this->query_ == 1)
         {
-          this->query (ACE_TRY_ENV);
+          this->query (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
-          this->populate (ACE_TRY_ENV);
+          this->populate (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -131,7 +131,7 @@ Ptest::parse_args (int argc,
 }
 
 void
-Ptest::populate (CORBA::Environment &ACE_TRY_ENV)
+Ptest::populate (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -141,26 +141,26 @@ Ptest::populate (CORBA::Environment &ACE_TRY_ENV)
   CORBA::StructMemberSeq members (2);
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
-  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long,
-                                                    ACE_TRY_ENV);
+  members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (ACE_TRY_ENV);
+  members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("array_mem");
   members[1].type_def = this->repo_->create_array (5,
-                                                   members[0].type_def.in (),
-                                                   ACE_TRY_ENV);
+                                                   members[0].type_def.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[1].type = members[1].type_def->type (ACE_TRY_ENV);
+  members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
   CORBA::StructDef_var svar = this->repo_->create_struct ("IDL:my_struct:1.0",
                                                           "my_struct",
                                                           "1.0",
-                                                          members,
-                                                          ACE_TRY_ENV);
+                                                          members
+                                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::EnumMemberSeq def_members (2);
@@ -172,13 +172,13 @@ Ptest::populate (CORBA::Environment &ACE_TRY_ENV)
   CORBA::EnumDef_var e_def_var = svar->create_enum ("IDL:my_def_enum:1.0",
                                                     "my_enum",
                                                     "1.0",
-                                                    def_members,
-                                                    ACE_TRY_ENV);
+                                                    def_members
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Ptest::query (CORBA::Environment &ACE_TRY_ENV)
+Ptest::query (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -193,8 +193,8 @@ Ptest::query (CORBA::Environment &ACE_TRY_ENV)
   };
 
   CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
-                                                            0,
-                                                            ACE_TRY_ENV);
+                                                            0
+                                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = contents->length ();
@@ -208,13 +208,13 @@ Ptest::query (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::ULong i = 0;
 
-  CORBA::StructDef_var svar = CORBA::StructDef::_narrow (contents[i],
-                                                         ACE_TRY_ENV);
+  CORBA::StructDef_var svar = CORBA::StructDef::_narrow (contents[i]
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (svar.in ()));
 
-  CORBA::StructMemberSeq_var out_members = svar->members (ACE_TRY_ENV);
+  CORBA::StructMemberSeq_var out_members = svar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_members->length ();
@@ -265,6 +265,6 @@ Ptest::query (CORBA::Environment &ACE_TRY_ENV)
   ACE_UNUSED_ARG (members);
 #endif /* ACE_NDEBUG */
 
-  svar->destroy (ACE_TRY_ENV);
+  svar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index c75da35c1b0..b1b0d4dfdee 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -145,7 +145,7 @@ NContextExt_Client_i::get_name ()
 }
 
 int
-NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
+NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY_EX (OuterBlock)
@@ -160,8 +160,8 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
       // Get the stringified form of the name
        CORBA::String_var str_name =
-        this->naming_context_->to_string (name,
-                                          ACE_TRY_ENV);
+        this->naming_context_->to_string (name
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       CORBA::Object_var factory_object;
@@ -170,8 +170,8 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
         {
           // Resolve the name using the stringified form of the name
           factory_object =
-            this->naming_context_->resolve_str (str_name.in (),
-                                                ACE_TRY_ENV);
+            this->naming_context_->resolve_str (str_name.in ()
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (InnerBlock);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -181,7 +181,7 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
       // Narrow
       Web_Server::Iterator_Factory_var factory =
-        Web_Server::Iterator_Factory::_narrow (factory_object.in (), ACE_TRY_ENV);
+        Web_Server::Iterator_Factory::_narrow (factory_object.in () TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK_EX (OuterBlock);
 
@@ -191,15 +191,15 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
       this->naming_context_->list (2,
                                    bindings_list.out (),
-                                   iter.out (),
-                                   ACE_TRY_ENV);
+                                   iter.out ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       // Convert the stringified name back as CosNaming::Name and print
       // them out.
       CosNaming::Name *nam =
-        this->naming_context_->to_name (str_name.in (),
-                                        ACE_TRY_ENV);
+        this->naming_context_->to_name (str_name.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       // Declare a CosNaming::Name variable and assign length to it.
@@ -223,8 +223,8 @@ NContextExt_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
       CORBA::String_var obj_name = get_name ();
 
       CORBA::String_var url_string = this->naming_context_->to_url (address.in (),
-                                                                    obj_name.in(),
-                                                                    ACE_TRY_ENV);
+                                                                    obj_name.in()
+                                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       if (this->view_ == 0)
@@ -263,7 +263,7 @@ NContextExt_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -271,8 +271,8 @@ NContextExt_Client_i::init (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (this->argc_,
                          this->argv_,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -281,7 +281,7 @@ NContextExt_Client_i::init (int argc, char **argv)
 
       // Get a reference to the Naming Service
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_context_object.in ()))
@@ -291,8 +291,8 @@ NContextExt_Client_i::init (int argc, char **argv)
 
       // Narrow to get the correct reference
       this->naming_context_ =
-        CosNaming::NamingContextExt::_narrow (naming_context_object.in (),
-                                              ACE_TRY_ENV);
+        CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->naming_context_.in ()))
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp
index 22c9c9361c3..7f641e692a6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp
@@ -17,8 +17,8 @@ Hash_ReplicaControl::Hash_ReplicaControl (void)
 
 void
 Hash_ReplicaControl::init (CORBA::ORB_ptr orb,
-                           LoadBalancing::LoadBalancer_ptr balancer,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           LoadBalancing::LoadBalancer_ptr balancer
+                           TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Hash_ReplicaControl::init\n"));
@@ -28,21 +28,21 @@ Hash_ReplicaControl::init (CORBA::ORB_ptr orb,
   reactor->schedule_timer (&this->adapter_, 0, interval, restart);
 
   LoadBalancing::ReplicaControl_var control =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var replica =
-    this->replica_._this (ACE_TRY_ENV);
+    this->replica_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->group_ =
-    balancer->group_identity (ACE_TRY_ENV);
+    balancer->group_identity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_ =
     balancer->connect (control.in (),
-                       replica.in (),
-                       ACE_TRY_ENV);
+                       replica.in ()
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -66,8 +66,8 @@ Hash_ReplicaControl::handle_timeout (const ACE_Time_Value &,
 
   ACE_TRY_NEW_ENV
     {
-      this->proxy_->current_load (this->current_load_,
-                                  ACE_TRY_ENV);
+      this->proxy_->current_load (this->current_load_
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Current_Load = %f\n", this->current_load_));
     }
@@ -86,7 +86,7 @@ Hash_ReplicaControl::request_received (void)
 
 
 void
-Hash_ReplicaControl::request_rejected (CORBA::Environment &ACE_TRY_ENV)
+Hash_ReplicaControl::request_rejected (TAO_ENV_SINGLE_ARG_DECL)
 {
   // @@ Ossama: notice how we reject a single request.  Maybe the
   // advisory should include how many are we supposed to shed?
@@ -97,8 +97,8 @@ Hash_ReplicaControl::request_rejected (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Hash_ReplicaControl::high_load_advisory (CORBA::Environment &
-                                         /* ACE_TRY_ENV */)
+Hash_ReplicaControl::high_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+                                         /* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Notify the replica that it should reject all requests.
@@ -107,8 +107,8 @@ Hash_ReplicaControl::high_load_advisory (CORBA::Environment &
 }
 
 void
-Hash_ReplicaControl::nominal_load_advisory (CORBA::Environment &
-                                            /* ACE_TRY_ENV */)
+Hash_ReplicaControl::nominal_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+                                            /* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Notify the replica that it should once again accept requests.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h
index 912e5e550f6..bda5d30bf60 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h
@@ -34,8 +34,8 @@ public:
   // Constructor.
 
   void init (CORBA::ORB_ptr the_orb,
-             LoadBalancing::LoadBalancer_ptr balancer,
-             CORBA::Environment &ACE_TRY_ENV);
+             LoadBalancing::LoadBalancer_ptr balancer
+             TAO_ENV_ARG_DECL);
 
   int handle_timeout (const ACE_Time_Value &current_time,
                       const void *arg);
@@ -44,13 +44,13 @@ public:
   void request_received (void);
   // A request has been received
 
-  void request_rejected (CORBA::Environment &ACE_TRY_ENV);
+  void request_rejected (TAO_ENV_SINGLE_ARG_DECL);
   // A request has been rejected, take appropriate action
 
-  virtual void high_load_advisory (CORBA::Environment &ACE_TRY_ENV)
+  virtual void high_load_advisory (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void nominal_load_advisory (CORBA::Environment &ACE_TRY_ENV)
+  virtual void nominal_load_advisory (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Object_ptr replica (void);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp
index ecc7970f126..57a4af6f05c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp
@@ -14,13 +14,13 @@ Hash_Replica_Impl::Hash_Replica_Impl (Hash_ReplicaControl *control)
 }
 
 CORBA::ULong
-Hash_Replica_Impl::do_hash (const char *str,
-                            CORBA::Environment &ACE_TRY_ENV)
+Hash_Replica_Impl::do_hash (const char *str
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reject_requests_)
     {
-      this->control_->request_rejected (ACE_TRY_ENV);
+      this->control_->request_rejected (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 0;
     }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h
index fd7dff9fc35..7fec1f0db51 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h
@@ -27,8 +27,8 @@ public:
   Hash_Replica_Impl (Hash_ReplicaControl *control);
   // Constructor
 
-  virtual CORBA::ULong do_hash (const char * str,
-                                CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong do_hash (const char * str
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Perform a simple hashing operation on the input string <str> and
   // return the hashed string <hash_str>.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/client.cpp
index d4c936ef07c..38cde7ddf4c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/client.cpp
@@ -11,18 +11,18 @@
 
 static void run_test (int iterations,
                       int timeout,
-                      Hash_Replica_ptr hasher,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      Hash_Replica_ptr hasher
+                      TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *ior = "file://test.ior";
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
           }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Hash_Replica_var hasher =
-        Hash_Replica::_unchecked_narrow (obj.in (),
-                                         ACE_TRY_ENV);
+        Hash_Replica::_unchecked_narrow (obj.in ()
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hasher.in ()))
@@ -74,10 +74,10 @@ main (int argc, char *argv[])
                            ACE_TEXT ("Invalid replica IOR.\n")),
                           -1);
 
-      run_test (iterations, timeout, hasher.in (), ACE_TRY_ENV);
+      run_test (iterations, timeout, hasher.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -92,8 +92,8 @@ main (int argc, char *argv[])
 void
 run_test (int iterations,
           int timeout,
-          Hash_Replica_ptr hasher,
-          CORBA::Environment &ACE_TRY_ENV)
+          Hash_Replica_ptr hasher
+          TAO_ENV_ARG_DECL)
 {
   ACE_Time_Value tv (0, timeout * 1000);
   ACE_Throughput_Stats stats;
@@ -103,7 +103,7 @@ run_test (int iterations,
     {
       ACE_UINT64 call_start = ACE_OS::gethrtime ();
 
-      hasher->do_hash ("This is a silly test", ACE_TRY_ENV);
+      hasher->do_hash ("This is a silly test" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       ACE_UINT64 end = ACE_OS::gethrtime ();
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
index 1526a5e1343..45087ff4c62 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
@@ -9,12 +9,12 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *balancer_ior = "file://test.ior";
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
           }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,23 +52,23 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->string_to_object (balancer_ior, ACE_TRY_ENV);
+        orb->string_to_object (balancer_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       LoadBalancing::LoadBalancer_var load_balancer =
-        LoadBalancing::LoadBalancer::_narrow (obj.in (),
-                                              ACE_TRY_ENV);
+        LoadBalancing::LoadBalancer::_narrow (obj.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (load_balancer.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           -1);
 
       CORBA::Object_var group =
-        load_balancer->group_identity (ACE_TRY_ENV);
+        load_balancer->group_identity (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (group.in (), ACE_TRY_ENV);
+        orb->object_to_string (group.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *ior = ACE_OS::fopen (ior_output, "w");
@@ -90,27 +90,27 @@ main (int argc, char *argv[])
 
       Hash_ReplicaControl control;
       control.init (orb.in (),
-                    load_balancer.in (),
-                    ACE_TRY_ENV);
+                    load_balancer.in ()
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #ifndef ACE_WIN32
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       while (1)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           control.handle_timeout (tv, 0);
         }
 #endif
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp
index 2c9446e889d..e3402c75393 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp
@@ -91,10 +91,10 @@ AdminProperties_Test::parse_args(int argc, char *argv[])
 }
 
 void
-AdminProperties_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV)
+AdminProperties_Test::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
 {
   // init base class
-  Notify_Test_Client::init (argc, argv, ACE_TRY_ENV);
+  Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ChannelID id;
@@ -118,8 +118,8 @@ AdminProperties_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
@@ -128,33 +128,33 @@ AdminProperties_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-AdminProperties_Test::run_test (CORBA::Environment &ACE_TRY_ENV)
+AdminProperties_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->create_suppliers (ACE_TRY_ENV);
+  this->create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->create_consumers (ACE_TRY_ENV);
+  this->create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->send_events (ACE_TRY_ENV);
+  this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-AdminProperties_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV)
+AdminProperties_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -170,10 +170,10 @@ AdminProperties_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV)
       for (index = 0; index < this->suppliers_; ++index)
         {
           supplier = new TAO_Notify_StructuredPushSupplier ();
-          supplier->init (root_poa_.in (), ACE_TRY_ENV);
+          supplier->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          supplier->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+          supplier->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -186,7 +186,7 @@ AdminProperties_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-AdminProperties_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV)
+AdminProperties_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -202,10 +202,10 @@ AdminProperties_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV)
       for (index = 0; index < this->consumers_; ++index)
         {
           consumer = new TAO_Notify_StructuredPushConsumer ();
-          consumer->init (root_poa_.in (), ACE_TRY_ENV);
+          consumer->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          consumer->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+          consumer->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -218,7 +218,7 @@ AdminProperties_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-AdminProperties_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
+AdminProperties_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -255,10 +255,10 @@ AdminProperties_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
 
   TAO_Notify_StructuredPushSupplier *supplier =
     new TAO_Notify_StructuredPushSupplier ();
-  supplier->init (root_poa_.in (), ACE_TRY_ENV);
+  supplier->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+  supplier->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int i = 0;
@@ -271,7 +271,7 @@ AdminProperties_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
           // any
           event.remainder_of_body <<= (CORBA::Long)i;
 
-          supplier->send_event (event, ACE_TRY_ENV);
+          supplier->send_event (event TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -294,11 +294,11 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      test.init (argc, argv,
-                 ACE_TRY_ENV); //Init the Client
+      test.init (argc, argv
+                 TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      test.run_test (ACE_TRY_ENV);
+      test.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h
index 9a28c99459d..432ab6d490e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h
@@ -36,16 +36,16 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Initialization.
 
-  void run_test (CORBA::Environment &ACE_TRY_ENV);
+  void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
 protected:
-  void create_suppliers (CORBA::Environment &ACE_TRY_ENV);
-  void create_consumers (CORBA::Environment &ACE_TRY_ENV);
-  void send_events (CORBA::Environment &ACE_TRY_ENV);
+  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  void send_events (TAO_ENV_SINGLE_ARG_DECL);
 
   // Data Members
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index d2dbf62a7db..290f3b1a335 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -68,26 +68,26 @@ ConnectDisconnect::on_entity_destroyed (void)
 }
 
 void
-ConnectDisconnect::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV)
+ConnectDisconnect::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
 {
   // init base class
-  Notify_Test_Client::init (argc, argv, ACE_TRY_ENV);
+  Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create all participents ...
-  this->create_EC (ACE_TRY_ENV);
+  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -160,21 +160,21 @@ ConnectDisconnect::parse_args(int argc, char *argv[])
 }
 
 void
-ConnectDisconnect::create_EC (CORBA::Environment &ACE_TRY_ENV)
+ConnectDisconnect::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-ConnectDisconnect::run_test (CORBA::Environment &ACE_TRY_ENV)
+ConnectDisconnect::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int iterations = 0; iterations < count_; ++iterations)
     {
@@ -184,85 +184,85 @@ ConnectDisconnect::run_test (CORBA::Environment &ACE_TRY_ENV)
         {
           // Create and connect Any consumers
           any_consumer_[i] = new CD_PushConsumer (this, i);
-          any_consumer_[i]->init (root_poa_.in (), ACE_TRY_ENV);
+          any_consumer_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          any_consumer_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+          any_consumer_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Structured consumers
           structured_consumer_[i] = new CD_StructuredPushConsumer (this, i);
-          structured_consumer_[i]->init (root_poa_.in (), ACE_TRY_ENV);
+          structured_consumer_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          structured_consumer_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+          structured_consumer_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Sequence consumers
           sequence_consumer_[i] = new CD_SequencePushConsumer (this, i);
-          sequence_consumer_[i]->init (root_poa_.in (), ACE_TRY_ENV);
+          sequence_consumer_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          sequence_consumer_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+          sequence_consumer_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       for (i = 0; i < this->suppliers_; ++i)
         {
           any_supplier_[i] = new CD_PushSupplier (this, i);
-          any_supplier_[i]->init (root_poa_.in (), ACE_TRY_ENV);
+          any_supplier_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          any_supplier_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+          any_supplier_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Structured suppliers
           structured_supplier_[i] = new CD_StructuredPushSupplier (this, i);
-          structured_supplier_[i]->init (root_poa_.in (), ACE_TRY_ENV);
+          structured_supplier_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          structured_supplier_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+          structured_supplier_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Sequence suppliers
           sequence_supplier_[i] = new CD_SequencePushSupplier (this, i);
-          sequence_supplier_[i]->init (root_poa_.in (), ACE_TRY_ENV);
+          sequence_supplier_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          sequence_supplier_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+          sequence_supplier_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       for (i = 0; i < this->consumers_; ++i)
         {
           // Disconnnect Any consumers.
-          any_consumer_[i]->disconnect (ACE_TRY_ENV);
+          any_consumer_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Disconnect Structured Consumers.
-          structured_consumer_[i]->disconnect (ACE_TRY_ENV);
+          structured_consumer_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Disconnect Sequence Consumers.
-          sequence_consumer_[i]->disconnect (ACE_TRY_ENV);
+          sequence_consumer_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       for (i = 0; i < this->suppliers_; ++i)
         {
           // Disconnnect Any suppliers.
-          any_supplier_[i]->disconnect (ACE_TRY_ENV);
+          any_supplier_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Disconnect Structured Suppliers.
-          structured_supplier_[i]->disconnect (ACE_TRY_ENV);
+          structured_supplier_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Disconnect Sequence Suppliers.
-          sequence_supplier_[i]->disconnect (ACE_TRY_ENV);
+          sequence_supplier_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 }
 
 void
-ConnectDisconnect::end_test (CORBA::Environment &ACE_TRY_ENV)
+ConnectDisconnect::end_test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown (ACE_TRY_ENV);
+  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -277,8 +277,8 @@ ConnectDisconnect::check_results (void)
     ACE_DEBUG ((LM_DEBUG, "ConnectDisconnect test succeded\n"));
 
   // Destroy the channel
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_TRY_ENV);
+  TAO_ENV_DECLARE_NEW_ENV;
+  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -296,14 +296,14 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv,
-                      ACE_TRY_ENV); //Init the Client
+      client.init (argc, argv
+                      TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      client.run_test (ACE_TRY_ENV);
+      client.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      client.end_test (ACE_TRY_ENV);
+      client.end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index 8abb0fca5f7..710f1b3c846 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -73,20 +73,20 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // initialization.
 
-  void run_test (CORBA::Environment &ACE_TRY_ENV);
+  void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (CORBA::Environment &ACE_TRY_ENV);
+  void end_test (TAO_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create EC
 
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp
index 09c7187dc62..7272dfe3f5b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp
@@ -14,7 +14,9 @@ Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events_Test *test_cl
 }
 
 void
-Event_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/)
+Event_StructuredPushConsumer::push_structured_event
+   (const CosNotification::StructuredEvent & notification
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -50,48 +52,48 @@ Events_Test::~Events_Test ()
 }
 
 void
-Events_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV)
+Events_Test::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
 {
   // init base class
-  Notify_Test_Client::init (argc, argv, ACE_TRY_ENV);
+  Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create all participents ...
-  this->create_EC (ACE_TRY_ENV);
+  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   consumer_ = new Event_StructuredPushConsumer (this);
-  consumer_->init (root_poa_.in (), ACE_TRY_ENV);
+  consumer_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+  consumer_->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Event_StructuredPushConsumer* consumer2;
   consumer2 = new Event_StructuredPushConsumer (this);
-  consumer2->init (root_poa_.in (), ACE_TRY_ENV);
+  consumer2->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer2->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+  consumer2->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   supplier_ = new Event_StructuredPushSupplier (this);
-  supplier_->init (root_poa_.in (), ACE_TRY_ENV);
+  supplier_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+  supplier_->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the CA to receive all type of events
@@ -103,7 +105,7 @@ Events_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV)
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV);
+  this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -141,14 +143,14 @@ Events_Test::parse_args(int argc, char *argv[])
 }
 
 void
-Events_Test::create_EC (CORBA::Environment &ACE_TRY_ENV)
+Events_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   /****************************************************************/
@@ -166,7 +168,7 @@ Events_Test::create_EC (CORBA::Environment &ACE_TRY_ENV)
 
   admin[1].value <<= (CORBA::Long)2;
 
-  ec_->set_admin (admin, ACE_TRY_ENV);
+  ec_->set_admin (admin TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;*/
 
   /****************************************************************/
@@ -182,14 +184,14 @@ Events_Test::on_event_received (void)
 
   if (this->result_count_ == 2*this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      this->end_test (ACE_TRY_ENV);
+      TAO_ENV_DECLARE_NEW_ENV;
+      this->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Events_Test::run_test (CORBA::Environment &ACE_TRY_ENV)
+Events_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -235,23 +237,23 @@ Events_Test::run_test (CORBA::Environment &ACE_TRY_ENV)
       qos[0].name = CORBA::string_dup (CosNotification::Priority);
       qos[0].value <<= (CORBA::Short)prio++;
 
-      supplier_->send_event (event, ACE_TRY_ENV);
+      supplier_->send_event (event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Events_Test::end_test (CORBA::Environment &ACE_TRY_ENV)
+Events_Test::end_test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown (ACE_TRY_ENV); // break out of run
+  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); // break out of run
 }
 
 int
 Events_Test::check_results (void)
 {
   // Destroy the channel
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_TRY_ENV);
+  TAO_ENV_DECLARE_NEW_ENV;
+  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->result_count_ == 2*this->event_count_)
@@ -278,11 +280,11 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc, argv,
-                      ACE_TRY_ENV); //Init the Client
+      events.init (argc, argv
+                      TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      events.run_test (ACE_TRY_ENV);
+      events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       events.ORB_run ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
index 414553d430f..9801654d362 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
@@ -38,8 +38,8 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -76,23 +76,23 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // initialization.
 
   void on_event_received (void);
   // Called when an event is received.
 
-  void run_test (CORBA::Environment &ACE_TRY_ENV);
+  void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (CORBA::Environment &ACE_TRY_ENV);
+  void end_test (TAO_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 930b704b64a..8f38e8a7f54 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -72,13 +72,13 @@ IdAssignment::parse_args(int argc, char *argv[])
 }
 
 void
-IdAssignment::init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
+IdAssignment::init(int argc, char *argv[] TAO_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "", ACE_TRY_ENV);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var rootObj = orb->resolve_initial_references("NameService",
-                                                              ACE_TRY_ENV);
+  CORBA::Object_var rootObj = orb->resolve_initial_references("NameService"
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(rootObj.in()))
@@ -89,14 +89,14 @@ IdAssignment::init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 
     }
   CosNaming::NamingContext_var rootNC =
-    CosNaming::NamingContext::_narrow(rootObj.in(), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow(rootObj.in() TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNaming::Name name(1);
   name.length(1);
   name[0].id = CORBA::string_dup("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve(name, ACE_TRY_ENV);
+  CORBA::Object_var obj = rootNC->resolve(name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(obj.in()))
@@ -107,14 +107,14 @@ IdAssignment::init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
     }
 
   notify_factory_ = CosNotifyChannelAdmin::EventChannelFactory::_narrow(
-                                                         obj.in(),
-                                                         ACE_TRY_ENV);
+                                                         obj.in()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 CosNotifyChannelAdmin::ChannelID
-IdAssignment::create_ec(CORBA::Environment &ACE_TRY_ENV)
+IdAssignment::create_ec(TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -122,8 +122,8 @@ IdAssignment::create_ec(CORBA::Environment &ACE_TRY_ENV)
   CosNotifyChannelAdmin::EventChannel_var ec =
     notify_factory_->create_channel(initial_qos,
                                    initial_admin,
-                                   id,
-                                   ACE_TRY_ENV);
+                                   id
+                                   TAO_ENV_ARG_PARAMETER);
 //  ACE_CHECK_RETURN;
 
   return id;
@@ -131,11 +131,11 @@ IdAssignment::create_ec(CORBA::Environment &ACE_TRY_ENV)
 
 
 void
-IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id,
-                          CORBA::Environment &ACE_TRY_ENV)
+IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
+                          TAO_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    notify_factory_->get_event_channel(id, ACE_TRY_ENV);
+    notify_factory_->get_event_channel(id TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -147,20 +147,20 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id,
 
     }
 
-   ec->destroy(ACE_TRY_ENV);
+   ec->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
    ACE_CHECK;
 }
 
 CosNotifyChannelAdmin::AdminID
-IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                                     CORBA::Environment &ACE_TRY_ENV)
+IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
+                                     TAO_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
           CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV);
+    notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -173,7 +173,7 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
     }
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->new_for_suppliers (ifgop, adminid, ACE_TRY_ENV);
+    ec->new_for_suppliers (ifgop, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (supplier_admin.in()))
@@ -186,15 +186,15 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
 }
 
 CosNotifyChannelAdmin::AdminID
-IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                                     CORBA::Environment &ACE_TRY_ENV)
+IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
+                                     TAO_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
           CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV);
+    notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -207,7 +207,7 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
     }
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->new_for_consumers (ifgop, adminid, ACE_TRY_ENV);
+    ec->new_for_consumers (ifgop, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (consumer_admin.in()))
@@ -222,11 +222,11 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
 
 void
 IdAssignment::destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                                      CosNotifyChannelAdmin::AdminID admin_id,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CosNotifyChannelAdmin::AdminID admin_id
+                                      TAO_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV);
+    notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -239,14 +239,14 @@ IdAssignment::destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_i
     }
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->get_consumeradmin (admin_id, ACE_TRY_ENV);
+    ec->get_consumeradmin (admin_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer_admin.in()))
     ACE_ERROR ((LM_ERROR,
                        " (%P|%t) Unable to get consumer admin\n"));
 
-  consumer_admin->destroy(ACE_TRY_ENV);
+  consumer_admin->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG((LM_DEBUG, "destroyed consumer admin\n"));
@@ -255,11 +255,11 @@ IdAssignment::destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_i
 
 void
 IdAssignment::destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id,
-                                      CosNotifyChannelAdmin::AdminID admin_id,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CosNotifyChannelAdmin::AdminID admin_id
+                                      TAO_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    notify_factory_->get_event_channel(channel_id, ACE_TRY_ENV);
+    notify_factory_->get_event_channel(channel_id TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -270,21 +270,21 @@ IdAssignment::destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_i
     }
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->get_supplieradmin (admin_id, ACE_TRY_ENV);
+    ec->get_supplieradmin (admin_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier_admin.in()))
     ACE_ERROR ((LM_ERROR,
                 " (%P|%t) Unable to get supplier admin\n"));
 
-  supplier_admin->destroy(ACE_TRY_ENV);
+  supplier_admin->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG((LM_DEBUG, "destroyed supplier admin\n"));
 }
 
 void
-IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV)
+IdAssignment::run_test(TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID* ec_id =
     new CosNotifyChannelAdmin::ChannelID [this->ec_count_];
@@ -303,22 +303,22 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV)
       int ec_count;
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          ec_id [ec_count] = create_ec(ACE_TRY_ENV);
+          ec_id [ec_count] = create_ec(TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // connect <consumer_admin_count_> number of consumers to the current ec.
           for (int cons_count = 0; cons_count < this->consumer_admin_count_; ++cons_count)
             {
-              consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count],
-                                                                      ACE_TRY_ENV);
+              consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count]
+                                                                      TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           // connect <supplier_admin_count_> number of suppliers to the current ec.
           for (int supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count)
             {
-              supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count],
-                                                                      ACE_TRY_ENV);
+              supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count]
+                                                                      TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -326,7 +326,7 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV)
       // destroy the ec, the admins should destroy too.
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id [ec_count], ACE_TRY_ENV);
+          this->destroy_ec (ec_id [ec_count] TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -340,23 +340,23 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV)
       int ec_count;
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          ec_id [ec_count] = create_ec(ACE_TRY_ENV);
+          ec_id [ec_count] = create_ec(TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           int cons_count, supp_count;
           // connect <consumer_admin_count_> number of consumers to the current ec.
           for (cons_count = 0; cons_count < this->consumer_admin_count_; ++cons_count)
             {
-              consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count],
-                                                                      ACE_TRY_ENV);
+              consumer_admin_id [cons_count] = create_consumer_admin (ec_id [ec_count]
+                                                                      TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           // connect <supplier_admin_count_> number of suppliers to the current ec.
           for (supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count)
             {
-              supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count],
-                                                                      ACE_TRY_ENV);
+              supplier_admin_id [supp_count] = create_supplier_admin (ec_id [ec_count]
+                                                                      TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
           // destroy the admins
@@ -364,16 +364,16 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV)
           // destroy consumer admins
           for (cons_count = 0; cons_count < this->consumer_admin_count_; ++cons_count)
             {
-              destroy_consumer_admin (ec_id [ec_count],consumer_admin_id [cons_count],
-                                      ACE_TRY_ENV);
+              destroy_consumer_admin (ec_id [ec_count],consumer_admin_id [cons_count]
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           // destroy supplier admins
           for (supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count)
             {
-              destroy_supplier_admin (ec_id [ec_count], supplier_admin_id [supp_count],
-                                       ACE_TRY_ENV);
+              destroy_supplier_admin (ec_id [ec_count], supplier_admin_id [supp_count]
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
@@ -382,7 +382,7 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV)
       // destroy the ec,
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id [ec_count], ACE_TRY_ENV);
+          this->destroy_ec (ec_id [ec_count] TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -393,17 +393,17 @@ IdAssignment::run_test(CORBA::Environment &ACE_TRY_ENV)
 
 int main(int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       IdAssignment test;
 
       test.parse_args (argc, argv);
 
-      test.init(argc, argv, ACE_TRY_ENV);
+      test.init(argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test.run_test(ACE_TRY_ENV);
+      test.run_test(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index a1b4f7e293d..66c132225c8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -25,19 +25,19 @@ public:
   ~IdAssignment ();
 
   int parse_args(int argc, char *argv[]);
-  void init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV);
-  void run_test(CORBA::Environment &ACE_TRY_ENV);
+  void init(int argc, char *argv[] TAO_ENV_ARG_DECL);
+  void run_test(TAO_ENV_SINGLE_ARG_DECL);
 
 private:
-  CosNotifyChannelAdmin::ChannelID create_ec(CORBA::Environment &ACE_TRY_ENV);
-  void destroy_ec(CosNotifyChannelAdmin::ChannelID id,
-                  CORBA::Environment &ACE_TRY_ENV);
+  CosNotifyChannelAdmin::ChannelID create_ec(TAO_ENV_SINGLE_ARG_DECL);
+  void destroy_ec(CosNotifyChannelAdmin::ChannelID id
+                  TAO_ENV_ARG_DECL);
 
-  CosNotifyChannelAdmin::AdminID create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, CORBA::Environment &ACE_TRY_ENV);
-  CosNotifyChannelAdmin::AdminID create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, CORBA::Environment &ACE_TRY_ENV);
+  CosNotifyChannelAdmin::AdminID create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id TAO_ENV_ARG_DECL);
+  CosNotifyChannelAdmin::AdminID create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id TAO_ENV_ARG_DECL);
 
-  void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id, CORBA::Environment &ACE_TRY_ENV);
-  void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id, CORBA::Environment &ACE_TRY_ENV);
+  void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id TAO_ENV_ARG_DECL);
+  void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, CosNotifyChannelAdmin::AdminID admin_id TAO_ENV_ARG_DECL);
 
   // = Data members
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp
index 48926181bba..90b0620ab35 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp
@@ -53,13 +53,13 @@ LifeCycleTest::parse_args(int argc, char *argv[])
 }
 
 void
-LifeCycleTest::init(int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::init(int argc, char* argv[] TAO_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "", ACE_TRY_ENV);
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var rootObj = orb->resolve_initial_references("NameService",
-                                                              ACE_TRY_ENV);
+  CORBA::Object_var rootObj = orb->resolve_initial_references("NameService"
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(rootObj.in()))
@@ -69,20 +69,20 @@ LifeCycleTest::init(int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV)
       return;
     }
   CosNaming::NamingContext_var rootNC =
-    CosNaming::NamingContext::_narrow(rootObj.in(),
-                                      ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow(rootObj.in()
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNaming::Name name(1);
   name.length(1);
   name[0].id = CORBA::string_dup("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve(name, ACE_TRY_ENV);
+  CORBA::Object_var obj = rootNC->resolve(name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow(obj.in(),
-                                                        ACE_TRY_ENV);
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow(obj.in()
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(notify_factory_.in()))
@@ -95,32 +95,32 @@ LifeCycleTest::init(int argc, char* argv[], CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-LifeCycleTest::run_test(CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::run_test(TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->count_; ++i)
     {
-     this->create_ec(ACE_TRY_ENV);
+     this->create_ec(TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->create_supplier_admin(ACE_TRY_ENV);
+     this->create_supplier_admin(TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->create_consumer_admin(ACE_TRY_ENV);
+     this->create_consumer_admin(TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->destroy_consumer_admin(ACE_TRY_ENV);
+     this->destroy_consumer_admin(TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->destroy_supplier_admin(ACE_TRY_ENV);
+     this->destroy_supplier_admin(TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->destroy_ec(ACE_TRY_ENV);
+     this->destroy_ec(TAO_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
   }
 }
 
 void
-LifeCycleTest::create_ec(CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::create_ec(TAO_ENV_SINGLE_ARG_DECL)
 {
     CosNotifyChannelAdmin::ChannelID id;
     CosNotification::QoSProperties initial_qos;
@@ -128,8 +128,8 @@ LifeCycleTest::create_ec(CORBA::Environment &ACE_TRY_ENV)
 
     ec_ = notify_factory_->create_channel(initial_qos,
                                           initial_admin,
-                                          id,
-                                          ACE_TRY_ENV);
+                                          id
+                                          TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (CORBA::is_nil (ec_.in())) {
@@ -143,13 +143,13 @@ LifeCycleTest::create_ec(CORBA::Environment &ACE_TRY_ENV)
 
 
 void
-LifeCycleTest::create_supplier_admin(CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::create_supplier_admin(TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
           CosNotifyChannelAdmin::OR_OP;
 
-  supplier_admin_ = ec_->new_for_suppliers (ifgop, adminid, ACE_TRY_ENV);
+  supplier_admin_ = ec_->new_for_suppliers (ifgop, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier_admin_.in())) {
@@ -162,13 +162,13 @@ LifeCycleTest::create_supplier_admin(CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-LifeCycleTest::create_consumer_admin(CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::create_consumer_admin(TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
           CosNotifyChannelAdmin::OR_OP;
 
-  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid, ACE_TRY_ENV);
+  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer_admin_.in())) {
@@ -181,27 +181,27 @@ LifeCycleTest::create_consumer_admin(CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-LifeCycleTest::destroy_supplier_admin(CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::destroy_supplier_admin(TAO_ENV_SINGLE_ARG_DECL)
 {
-  supplier_admin_->destroy(ACE_TRY_ENV);
+  supplier_admin_->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG((LM_DEBUG, "destroyed supplier admin\n"));
 }
 
 void
-LifeCycleTest::destroy_consumer_admin(CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::destroy_consumer_admin(TAO_ENV_SINGLE_ARG_DECL)
 {
-  consumer_admin_->destroy(ACE_TRY_ENV);
+  consumer_admin_->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG((LM_DEBUG, "destroyed consumer admin\n"));
 }
 
 void
-LifeCycleTest::destroy_ec(CORBA::Environment &ACE_TRY_ENV)
+LifeCycleTest::destroy_ec(TAO_ENV_SINGLE_ARG_DECL)
 {
-  ec_->destroy(ACE_TRY_ENV);
+  ec_->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   ACE_DEBUG((LM_DEBUG, "destroyed event channel\n"));
 }
@@ -210,17 +210,17 @@ LifeCycleTest::destroy_ec(CORBA::Environment &ACE_TRY_ENV)
 int
 main(int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       LifeCycleTest test;
 
       test.parse_args (argc, argv);
 
-      test.init(argc, argv, ACE_TRY_ENV);
+      test.init(argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test.run_test(ACE_TRY_ENV);
+      test.run_test(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH(CosNotification::UnsupportedAdmin, ex)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h
index bba9561b41b..2787eb2063c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h
@@ -22,17 +22,17 @@ public:
   LifeCycleTest (void);
   ~LifeCycleTest ();
 
-  void init(int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV);
-  void run_test(CORBA::Environment &ACE_TRY_ENV);
+  void init(int argc, char *argv[] TAO_ENV_ARG_DECL);
+  void run_test(TAO_ENV_SINGLE_ARG_DECL);
   int parse_args(int argc, char *argv[]);
 
 private:
-   void create_ec(CORBA::Environment &ACE_TRY_ENV);
-   void create_supplier_admin(CORBA::Environment &ACE_TRY_ENV);
-   void create_consumer_admin(CORBA::Environment &ACE_TRY_ENV);
-   void destroy_ec(CORBA::Environment &ACE_TRY_ENV);
-   void destroy_supplier_admin(CORBA::Environment &ACE_TRY_ENV);
-   void destroy_consumer_admin(CORBA::Environment &ACE_TRY_ENV);
+   void create_ec(TAO_ENV_SINGLE_ARG_DECL);
+   void create_supplier_admin(TAO_ENV_SINGLE_ARG_DECL);
+   void create_consumer_admin(TAO_ENV_SINGLE_ARG_DECL);
+   void destroy_ec(TAO_ENV_SINGLE_ARG_DECL);
+   void destroy_supplier_admin(TAO_ENV_SINGLE_ARG_DECL);
+   void destroy_consumer_admin(TAO_ENV_SINGLE_ARG_DECL);
 
    CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
    CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index bc5a9d903ea..c41fef13020 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -14,7 +14,7 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
 }
 
 void
-Event_AnyPushConsumer::push (const CORBA::Any & data, CORBA::Environment &/*ACE_TRY_ENV*/)
+Event_AnyPushConsumer::push (const CORBA::Any & data  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -50,48 +50,48 @@ Simple_Test::~Simple_Test ()
 }
 
 void
-Simple_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV)
+Simple_Test::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
 {
   // init base class
-  Notify_Test_Client::init (argc, argv, ACE_TRY_ENV);
+  Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create all participents ...
-  this->create_EC (ACE_TRY_ENV);
+  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   consumer_ = new Event_AnyPushConsumer (this);
-  consumer_->init (root_poa_.in (), ACE_TRY_ENV);
+  consumer_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+  consumer_->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Event_AnyPushConsumer* consumer2;
   consumer2 = new Event_AnyPushConsumer (this);
-  consumer2->init (root_poa_.in (), ACE_TRY_ENV);
+  consumer2->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer2->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+  consumer2->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   supplier_ = new Event_AnyPushSupplier (this);
-  supplier_->init (root_poa_.in (), ACE_TRY_ENV);
+  supplier_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+  supplier_->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the CA to receive all type of events
@@ -103,7 +103,7 @@ Simple_Test::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV)
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV);
+  this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -141,14 +141,14 @@ Simple_Test::parse_args(int argc, char *argv[])
 }
 
 void
-Simple_Test::create_EC (CORBA::Environment &ACE_TRY_ENV)
+Simple_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
@@ -163,14 +163,14 @@ Simple_Test::on_event_received (void)
 
   if (this->result_count_ == 2*this->event_count_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      this->end_test (ACE_TRY_ENV);
+      TAO_ENV_DECLARE_NEW_ENV;
+      this->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Simple_Test::run_test (CORBA::Environment &ACE_TRY_ENV)
+Simple_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any data;
 
@@ -178,23 +178,23 @@ Simple_Test::run_test (CORBA::Environment &ACE_TRY_ENV)
     {
       data <<= (CORBA::Long)i;
 
-      supplier_->send_event (data, ACE_TRY_ENV);
+      supplier_->send_event (data TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Simple_Test::end_test (CORBA::Environment &ACE_TRY_ENV)
+Simple_Test::end_test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown (ACE_TRY_ENV); // break out of run
+  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); // break out of run
 }
 
 int
 Simple_Test::check_results (void)
 {
   // Destroy the channel
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_TRY_ENV);
+  TAO_ENV_DECLARE_NEW_ENV;
+  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->result_count_ == 2*this->event_count_)
@@ -221,11 +221,11 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc, argv,
-                      ACE_TRY_ENV); //Init the Client
+      events.init (argc, argv
+                      TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      events.run_test (ACE_TRY_ENV);
+      events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       events.ORB_run ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index 403755e4367..3cd47fb83fa 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -39,8 +39,8 @@ public:
 
   // = PushSupplier methods
   virtual void push (
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA::Any & data
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -77,23 +77,23 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // initialization.
 
   void on_event_received (void);
   // Called when an event is received.
 
-  void run_test (CORBA::Environment &ACE_TRY_ENV);
+  void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (CORBA::Environment &ACE_TRY_ENV);
+  void end_test (TAO_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index f375cbc5464..84d8fdc0877 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -14,8 +14,8 @@ Update_StructuredPushConsumer::Update_StructuredPushConsumer (Updates *test_clie
 void
 Update_StructuredPushConsumer::offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -25,14 +25,14 @@ Update_StructuredPushConsumer::offer_change (
   if (added.length () > 0)
     {
       test_client_->offers_added_ = added.length ();
-      this->test_client_->end_test (ACE_TRY_ENV);
+      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (removed.length () > 0)
     {
       test_client_->offers_removed_ = removed.length ();
-      this->test_client_->end_test (ACE_TRY_ENV);
+      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -51,8 +51,8 @@ Update_StructuredPushSupplier::~Update_StructuredPushSupplier ()
 void
 Update_StructuredPushSupplier::subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
         )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -62,14 +62,14 @@ Update_StructuredPushSupplier::subscription_change (
   if (added.length () > 0)
     {
       test_client_->subscriptions_added_ = added.length ();
-      this->test_client_->end_test (ACE_TRY_ENV);
+      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (removed.length () > 0)
     {
       test_client_->subscriptions_removed_ = removed.length ();
-      this->test_client_->end_test (ACE_TRY_ENV);
+      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -87,42 +87,42 @@ Updates::~Updates ()
 }
 
 void
-Updates::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV)
+Updates::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
 {
   // init base class
-  Notify_Test_Client::init (argc, argv, ACE_TRY_ENV);
+  Notify_Test_Client::init (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create all participents ...
-  this->create_EC (ACE_TRY_ENV);
+  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   consumer_ = new Update_StructuredPushConsumer (this);
-  consumer_->init (root_poa_.in (), ACE_TRY_ENV);
+  consumer_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+  consumer_->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   supplier_ = new Update_StructuredPushSupplier (this);
-  supplier_->init (root_poa_.in (), ACE_TRY_ENV);
+  supplier_->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+  supplier_->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -160,21 +160,21 @@ Updates::parse_args(int argc, char *argv[])
 }
 
 void
-Updates::create_EC (CORBA::Environment &ACE_TRY_ENV)
+Updates::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-Updates::run_test (CORBA::Environment &ACE_TRY_ENV)
+Updates::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotification::EventTypeSeq added (update_count_), removed (update_count_);
   added.length (update_count_);
@@ -193,11 +193,11 @@ Updates::run_test (CORBA::Environment &ACE_TRY_ENV)
     }
 
   // test added
-  this->supplier_->get_proxy_consumer ()->offer_change (added, removed, ACE_TRY_ENV);
+  this->supplier_->get_proxy_consumer ()->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_->get_proxy_supplier ()->subscription_change (added, removed,
-                                                               ACE_TRY_ENV);
+  this->consumer_->get_proxy_supplier ()->subscription_change (added, removed
+                                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // test removed
@@ -214,20 +214,20 @@ Updates::run_test (CORBA::Environment &ACE_TRY_ENV)
       removed[i].type_name = CORBA::string_dup (update_test_buf);
     }
 
-  this->supplier_->get_proxy_consumer ()->offer_change (added, removed, ACE_TRY_ENV);
+  this->supplier_->get_proxy_consumer ()->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_->get_proxy_supplier ()->subscription_change (added, removed,
-                                                               ACE_TRY_ENV);
+  this->consumer_->get_proxy_supplier ()->subscription_change (added, removed
+                                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Updates::end_test (CORBA::Environment &ACE_TRY_ENV)
+Updates::end_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (++this->result_count_ == 4)
     {
-      this->shutdown (ACE_TRY_ENV);
+      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -236,8 +236,8 @@ int
 Updates::check_results (void)
 {
   // Destroy the channel
-  ACE_DECLARE_NEW_CORBA_ENV;
-  this->ec_->destroy (ACE_TRY_ENV);
+  TAO_ENV_DECLARE_NEW_ENV;
+  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG((LM_DEBUG, "offers_added_ = %d, offers_removed_ = %d, subscriptions_added_= %d, subscriptions_removed_ = %d\n",
@@ -267,11 +267,11 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      updates.init (argc, argv,
-                      ACE_TRY_ENV); //Init the Client
+      updates.init (argc, argv
+                      TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      updates.run_test (ACE_TRY_ENV);
+      updates.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       updates.ORB_run ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index 501fad463f0..659194ebb61 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -38,8 +38,8 @@ public:
 
   virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -64,8 +64,8 @@ public:
 
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -88,20 +88,20 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // initialization.
 
-  void run_test (CORBA::Environment &ACE_TRY_ENV);
+  void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (CORBA::Environment &ACE_TRY_ENV);
+  void end_test (TAO_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp
index 59d648ee2c9..5546115643c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp
@@ -18,40 +18,40 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer ()
     CosNotifyChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
-void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/)
+void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 
 PortableServer::POA_ptr
-TAO_Notify_PushConsumer::_default_POA (CORBA::Environment &/*env*/)
+TAO_Notify_PushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
-  CosNotifyComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
+  CosNotifyComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, this->proxy_id_, ACE_TRY_ENV);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::ANY_EVENT, this->proxy_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->supplier_proxy_ =
-    CosNotifyChannelAdmin::ProxyPushSupplier::_narrow (proxysupplier.in (),
-                                                       ACE_TRY_ENV);
+    CosNotifyChannelAdmin::ProxyPushSupplier::_narrow (proxysupplier.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (supplier_proxy_.in ()));
 
-  this->supplier_proxy_->connect_any_push_consumer (objref.in (),
-                                                    ACE_TRY_ENV);
+  this->supplier_proxy_->connect_any_push_consumer (objref.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -59,32 +59,35 @@ TAO_Notify_PushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consu
 }
 
 void
-TAO_Notify_PushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_PushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_PushConsumer::offer_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_PushConsumer::offer_change
+   (const CosNotification::EventTypeSeq &/*added*/,
+    const CosNotification::EventTypeSeq &/*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -94,7 +97,9 @@ TAO_Notify_PushConsumer::offer_change (const CosNotification::EventTypeSeq &/*ad
 }
 
 void
-TAO_Notify_PushConsumer::push (const CORBA::Any & /*data*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_PushConsumer::push
+   (const CORBA::Any & /*data*/
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -104,10 +109,10 @@ TAO_Notify_PushConsumer::push (const CORBA::Any & /*data*/, CORBA::Environment &
 }
 
 void
-TAO_Notify_PushConsumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushConsumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
index f13fb64cca5..a936d5e2d27 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
@@ -51,21 +51,21 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_PushConsumer : public POA_CosNotifyComm:
   TAO_Notify_PushConsumer (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV);
+  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
   // Activates this object with the <default_POA_>
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Deactivate the object from the POA.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   virtual ~TAO_Notify_PushConsumer ();
@@ -74,9 +74,8 @@ protected:
   // = NotifyPublish method
    void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -84,8 +83,8 @@ protected:
       ));
 
     void push (
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA::Any & data
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -94,7 +93,7 @@ protected:
   // The default operation is no op.
 
     void disconnect_push_consumer (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
index 98a33f33ebc..59ae4ad8fe5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
@@ -18,33 +18,34 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
     CosNotifyChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
-void TAO_Notify_PushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/)
+void TAO_Notify_PushSupplier::init
+   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 void
-TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
-  CosNotifyComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
+  CosNotifyComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, this->my_id_, ACE_TRY_ENV);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::ANY_EVENT, this->my_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->consumer_proxy_ =
-    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in (),
-                                                       ACE_TRY_ENV);
+    CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (consumer_proxy_.in ()));
 
-  this->consumer_proxy_->connect_any_push_supplier (objref.in (),
-                                                    ACE_TRY_ENV);
+  this->consumer_proxy_->connect_any_push_supplier (objref.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -52,43 +53,46 @@ TAO_Notify_PushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr suppl
 }
 
 void
-TAO_Notify_PushSupplier::send_event (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::send_event (const CORBA::Any & data TAO_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data, ACE_TRY_ENV);
+  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_PushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_PushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_PushSupplier::_default_POA (CORBA::Environment& /* env */)
+TAO_Notify_PushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_PushSupplier::subscription_change (const CosNotification::EventTypeSeq &/*added*/, const CosNotification::EventTypeSeq &/*removed*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_PushSupplier::subscription_change
+   (const CosNotification::EventTypeSeq &/*added*/,
+    const CosNotification::EventTypeSeq &/*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
                        CORBA::SystemException,
                        CosNotifyComm::InvalidEventType
@@ -98,10 +102,10 @@ TAO_Notify_PushSupplier::subscription_change (const CosNotification::EventTypeSe
 }
 
 void
-TAO_Notify_PushSupplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_PushSupplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
index 9d458bb61f8..b91dbbbf799 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
@@ -21,24 +21,24 @@ public:
   TAO_Notify_PushSupplier (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV);
+  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL);
   // Activates this object with the <default_POA_>
   // Creates a new proxy consumer and connects to it.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the consumer proxy.
 
-  void send_event (const CORBA::Any & data, CORBA::Environment &ACE_TRY_ENV);
+  void send_event (const CORBA::Any & data TAO_ENV_ARG_DECL);
   // Send the event to the channel.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Deactivate the object.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CosNotifyChannelAdmin::ProxyID my_id_;
   // This supplier's id.
@@ -50,8 +50,8 @@ public:
   // = NotifySubscribe methods
     void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -59,7 +59,7 @@ public:
       ));
 
     void disconnect_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp
index 9ff88819d37..9b6b0460f8c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp
@@ -18,13 +18,14 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer (void)
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_nil ();
 }
 
-void TAO_Notify_SequencePushConsumer::init (PortableServer::POA_ptr poa, CORBA::Environment &/*ACE_TRY_ENV*/)
+void TAO_Notify_SequencePushConsumer::init
+   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_SequencePushConsumer::_default_POA (CORBA::Environment &/*env*/)
+TAO_Notify_SequencePushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -37,60 +38,62 @@ TAO_Notify_SequencePushConsumer::get_proxy_supplier (void)
 }
 
 void
-TAO_Notify_SequencePushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::SequencePushConsumer_var consumer_ref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_supplier_id_, ACE_TRY_ENV);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ = CosNotifyChannelAdmin::SequenceProxyPushSupplier::
-    _narrow (proxysupplier.in (), ACE_TRY_ENV);
+    _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_sequence_push_consumer (consumer_ref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_supplier_->connect_sequence_push_consumer (consumer_ref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   // give ownership to POA
   this->_remove_ref ();
 }
 
 void
-TAO_Notify_SequencePushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_SequencePushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->proxy_supplier_->disconnect_sequence_push_supplier(ACE_TRY_ENV);
+  this->proxy_supplier_->disconnect_sequence_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SequencePushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV
-)
+TAO_Notify_SequencePushConsumer::offer_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -100,16 +103,18 @@ TAO_Notify_SequencePushConsumer::offer_change (const CosNotification::EventTypeS
 }
 
 void
-TAO_Notify_SequencePushConsumer::disconnect_sequence_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushConsumer::disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SequencePushConsumer:: push_structured_events (const CosNotification::EventBatch &/*notifications*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_SequencePushConsumer::push_structured_events
+   (const CosNotification::EventBatch &/*notifications*/
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
index b6405abf4e6..c8a7effdd71 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
@@ -44,25 +44,25 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushConsumer : public POA_CosNot
   TAO_Notify_SequencePushConsumer (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV);
+  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
   // Saves the POA ref.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier via the <consumer_admin> supplied and connects
   // to it.
 
-  virtual void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivate the object from the default POA.
 
   CosNotifyChannelAdmin::SequenceProxyPushSupplier_ptr get_proxy_supplier (void);
   // Accessor for <proxy_supplier_>.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 protected:
   // = Data Members
   CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxy_supplier_;
@@ -80,8 +80,8 @@ protected:
   // = NotifyPublish method
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -90,8 +90,8 @@ protected:
 
   // = SequencePushConsumer methods
   virtual void push_structured_events (
-        const CosNotification::EventBatch & notifications,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventBatch & notifications
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -100,7 +100,7 @@ protected:
   // Default does nothing.
 
   virtual void disconnect_sequence_push_consumer (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
index 9559eb9e68a..0dc6672b483 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
@@ -19,7 +19,8 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 }
 
 void
-TAO_Notify_SequencePushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_Notify_SequencePushSupplier::init
+   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -31,27 +32,27 @@ TAO_Notify_SequencePushSupplier::get_proxy_consumer (void)
 }
 
 void
-TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
 {
   CosNotifyComm::SequencePushSupplier_var supplier_ref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_consumer_id_, ACE_TRY_ENV);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::SEQUENCE_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV);
+    CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_sequence_push_supplier (supplier_ref.in (),
-                                                   ACE_TRY_ENV);
+  proxy_consumer_->connect_sequence_push_supplier (supplier_ref.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -59,22 +60,21 @@ TAO_Notify_SequencePushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_p
 }
 
 void
-TAO_Notify_SequencePushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_sequence_push_consumer(ACE_TRY_ENV);
+  this->proxy_consumer_->disconnect_sequence_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SequencePushSupplier::subscription_change (
-                                                        const CosNotification::EventTypeSeq & /*added*/,
-                                                        const CosNotification::EventTypeSeq & /*removed */,
-                                                        CORBA::Environment & //ACE_TRY_ENV
-      )
+TAO_Notify_SequencePushSupplier::subscription_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed */
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -84,45 +84,45 @@ TAO_Notify_SequencePushSupplier::subscription_change (
 }
 
 PortableServer::POA_ptr
-TAO_Notify_SequencePushSupplier::_default_POA (CORBA::Environment& /* env */)
+TAO_Notify_SequencePushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_SequencePushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Notify_SequencePushSupplier::disconnect_sequence_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  this->proxy_consumer_->disconnect_sequence_push_consumer (ACE_TRY_ENV);
+  this->proxy_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SequencePushSupplier::send_events (const CosNotification::EventBatch & notifications, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_SequencePushSupplier::send_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->push_structured_events (notifications, ACE_TRY_ENV);
+  this->proxy_consumer_->push_structured_events (notifications TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
index d2e5750296b..6f652397267 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
@@ -44,28 +44,28 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushSupplier:public POA_CosNotif
   TAO_Notify_SequencePushSupplier (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/);
+  void init (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  virtual void send_events (const CosNotification::EventBatch & notifications,
-                           CORBA::Environment &ACE_TRY_ENV);
+  virtual void send_events (const CosNotification::EventBatch & notifications
+                           TAO_ENV_ARG_DECL);
   // Send one event.
 
   CosNotifyChannelAdmin::SequenceProxyPushConsumer_ptr get_proxy_consumer (void);
   // Accessor for <proxy_consumer_>.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivate the object.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   // = Data Members
@@ -84,8 +84,8 @@ protected:
   // = NotifySubscribe
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -94,7 +94,7 @@ protected:
 
     // = SequencePushSupplier method
     virtual void disconnect_sequence_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
index e5d45b87e82..7b661a374a8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
@@ -24,13 +24,14 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer (void)
 // @@ Carlos: The <connect> method will activate the servant with the supplied poa.
 //            This is the contract for clients of this class.
 //
-void TAO_Notify_StructuredPushConsumer::init (PortableServer::POA_ptr poa, CORBA::Environment &/*ACE_TRY_ENV*/)
+void TAO_Notify_StructuredPushConsumer::init
+   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_StructuredPushConsumer::_default_POA (CORBA::Environment &/*env*/)
+TAO_Notify_StructuredPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -43,60 +44,62 @@ TAO_Notify_StructuredPushConsumer::get_proxy_supplier (void)
 }
 
 void
-TAO_Notify_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var consumer_ref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
   this->proxy_supplier_ = CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in (), ACE_TRY_ENV);
+    _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (consumer_ref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_supplier_->connect_structured_push_consumer (consumer_ref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   // give ownership to POA
   this->_remove_ref ();
 }
 
 void
-TAO_Notify_StructuredPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->proxy_supplier_->disconnect_structured_push_supplier(ACE_TRY_ENV);
+  this->proxy_supplier_->disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV
-)
+TAO_Notify_StructuredPushConsumer::offer_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -106,16 +109,19 @@ TAO_Notify_StructuredPushConsumer::offer_change (const CosNotification::EventTyp
 }
 
 void
-TAO_Notify_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushConsumer::disconnect_structured_push_consumer
+   (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredPushConsumer:: push_structured_event (const CosNotification::StructuredEvent &/*notification*/, CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_StructuredPushConsumer::push_structured_event
+   (const CosNotification::StructuredEvent &/*notification*/
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
index 6d901251faf..9a8705f82d0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
@@ -44,25 +44,25 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushConsumer : public POA_CosN
   TAO_Notify_StructuredPushConsumer (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa, CORBA::Environment &ACE_TRY_ENV);
+  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
   // Saves the POA ref.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier via the <consumer_admin> supplied and connects
   // to it.
 
-  virtual void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivate the object from the default POA.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
   // Accessor for <proxy_supplier_>.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 protected:
   // = Data Members
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
@@ -80,8 +80,8 @@ protected:
   // = NotifyPublish method
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -90,8 +90,8 @@ protected:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -100,7 +100,7 @@ protected:
   // Default does nothing.
 
   virtual void disconnect_structured_push_consumer (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
index 66ea97f7f7a..8e9081e8564 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
@@ -19,7 +19,8 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 }
 
 void
-TAO_Notify_StructuredPushSupplier::init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_Notify_StructuredPushSupplier::init
+   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -31,27 +32,27 @@ TAO_Notify_StructuredPushSupplier::get_proxy_consumer (void)
 }
 
 void
-TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
 {
   CosNotifyComm::StructuredPushSupplier_var supplier_ref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (supplier_ref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_consumer_->connect_structured_push_supplier (supplier_ref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -59,22 +60,21 @@ TAO_Notify_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin
 }
 
 void
-TAO_Notify_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV);
+  this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredPushSupplier::subscription_change (
-                                                        const CosNotification::EventTypeSeq & /*added*/,
-                                                        const CosNotification::EventTypeSeq & /*removed */,
-                                                        CORBA::Environment & //ACE_TRY_ENV
-      )
+TAO_Notify_StructuredPushSupplier::subscription_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed */
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -84,45 +84,45 @@ TAO_Notify_StructuredPushSupplier::subscription_change (
 }
 
 PortableServer::POA_ptr
-TAO_Notify_StructuredPushSupplier::_default_POA (CORBA::Environment& /* env */)
+TAO_Notify_StructuredPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* env */)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_StructuredPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this,
-                        ACE_TRY_ENV);
+    poa->servant_to_id (this
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Notify_StructuredPushSupplier::disconnect_structured_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
-  this->proxy_consumer_->disconnect_structured_push_consumer (ACE_TRY_ENV);
+  this->proxy_consumer_->disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->deactivate (ACE_TRY_ENV);
+  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_StructuredPushSupplier::send_event (const CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->push_structured_event (event, ACE_TRY_ENV);
+  this->proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
index 5516ed84b4c..df8f50407c5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
@@ -44,28 +44,28 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushSupplier:public POA_CosNot
   TAO_Notify_StructuredPushSupplier (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa, CORBA::Environment & /*ACE_TRY_ENV*/);
+  void init (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  virtual void send_event (const CosNotification::StructuredEvent& event,
-                           CORBA::Environment &ACE_TRY_ENV);
+  virtual void send_event (const CosNotification::StructuredEvent& event
+                           TAO_ENV_ARG_DECL);
   // Send one event.
 
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr get_proxy_consumer (void);
   // Accessor for <proxy_consumer_>.
 
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
+  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
   // Deactivate the object.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   // = Data Members
@@ -84,8 +84,8 @@ protected:
   // = NotifySubscribe
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -94,7 +94,7 @@ protected:
 
     // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index 4fe0bcabd7c..bfefc4a4a1d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -19,30 +19,30 @@ Notify_Test_Client::~Notify_Test_Client ()
 }
 
 void
-Notify_Test_Client::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV)
+Notify_Test_Client::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
 {
-  this->init_ORB (argc, argv, ACE_TRY_ENV);
+  this->init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->resolve_naming_service (ACE_TRY_ENV);
+  this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->resolve_Notify_factory (ACE_TRY_ENV);
+  this->resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Notify_Test_Client::init_ORB (int argc,
-                      char *argv [],
-                      CORBA::Environment &ACE_TRY_ENV)
+                      char *argv []
+                      TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object))
@@ -52,23 +52,23 @@ Notify_Test_Client::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object, ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_TRY_ENV);
+    root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Notify_Test_Client::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Notify_Test_Client::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME,
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -76,25 +76,25 @@ Notify_Test_Client::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Notify_Test_Client::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV)
+Notify_Test_Client::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_context_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (),
-                                                         ACE_TRY_ENV);
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -109,7 +109,7 @@ Notify_Test_Client::ORB_run (void)
 }
 
 void
-Notify_Test_Client::shutdown (CORBA::Environment &/*ACE_TRY_ENV*/)
+Notify_Test_Client::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->done_ = 1;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 4efcf103d49..ed7d79f16e9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -33,23 +33,23 @@ class TAO_NOTIFY_TEST_Export Notify_Test_Client
   Notify_Test_Client (void);
   virtual ~Notify_Test_Client ();
 
-  virtual void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  virtual void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // starts the orb and resolves the notify factory via a naming service.
 
   int ORB_run (void);
   // Call ORB::run to accept requests.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
   // Shutdown the ORB
 
  protected:
-  void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
   // = Data Members
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 4407eed9915..33400229323 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -70,30 +70,30 @@ RedGreen_Test::~RedGreen_Test ()
 }
 
 void
-RedGreen_Test::init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
 {
-  init_ORB (argc, argv, ACE_TRY_ENV);
+  init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  resolve_naming_service (ACE_TRY_ENV);
+  resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  resolve_Notify_factory (ACE_TRY_ENV);
+  resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_EC (ACE_TRY_ENV);
+  create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_supplieradmin (ACE_TRY_ENV);
+  create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_consumeradmin (ACE_TRY_ENV);
+  create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_consumers (ACE_TRY_ENV);
+  create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_suppliers (ACE_TRY_ENV);
+  create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::run (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->send_events (ACE_TRY_ENV);
+  this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   worker_.thr_mgr ()->wait ();
@@ -108,18 +108,18 @@ RedGreen_Test::done (void)
 
 void
 RedGreen_Test::init_ORB (int argc,
-                      char *argv [],
-                      CORBA::Environment &ACE_TRY_ENV)
+                      char *argv []
+                      TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                "",
-                                ACE_TRY_ENV);
+                                ""
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_ptr poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
+    this->orb_->resolve_initial_references("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object))
@@ -129,14 +129,14 @@ RedGreen_Test::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object, ACE_TRY_ENV);
+    PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_TRY_ENV);
+    root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   worker_.orb (this->orb_.in ());
@@ -148,11 +148,11 @@ RedGreen_Test::init_ORB (int argc,
 }
 
 void
-RedGreen_Test::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME,
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -160,91 +160,91 @@ RedGreen_Test::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
+    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
 
   CORBA::Object_var obj =
-    this->naming_context_->resolve (name,
-                                   ACE_TRY_ENV);
+    this->naming_context_->resolve (name
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
-    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in (),
-                                                         ACE_TRY_ENV);
+    CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::create_EC (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-RedGreen_Test::create_supplieradmin (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
 
 void
-RedGreen_Test:: create_consumeradmin (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-RedGreen_Test::create_consumers (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
 {
   normal_consumer_ = new RedGreen_Test_StructuredPushConsumer (this);
-  normal_consumer_->connect (this->consumer_admin_.in (),
-                        ACE_TRY_ENV);
+  normal_consumer_->connect (this->consumer_admin_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   slow_consumer_ = new SlowConsumer (this);
-  slow_consumer_->connect (this->consumer_admin_.in (),
-                        ACE_TRY_ENV);
+  slow_consumer_->connect (this->consumer_admin_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::create_suppliers (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 {
   supplier_ = new RedGreen_Test_StructuredPushSupplier ();
-  supplier_->connect (this->supplier_admin_.in (),
-                        ACE_TRY_ENV);
+  supplier_->connect (this->supplier_admin_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Setup the Consumer 1 to receive event_type : "DOMAIN_GREEN", "DOMAIN_GREEN"
   CosNotification::EventTypeSeq added_1(1);
@@ -255,8 +255,8 @@ RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
   added_1.length (1);
   removed_1.length (0);
 
-  this->normal_consumer_->get_proxy_supplier ()->subscription_change (added_1, removed_1,
-                                                                      ACE_TRY_ENV);
+  this->normal_consumer_->get_proxy_supplier ()->subscription_change (added_1, removed_1
+                                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the Consumer 2 to receive event_type : "DOMAIN_RED", "TYPE_RED"
@@ -268,8 +268,8 @@ RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
   added_2.length (1);
   removed_2.length (0);
 
-  this->slow_consumer_->get_proxy_supplier ()->subscription_change (added_2, removed_2,
-                                                           ACE_TRY_ENV);
+  this->slow_consumer_->get_proxy_supplier ()->subscription_change (added_2, removed_2
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the events - one of each type
@@ -301,10 +301,10 @@ RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
   // let supplier 1 send all these events
   for (int i = 0; i < this->burst_size_; ++i)
     {
-      supplier_->send_event (red_event, ACE_TRY_ENV);
+      supplier_->send_event (red_event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      supplier_->send_event (green_event, ACE_TRY_ENV);
+      supplier_->send_event (green_event TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -365,15 +365,15 @@ RedGreen_Test_StructuredPushConsumer::dump_stats (const char* msg, ACE_UINT32 gs
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_, ACE_TRY_ENV);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -381,27 +381,29 @@ RedGreen_Test_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAd
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in (), ACE_TRY_ENV);
+    _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
-  proxy_supplier_->connect_structured_push_consumer (objref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_supplier_->connect_structured_push_consumer (objref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier(ACE_TRY_ENV);
+    disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed*/, CORBA::Environment & //ACE_TRY_ENV
-)
+RedGreen_Test_StructuredPushConsumer::offer_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed*/
+    TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -411,7 +413,9 @@ RedGreen_Test_StructuredPushConsumer::offer_change (const CosNotification::Event
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/)
+RedGreen_Test_StructuredPushConsumer::push_structured_event
+   (const CosNotification::StructuredEvent & notification
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -451,7 +455,8 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (const CosNotificati
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (CORBA::Environment &/*ACE_TRY_ENV*/)
+RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer
+   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -476,8 +481,8 @@ SlowConsumer::SlowConsumer (RedGreen_Test* RedGreen_Test)
 
 void
 SlowConsumer::push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -487,7 +492,7 @@ SlowConsumer::push_structured_event (
   // Slow it down ...
   ACE_OS::sleep (1);
 
-  RedGreen_Test_StructuredPushConsumer::push_structured_event (notification, ACE_TRY_ENV);
+  RedGreen_Test_StructuredPushConsumer::push_structured_event (notification TAO_ENV_ARG_PARAMETER);
 }
 
 /*****************************************************************/
@@ -513,41 +518,43 @@ RedGreen_Test_StructuredPushSupplier::dump_stats (const char* msg, ACE_UINT32 gs
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin, CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (ACE_TRY_ENV);
+    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_, ACE_TRY_ENV);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in (), ACE_TRY_ENV);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
-  proxy_consumer_->connect_structured_push_supplier (objref.in (),
-                                                     ACE_TRY_ENV);
+  proxy_consumer_->connect_structured_push_supplier (objref.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_TRY_ENV);
+  this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, const CosNotification::EventTypeSeq & /*removed */, CORBA::Environment & /*ACE_TRY_ENV*/
-      )
+RedGreen_Test_StructuredPushSupplier::subscription_change
+   (const CosNotification::EventTypeSeq & /*added*/,
+    const CosNotification::EventTypeSeq & /*removed */
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -557,7 +564,7 @@ RedGreen_Test_StructuredPushSupplier::subscription_change (const CosNotification
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEvent& event, CORBA::Environment &ACE_TRY_ENV)
+RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL)
 {
   event.filterable_data.length (1);
   event.filterable_data[0].name = CORBA::string_dup("latency_base");
@@ -570,7 +577,7 @@ RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEve
                                  start);
   // any
   event.filterable_data[0].value <<= latency_base;
-  proxy_consumer_->push_structured_event (event, ACE_TRY_ENV);
+  proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -581,7 +588,8 @@ RedGreen_Test_StructuredPushSupplier::send_event (CosNotification::StructuredEve
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA::Environment &/*ACE_TRY_ENV*/)
+RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier
+   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 1be06a52b22..529134d0773 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -52,15 +52,15 @@ public:
   virtual int svc (void);
   // The thread entry point.
 
-	void done (void);
-	// set done flag.
+        void done (void);
+        // set done flag.
 
 private:
   CORBA::ORB_var orb_;
   // The orb
 
-	CORBA::Boolean done_;
-	// Flag to tell that we're done servicing.
+        CORBA::Boolean done_;
+        // Flag to tell that we're done servicing.
 };
 
 class RedGreen_Test
@@ -79,10 +79,10 @@ class RedGreen_Test
 
   void dump_results (void);
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Init the Client.
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the demo.
 
   void done (void);
@@ -94,31 +94,31 @@ class RedGreen_Test
   int nthreads_;
 
  protected:
-  void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create an EC.
 
-  void create_supplieradmin(CORBA::Environment &ACE_TRY_ENV);
+  void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (CORBA::Environment &ACE_TRY_ENV);
+  void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL);
   // Create the Consumer Admin.
 
-  void create_consumers (CORBA::Environment &ACE_TRY_ENV);
+  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
   // Create and initialize the consumers.
 
-  void create_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
   // create and initialize the suppliers.
 
-  void send_events (CORBA::Environment &ACE_TRY_ENV);
+  void send_events (TAO_ENV_SINGLE_ARG_DECL);
   // send the events.
 
   // = Data Members
@@ -173,11 +173,11 @@ class RedGreen_Test_StructuredPushConsumer : public POA_CosNotifyComm::Structure
   RedGreen_Test_StructuredPushConsumer (RedGreen_Test* RedGreen_Test);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin, CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
@@ -215,8 +215,8 @@ protected:
   // = NotifyPublish method
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -225,8 +225,8 @@ protected:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -234,7 +234,7 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -249,8 +249,8 @@ public:
   SlowConsumer (RedGreen_Test* RedGreen_Test);
 
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -273,16 +273,16 @@ class RedGreen_Test_StructuredPushSupplier : public POA_CosNotifyComm::Structure
   RedGreen_Test_StructuredPushSupplier (void);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                CORBA::Environment &ACE_TRY_ENV);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+                TAO_ENV_ARG_DECL);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  virtual void send_event (CosNotification::StructuredEvent& event,
-                           CORBA::Environment &ACE_TRY_ENV);
+  virtual void send_event (CosNotification::StructuredEvent& event
+                           TAO_ENV_ARG_DECL);
   // Send one event.
 
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
@@ -309,8 +309,8 @@ protected:
   // = NotifyRedGreen_Test
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::EventTypeSeq & removed
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -319,7 +319,7 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        CORBA::Environment &ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index 34716eacf32..78216136b95 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -14,11 +14,11 @@ main (int argc, char *argv [])
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv,
-                   ACE_TRY_ENV); //Init the Client
+      client.init (argc, argv
+                   TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      client.run (ACE_TRY_ENV);
+      client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 42acc73fe89..ba0367da876 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -36,7 +36,9 @@ Throughput_StructuredPushConsumer::dump_stats (const char* msg, ACE_UINT32 gsf)
 }
 
 void
-Throughput_StructuredPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification, CORBA::Environment &/*ACE_TRY_ENV*/)
+Throughput_StructuredPushConsumer::push_structured_event
+   (const CosNotification::StructuredEvent & notification
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -71,10 +73,9 @@ Throughput_StructuredPushConsumer::push_structured_event (const CosNotification:
     ACE_DEBUG ((LM_DEBUG,"(%P)(%t) event count = %d\n", this->push_count_));
 
 
-  ACE_DECLARE_NEW_CORBA_ENV;
   test_client_->g_consumer_done_count++;
   if (test_client_->g_consumer_done_count.value () >= test_client_->expected_count_)
-    test_client_->end_test (ACE_TRY_ENV);
+    test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
 
 }
 
@@ -139,7 +140,7 @@ Throughput_StructuredPushSupplier::svc (void)
   // The "remainder_of_body" carries a flag that indicates shutdown.
   // 0 - no, 1 = yes for shutdown.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   this->throughput_start_ = ACE_OS::gethrtime ();
 
@@ -155,7 +156,7 @@ Throughput_StructuredPushSupplier::svc (void)
           // any
           event.filterable_data[0].value <<= Throughput_base;
 
-          this->proxy_consumer_->push_structured_event (event, ACE_TRY_ENV);
+          this->proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -175,7 +176,7 @@ Throughput_StructuredPushSupplier::svc (void)
                                  start);
   event.filterable_data[0].value <<= Throughput_base;
 
-  this->proxy_consumer_->push_structured_event (event, ACE_TRY_ENV);
+  this->proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   test_client_->g_consumer_done_count++;
@@ -202,7 +203,7 @@ Notify_Throughput::~Notify_Throughput ()
 }
 
 void
-Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_ENV)
+Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
 {
 
   expected_count_ = burst_count_*burst_size_*supplier_count_*consumer_count_;
@@ -210,7 +211,7 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN
   ACE_DEBUG ((LM_DEBUG, "expected count = %d\n", expected_count_));
 
   // init base class
-  Notify_Test_Client::init_ORB (argc, argv, ACE_TRY_ENV);
+  Notify_Test_Client::init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   worker_.orb (this->orb_.in ());
@@ -220,19 +221,19 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN
     ACE_ERROR ((LM_ERROR,
                 "Cannot activate client threads\n"));
   // Create all participents ...
-  this->create_EC (ACE_TRY_ENV);
+  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid, ACE_TRY_ENV);
+    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -247,9 +248,9 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN
   for (i = 0; i < this->consumer_count_; ++i)
     {
       consumers_[i] = new Throughput_StructuredPushConsumer (this);
-      consumers_[i]->init (root_poa_.in (), ACE_TRY_ENV);
+      consumers_[i]->init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      consumers_[i]->connect (this->consumer_admin_.in (), ACE_TRY_ENV);
+      consumers_[i]->connect (this->consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -257,9 +258,9 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN
     {
       suppliers_[i] = new Throughput_StructuredPushSupplier (this);
       suppliers_[i]->
-        TAO_Notify_StructuredPushSupplier::init (root_poa_.in (), ACE_TRY_ENV);
+        TAO_Notify_StructuredPushSupplier::init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      suppliers_[i]->connect (this->supplier_admin_.in (), ACE_TRY_ENV);
+      suppliers_[i]->connect (this->supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -274,7 +275,7 @@ Notify_Throughput::init (int argc, char* argv [], CORBA::Environment &ACE_TRY_EN
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed, ACE_TRY_ENV);
+  this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -350,22 +351,22 @@ Notify_Throughput::parse_args(int argc, char *argv[])
 }
 
 void
-Notify_Throughput::create_EC (CORBA::Environment &ACE_TRY_ENV)
+Notify_Throughput::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->colocated_ec_ == 1)
     {
       this->notify_factory_ =
-        TAO_Notify_EventChannelFactory_i::create (this->root_poa_.in (),
-                                                  ACE_TRY_ENV);
+        TAO_Notify_EventChannelFactory_i::create (this->root_poa_.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
     }
   else
     {
-      this->resolve_naming_service (ACE_TRY_ENV);
+      this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->resolve_Notify_factory (ACE_TRY_ENV);
+      this->resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -373,15 +374,15 @@ Notify_Throughput::create_EC (CORBA::Environment &ACE_TRY_ENV)
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
-                                         id,
-                                         ACE_TRY_ENV);
+                                         id
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-Notify_Throughput::run_test (CORBA::Environment &ACE_TRY_ENV)
+Notify_Throughput::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_DEBUG ((LM_DEBUG, "colocated_ec_ %d ,"
@@ -402,7 +403,7 @@ Notify_Throughput::run_test (CORBA::Environment &ACE_TRY_ENV)
   for (int i = 0; i < this->supplier_count_; ++i)
     {
       suppliers_[i]->
-        TAO_Notify_StructuredPushSupplier::init (root_poa_.in (), ACE_TRY_ENV);
+        TAO_Notify_StructuredPushSupplier::init (root_poa_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (suppliers_[i]->activate (THR_NEW_LWP | THR_JOINABLE) != 0)
@@ -416,12 +417,12 @@ Notify_Throughput::run_test (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Notify_Throughput::end_test (CORBA::Environment &ACE_TRY_ENV)
+Notify_Throughput::end_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   dump_results ();
 
   ACE_DEBUG ((LM_DEBUG, "calling shutdown\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -470,14 +471,14 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc, argv,
-                      ACE_TRY_ENV); //Init the Client
+      events.init (argc, argv
+                      TAO_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      events.run_test (ACE_TRY_ENV);
+      events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      events.end_test (ACE_TRY_ENV);
+      events.end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 16b67a6c4d7..6f8caa80147 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -64,8 +64,8 @@ public:
 
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
-        const CosNotification::StructuredEvent & notification,
-        CORBA::Environment &ACE_TRY_ENV
+        const CosNotification::StructuredEvent & notification
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -138,13 +138,13 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  void init (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
+  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
   // initialization.
 
-  void run_test (CORBA::Environment &ACE_TRY_ENV);
+  void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (CORBA::Environment &ACE_TRY_ENV);
+  void end_test (TAO_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   void dump_results (void);
@@ -152,7 +152,7 @@ public:
 
   Worker worker_;
 protected:
-  void create_EC (CORBA::Environment &ACE_TRY_ENV);
+  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
   // Create participants.
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 9e6fd9eaeda..f578d7fc690 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -27,13 +27,13 @@ ACE_RCSID(CosPropertyService, client, "$Id$")
 
 int
 Client::init (int argc,
-              char *argv[],
-              CORBA::Environment &ACE_TRY_ENV)
+              char *argv[]
+              TAO_ENV_ARG_DECL)
 {
   // Init the ORB.
   manager_.init (argc,
-                 argv,
-                 ACE_TRY_ENV);
+                 argv
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Initialize the naming services
@@ -48,12 +48,12 @@ Client::init (int argc,
   CosNaming::Name propsetdef_name (1);
   propsetdef_name.length (1);
   propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
-  CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name,
-                                                               ACE_TRY_ENV);
+  CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name
+                                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in (),
-                                                                   ACE_TRY_ENV);
+  this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in ()
+                                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->propsetdef_.in ()))
@@ -67,62 +67,62 @@ Client::init (int argc,
 // Testing the methods of the property service.
 
 int
-Client::property_tester (CORBA::Environment &ACE_TRY_ENV)
+Client::property_tester (TAO_ENV_SINGLE_ARG_DECL)
 {
   // = Testing PropertySet & Iterators.
 
   // Testing define_property () of PropertySet interface.
-  this->test_define_property (ACE_TRY_ENV);
+  this->test_define_property (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_TRY_ENV);
+  this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (ACE_TRY_ENV);
+  this->test_get_all_property_names (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test get_property_value.
-  this->test_get_property_value (ACE_TRY_ENV);
+  this->test_get_property_value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing delete property.
-  this->test_delete_property ("no_property",ACE_TRY_ENV);
+  this->test_delete_property ("no_property" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_properties.
-  this->test_get_properties (ACE_TRY_ENV);
+  this->test_get_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing delete_properties.
-  this->test_delete_properties (ACE_TRY_ENV);
+  this->test_delete_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_TRY_ENV);
+  this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing define_properties.
-  this->test_define_properties (ACE_TRY_ENV);
+  this->test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_TRY_ENV);
+  this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (ACE_TRY_ENV);
+  this->test_get_all_property_names (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_all_properties.
-  this->test_get_all_properties (ACE_TRY_ENV);
+  this->test_get_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // = Testing PropertySetDef & Iterators.
 
   // Testing define_property_with_mode.
-  this->test_define_property_with_mode (ACE_TRY_ENV);
+  this->test_define_property_with_mode (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -131,7 +131,7 @@ Client::property_tester (CORBA::Environment &ACE_TRY_ENV)
 // Testing define_property.
 
 int
-Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
+Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any anyval;
 
@@ -142,8 +142,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   anyval >>= CORBA::Any::to_char (ch);
 
   this->propsetdef_->define_property ("char_property",
-                                      anyval,
-                                      ACE_TRY_ENV);
+                                      anyval
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -153,8 +153,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   anyval >>= s;
 
   propsetdef_->define_property ("short_property",
-                                anyval,
-                                ACE_TRY_ENV);
+                                anyval
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -164,8 +164,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   anyval >>= l;
   CORBA::Any newany(anyval);
   propsetdef_->define_property ("long_property",
-                                anyval,
-                                ACE_TRY_ENV);
+                                anyval
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -175,8 +175,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   anyval >>= f;
 
   propsetdef_->define_property ("float_property",
-                                anyval,
-                                ACE_TRY_ENV);
+                                anyval
+                                TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
@@ -186,8 +186,8 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   const char * newstr;
   anyval >>= newstr;
   propsetdef_->define_property ("string_property",
-                                anyval,
-                                ACE_TRY_ENV);
+                                anyval
+                                TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
@@ -197,11 +197,11 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
 // Testing get_all_property_names of the PropertySet.
 
 int
-Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get the size.
   CORBA::ULong num_of_properties =
-    propsetdef_->get_number_of_properties (ACE_TRY_ENV);
+    propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get half on the names and half of on the iterator.
@@ -219,8 +219,8 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
 
   propsetdef_->get_all_property_names (how_many,
                                        names_out,
-                                       iterator_out,
-                                       ACE_TRY_ENV);
+                                       iterator_out
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the values back to var.
@@ -249,7 +249,7 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
           CosPropertyService::PropertyName_out name_out (name_ptr);
 
           // Call the function.
-          CORBA::Boolean next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
+          CORBA::Boolean next_one_result = iterator_var->next_one (name_out TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           // Get the values back on a _var variable.
@@ -260,7 +260,7 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
               ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
 
               // Call the function to iterate again.
-              next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
+              next_one_result = iterator_var->next_one (name_out TAO_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (-1);
 
               // Get the values back on a _var variable.
@@ -277,7 +277,7 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
 // properties.
 
 int
-Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get float_property, string_property and no_property. If return
   // value is false and type is tc_void then that name is not there in
@@ -303,8 +303,8 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
 
   // Get the properties.
   CORBA::Boolean return_val = propsetdef_->get_properties (names.in (),
-                                                           properties_out,
-                                                           ACE_TRY_ENV);
+                                                           properties_out
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_UNUSED_ARG (return_val);
   ACE_CHECK_RETURN (-1);
 
@@ -369,9 +369,9 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
 // Testing, get_number_of_properties.
 
 int
-Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
-  CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (ACE_TRY_ENV);
+  CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (TAO_debug_level > 0)
@@ -386,15 +386,15 @@ Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
 // Test delete_property.
 
 int
-Client::test_delete_property (const char *property_name,
-                              CORBA::Environment &ACE_TRY_ENV)
+Client::test_delete_property (const char *property_name
+                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::String_var property_name_var (property_name);
 
-      this->propsetdef_->delete_property (property_name_var.in (),
-                                          ACE_TRY_ENV);
+      this->propsetdef_->delete_property (property_name_var.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
@@ -419,7 +419,7 @@ Client::test_delete_property (const char *property_name,
 // properties.
 
 int
-Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosPropertyService::PropertyNames prop_names;
   prop_names.length (3);
@@ -427,8 +427,8 @@ Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
   prop_names [1] = CORBA::string_dup ("short_property");
   prop_names [2] = CORBA::string_dup ("long_property");
   // prop_names [3] = CORBA::string_dup ("no_property");
-  this->propsetdef_->delete_properties (prop_names,
-                                        ACE_TRY_ENV);
+  this->propsetdef_->delete_properties (prop_names
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 0);
 
   return 0;
@@ -438,7 +438,7 @@ Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
 // float in the property set.
 
 int
-Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   CosPropertyService::Properties nproperties;
   nproperties.length (4);
@@ -476,7 +476,7 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
   nproperties[3].property_value <<= f;
 
   // Define this sequence of properties now.
-  this->propsetdef_->define_properties (nproperties, ACE_TRY_ENV);
+  this->propsetdef_->define_properties (nproperties TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   return 0;
@@ -485,11 +485,11 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
 // Test get_all_properties.
 
 int
-Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get the number of current properties.
   CORBA::ULong num_of_properties =
-    this->propsetdef_->get_number_of_properties (ACE_TRY_ENV);
+    this->propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
   ACE_UNUSED_ARG (num_of_properties);
 
@@ -504,8 +504,8 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
 
   propsetdef_->get_all_properties (how_many,
                                    properties_out,
-                                   iterator_out,
-                                   ACE_TRY_ENV);
+                                   iterator_out
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   // Get these values to the _var's.
@@ -561,8 +561,8 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
           CosPropertyService::Property_out property_out (property_ptr);
 
           // Call the funtion.
-          CORBA::Boolean next_one_result = iterator->next_one (property_out,
-                                                               ACE_TRY_ENV);
+          CORBA::Boolean next_one_result = iterator->next_one (property_out
+                                                               TAO_ENV_ARG_PARAMETER);
 
           // Get the value to the _var variable.
           CosPropertyService::Property_var property = property_out.ptr ();
@@ -611,8 +611,8 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
                 }
 
               // Call the function for the next iteraton.
-              next_one_result = iterator->next_one (property_out,
-                                                    ACE_TRY_ENV);
+              next_one_result = iterator->next_one (property_out
+                                                    TAO_ENV_ARG_PARAMETER);
 
               // Get the value to the _var variable.
               property = property_out.ptr ();
@@ -626,7 +626,7 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
 // Testing define property with mode.
 // Defines char, short, long and float properties with different modes.
 int
-Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
+Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any anyval;
 
@@ -638,8 +638,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
 
   this->propsetdef_->define_property_with_mode ("char_property",
                                                 anyval,
-                                                CosPropertyService::normal,
-                                                ACE_TRY_ENV);
+                                                CosPropertyService::normal
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -650,8 +650,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
 
   propsetdef_->define_property_with_mode ("short_property",
                                           anyval,
-                                          CosPropertyService::read_only,
-                                          ACE_TRY_ENV);
+                                          CosPropertyService::read_only
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -662,8 +662,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Any newany(anyval);
   propsetdef_->define_property_with_mode ("long_property",
                                           anyval,
-                                          CosPropertyService::fixed_normal,
-                                          ACE_TRY_ENV);
+                                          CosPropertyService::fixed_normal
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
 
@@ -674,8 +674,8 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   anyval >>= f;
   propsetdef_->define_property_with_mode ("float_property",
                                           anyval,
-                                          CosPropertyService::fixed_readonly,
-                                          ACE_TRY_ENV);
+                                          CosPropertyService::fixed_readonly
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   // Prepare a String and "define" that in the PropertySet.
@@ -685,21 +685,21 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   anyval >>= newstr;
 
   propsetdef_->define_property  ("string_property",
-                                 anyval,
-                                 ACE_TRY_ENV);
+                                 anyval
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   return 0;
 }
 
 int
-Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Get the ior property.
-      CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR",
-                                                                      ACE_TRY_ENV);
+      CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR"
+                                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check whether the IOR is fine.
@@ -707,8 +707,8 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
       (*any_ptr) >>= CORBA::Any::to_object (propsetdef_object.out ());
 
       CosPropertyService::PropertySetDef_var propsetdef =
-        CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in (),
-                                                     ACE_TRY_ENV);
+        CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (propsetdef.in ()))
@@ -730,20 +730,20 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       Client client;
 
       if (client.init (argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       ACE_TRY_CHECK;
 
-      //  client.run (ACE_TRY_ENV);
-      int ret = client.property_tester (ACE_TRY_ENV);
+      //  client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int ret = client.property_tester (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_DEBUG ((LM_DEBUG, "Test failed\n"));
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index bd4952c64b1..95934187979 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -45,53 +45,53 @@ public:
   // Constructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &ACE_TRY_ENV);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the ORB etc, and bind the MMDevices.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the client.  This will call StreamCtrl::bind_devs.
 
-  int property_tester (CORBA::Environment &ACE_TRY_ENV);
+  int property_tester (TAO_ENV_SINGLE_ARG_DECL);
   // Testing  the property service methods.
 
 protected:
   int bind_to_remote_mmdevice (int argc,
-                               char *argv[],
-                               CORBA::Environment &ACE_TRY_ENV);
+                               char *argv[]
+                               TAO_ENV_ARG_DECL);
   // Bind to the remote MMDevice.
 
   // = Property Testing.
 
-  int test_define_property (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_property (TAO_ENV_SINGLE_ARG_DECL);
   // Testing the define property method.
 
-  int test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Testing the number of properties, currently in the Property Set.
 
-  int test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL);
   //Testing get_all_property_names.
 
-  int test_get_property_value (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_property_value (TAO_ENV_SINGLE_ARG_DECL);
   // Testing get_property_value.
 
-  int test_get_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_properties (TAO_ENV_SINGLE_ARG_DECL);
   //Testing get_properties.  Give the names and get their properties.
 
-  int test_get_all_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Testing get_all_properties.
 
-  int test_delete_property (const char *property_name,
-                            CORBA::Environment &ACE_TRY_ENV);
+  int test_delete_property (const char *property_name
+                            TAO_ENV_ARG_DECL);
   // Testing delete_property.
 
-  int test_delete_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_delete_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Testing delete_properties.
 
-  int test_define_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Defining a sequence of properties.
 
-  int test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL);
   // Defines properties with various modes.
 
   TAO_ORB_Manager manager_;
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index c6410361fde..d9aa1ef279b 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -40,31 +40,31 @@ public:
   ~TAO_PropertySet_Tester (void);
   // Destructor.
 
-  int test_define_property (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_property (TAO_ENV_SINGLE_ARG_DECL);
   // Defines a char,a short, a long, a float and a string property.
 
-  int test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Gets the number of properties currently defined in the PropertySet.
 
-  int test_delete_property (const char *property_name,
-                            CORBA::Environment &ACE_TRY_ENV);
+  int test_delete_property (const char *property_name
+                            TAO_ENV_ARG_DECL);
   // Delete a given property.
 
-  int test_is_property_defined (CORBA::Environment &ACE_TRY_ENV);
+  int test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL);
   // Check the following properties are defined or
   // no. "char_property", "short_property" and a "string_property".
 
-  int test_get_property_value (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_property_value (TAO_ENV_SINGLE_ARG_DECL);
   // Get the "float_property" and "string_property" and print them
   // out.
 
-  int test_delete_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_delete_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Delete char, short,long, and string properties.
 
-  int test_delete_all_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_delete_all_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Delete all the properties.
 
-  int test_define_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_properties (TAO_ENV_SINGLE_ARG_DECL);
   // Define a sequence of properties. a char, a short, a long, a float
   // and a string.
 
@@ -89,14 +89,14 @@ public:
   ~TAO_PropertyNamesIterator_Tester (void);
   // Destructor.
 
-  int test_next_one (CORBA::Environment &ACE_TRY_ENV);
+  int test_next_one (TAO_ENV_SINGLE_ARG_DECL);
   // Test next one method. Iterate thru all the names in the
   // PropertySet and print them out.
 
-  int test_reset (CORBA::Environment &ACE_TRY_ENV);
+  int test_reset (TAO_ENV_SINGLE_ARG_DECL);
   // Test the reset method.
 
-  int test_next_n (size_t n, CORBA::Environment &ACE_TRY_ENV);
+  int test_next_n (size_t n TAO_ENV_ARG_DECL);
   // Test the next_n method.
 private:
   TAO_PropertyNamesIterator iterator_;
@@ -116,7 +116,7 @@ TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
 
 // Defines a char, a short, a long, a float and a string.
 int
-TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property\n"));
@@ -132,8 +132,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               "Main : Char ch = %c\n",
               ch));
   property_set_.define_property ("char_property",
-                                 anyval,
-                                 ACE_TRY_ENV);
+                                 anyval
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -145,8 +145,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               "Main : Short s = %d\n",
               s));
   property_set_.define_property ("short_property",
-                                 anyval,
-                                 ACE_TRY_ENV);
+                                 anyval
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
 
@@ -161,8 +161,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Any newany(anyval);
 
   property_set_.define_property ("long_property",
-                                 anyval,
-                                 ACE_TRY_ENV);
+                                 anyval
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -174,8 +174,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               "Main : Float f = %f\n",
               f));
   property_set_.define_property ("float_property",
-                                 anyval,
-                                 ACE_TRY_ENV);
+                                 anyval
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Prepare a String and "define" that in the PropertySet.
@@ -190,8 +190,8 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               strvar.in (),
               newstr));
   property_set_.define_property ("string_property",
-                                 anyval,
-                                 ACE_TRY_ENV);
+                                 anyval
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -199,11 +199,11 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
 
 // Testing, get_number_of_properties.
 int
-TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Main : Number of props : %d\n",
-              property_set_.get_number_of_properties (ACE_TRY_ENV)));
+              property_set_.get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER)));
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -212,12 +212,12 @@ TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &ACE_T
 // Testing the delete_property. Delets property, with the given name,
 // if that exsists.
 int
-TAO_PropertySet_Tester::test_delete_property (const char *property_name,
-                                              CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_delete_property (const char *property_name
+                                              TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n"));
-  property_set_.delete_property (property_name,
-                                 ACE_TRY_ENV);
+  property_set_.delete_property (property_name
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -226,13 +226,13 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name,
 // Gets the value of "short_property" and "string_property".
 
 int
-TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking get_property_value\n"));
 
-  CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property",
-                                                            ACE_TRY_ENV);
+  CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property"
+                                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Get the short value.
@@ -248,8 +248,8 @@ TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV
     ACE_DEBUG ((LM_DEBUG,
                 "Short property not found\n"));
   // Get the string.
-  anyptr = property_set_.get_property_value ("string_property",
-                                             ACE_TRY_ENV);
+  anyptr = property_set_.get_property_value ("string_property"
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
   if (anyptr != 0)
     {
@@ -268,28 +268,28 @@ TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV
 // "string_property" and "char_property".
 
 int
-TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking is_property_defined ()\n"));
-  if (property_set_.is_property_defined ("short_property",
-                                         ACE_TRY_ENV) == 0)
+  if (property_set_.is_property_defined ("short_property"
+                                         TAO_ENV_ARG_PARAMETER) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "short_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "short_property defined\n"));
   ACE_CHECK_RETURN ( 1);
-  if (property_set_.is_property_defined ("string_property",
-                                         ACE_TRY_ENV) == 0)
+  if (property_set_.is_property_defined ("string_property"
+                                         TAO_ENV_ARG_PARAMETER) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "string_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "string_property defined\n"));
   ACE_CHECK_RETURN ( 1);
-  if (property_set_.is_property_defined ("char_property",
-                                         ACE_TRY_ENV) == 0)
+  if (property_set_.is_property_defined ("char_property"
+                                         TAO_ENV_ARG_PARAMETER) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "char_property not defined\n"));
   else
@@ -304,7 +304,7 @@ TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &ACE_TRY_EN
 // PropertySet.  Deleting char, short, long, float and string
 // properties.
 int
-TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties == Deleting a sequence of Properties\n"));
@@ -318,8 +318,8 @@ TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
               "Length of sequence %d, Maxlength : %d\n",
               prop_names.length (),
               prop_names.maximum ()));
-  property_set_.delete_properties (prop_names,
-                                   ACE_TRY_ENV);
+  property_set_.delete_properties (prop_names
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 0);
 
   return 0;
@@ -328,7 +328,7 @@ TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
 // Defines a sequnce of properties containing, char, short, long,
 // float and string property in the property set.
 int
-TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_properties == Defining sequence of properties\n"));
@@ -376,7 +376,7 @@ TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
   nproperties[4].property_value <<= strvar.in ();
 
   // Define this sequence of properties now.
-  property_set_.define_properties (nproperties, ACE_TRY_ENV);
+  property_set_.define_properties (nproperties TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -384,12 +384,12 @@ TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
 
 // Delete all the properties.
 int
-TAO_PropertySet_Tester::test_delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_delete_all_properties (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Deleting all the properties
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_all_properties\n"));
-  int ret = property_set_.delete_all_properties (ACE_TRY_ENV);
+  int ret = property_set_.delete_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (ret == 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -414,18 +414,18 @@ TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
 // Test next one method. Iterate thru all the names in the
 // PropertySet and print them out.
 int
-TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertyNamesIterator_Tester::test_next_one (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::String_var strvar;
   ACE_DEBUG ((LM_DEBUG,
               "\nTesting next_one of NamesIterator, Iterating thru names.\n"));
   // Let us iterate, now.
-  int ret = iterator_.next_one (strvar.out (), ACE_TRY_ENV);
+  int ret = iterator_.next_one (strvar.out () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
   while (ret != 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ()));
-      ret = iterator_.next_one (strvar.out (), ACE_TRY_ENV);
+      ret = iterator_.next_one (strvar.out () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (1);
     }
   return 0;
@@ -433,25 +433,25 @@ TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &ACE_TRY_ENV
 
 // Reset the names iterator.
 int
-TAO_PropertyNamesIterator_Tester::test_reset (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertyNamesIterator_Tester::test_reset (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Resetting (reset ()) the NamesIterator."));
-  iterator_.reset (ACE_TRY_ENV);
+  iterator_.reset (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
   return 0;
 }
 
 // Test the next_n method. Get the next n names and print them all.
 int
-TAO_PropertyNamesIterator_Tester::test_next_n (size_t n,
-                                               CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
+                                               TAO_ENV_ARG_DECL)
 {
   CosPropertyService::PropertyNames_var pnames_var;
   ACE_DEBUG ((LM_DEBUG,
               "Checking next_n (), next %d\n",
               n));
-  int ret = iterator_.next_n (n, pnames_var.out (), ACE_TRY_ENV);
+  int ret = iterator_.next_n (n, pnames_var.out () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
   if (ret == 0)
     {
@@ -474,8 +474,8 @@ main (int argc, char *argv [])
     {
       CORBA::ORB_var orb_var = CORBA::ORB_init (argc,
                                                 argv,
-                                                "internet",
-                                                ACE_TRY_ENV);
+                                                "internet"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // = Checking PropertySet interface.
@@ -486,57 +486,57 @@ main (int argc, char *argv [])
 
       // Checking define_property. define a char, a short,a long, a float
       // and a string.
-      propertyset_tester.test_define_property (ACE_TRY_ENV);
+      propertyset_tester.test_define_property (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
+      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test delete property. Delete "string_property"
-      propertyset_tester.test_delete_property ("string_property", ACE_TRY_ENV);
+      propertyset_tester.test_delete_property ("string_property" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
+      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test delete_properties. Delete char, short, long and float.
-      propertyset_tester.test_delete_properties (ACE_TRY_ENV);
+      propertyset_tester.test_delete_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
+      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (ACE_TRY_ENV);
+      propertyset_tester.test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
+      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking get_property_value. get the value of short and string.
-      propertyset_tester.test_get_property_value (ACE_TRY_ENV);
+      propertyset_tester.test_get_property_value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking delete_all_properties.
-      propertyset_tester.test_delete_all_properties (ACE_TRY_ENV);
+      propertyset_tester.test_delete_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
+      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (ACE_TRY_ENV);
+      propertyset_tester.test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
+      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // = Checking the PropertyNamesIterator interface.
@@ -548,37 +548,37 @@ main (int argc, char *argv [])
       TAO_PropertyNamesIterator_Tester names_iterator_tester (propertyset_tester);
 
       // Checking next_one. Iterate thru the property names.
-      names_iterator_tester.test_next_one (ACE_TRY_ENV);
+      names_iterator_tester.test_next_one (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking the reset () method.
-      names_iterator_tester.test_reset (ACE_TRY_ENV);
+      names_iterator_tester.test_reset (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Iterating again thru the property names.
-      names_iterator_tester.test_next_one (ACE_TRY_ENV);
+      names_iterator_tester.test_next_one (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Reset again.
-      names_iterator_tester.test_reset (ACE_TRY_ENV);
+      names_iterator_tester.test_reset (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking next_n. Prints out all the names it has got.
-      names_iterator_tester.test_next_n (6, ACE_TRY_ENV);
+      names_iterator_tester.test_next_n (6 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try next_n without resetting.
-      names_iterator_tester.test_next_n (6, ACE_TRY_ENV);
+      names_iterator_tester.test_next_n (6 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_ENV_ARG_PARAMETER.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_ENV_ARG_PARAMETER.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index b23ecdb1fea..12eac84b999 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -25,8 +25,8 @@ ACE_RCSID(CosPropertyService, server, "$Id$")
 int
 main (int argc, char ** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  
+  TAO_ENV_DECLARE_NEW_ENV;
+
   ACE_TRY
     {
       TAO_ORB_Manager m;
@@ -34,72 +34,72 @@ main (int argc, char ** argv)
       // Initialize the ORB.
       m.init_child_poa (argc,
                         argv,
-                        "child_poa",
-                        ACE_TRY_ENV);
+                        "child_poa"
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Using naming server.
       TAO_Naming_Client my_name_client;
       if (my_name_client.init (m.orb ()) < 0)
         return 1;
-      
+
       // Create PropertySetDef object and register.
       TAO_PropertySetDef *propsetdef_impl;
       ACE_NEW_RETURN (propsetdef_impl,
                       TAO_PropertySetDef,
                       -1);
       CosPropertyService::PropertySetDef_var propsetdef =
-        propsetdef_impl->_this (ACE_TRY_ENV);
+        propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name propsetdef_name (1);
       propsetdef_name.length (1);
       propsetdef_name[0].id = CORBA::string_dup ("PropertySetDef");
       my_name_client->bind (propsetdef_name,
-                            propsetdef.in (),
-                            ACE_TRY_ENV);
+                            propsetdef.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any any_val;
 
       // Make this IOR as one of the properties in there.
-      any_val <<= propsetdef_impl->_this (ACE_TRY_ENV);
+      any_val <<= propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var ior = propsetdef_impl->_this (ACE_TRY_ENV);
+      CORBA::Object_var ior = propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Object_ptr ior_ptr = ior.in ();
       any_val <<= ior_ptr;
       // any_val.replace (CORBA::_tc_Object,
       //                  &ior_ptr,
-      //                  1,
-      //                  ACE_TRY_ENV);
+      //                  1
+      //                  TAO_ENV_ARG_PARAMETER);
       // ACE_TRY_CHECK;
-      
+
       propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR",
                                                   any_val,
-                                                  CosPropertyService::fixed_readonly,
-                                                  ACE_TRY_ENV);
+                                                  CosPropertyService::fixed_readonly
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // Create PropertySet factory and then register.
       TAO_PropertySetFactory *propset_factory_impl;
       ACE_NEW_RETURN (propset_factory_impl,
                       TAO_PropertySetFactory,
                       -1);
       CosPropertyService::PropertySetFactory_var propset_factory =
-        propset_factory_impl->_this (ACE_TRY_ENV);
+        propset_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name propset_factory_name (1);
       propset_factory_name.length (1);
       propset_factory_name[0].id = CORBA::string_dup ("PropertySetFactory");
       my_name_client->bind (propset_factory_name,
-                            propset_factory.in (),
-                            ACE_TRY_ENV);
+                            propset_factory.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB Event loop.
-      m.run (ACE_TRY_ENV);
+      m.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index a4df4e07ba5..28c3e09023c 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -322,11 +322,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(poa_object.in ()))
@@ -335,14 +335,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the naming services
@@ -368,8 +368,8 @@ main (int argc, char *argv[])
         {
           // create the RT_Info
           config_infos[i].handle =
-            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point,
-                                                      ACE_TRY_ENV);
+            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // initialize the RT_Info
@@ -383,8 +383,8 @@ main (int argc, char *argv[])
                  ACE_static_cast (RtecScheduler::Importance_t, config_infos[i].importance),
                  config_infos[i].quantum,
                  config_infos[i].threads,
-                 ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type),
-                 ACE_TRY_ENV);
+                 ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type)
+                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // make operations in second half dependant on
@@ -396,8 +396,8 @@ main (int argc, char *argv[])
                 add_dependency (config_infos[i].handle,
                                 config_infos[i - (operation_count / 2)].handle,
                                 2,                             // number of calls
-                                RtecBase::ONE_WAY_CALL,   // type of dependency
-                                ACE_TRY_ENV);
+                                RtecBase::ONE_WAY_CALL    // type of dependency
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -425,14 +425,16 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out, ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+         infos_out, configs_out, anomalies_out
+         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+         infos.out (), configs.out (), anomalies.out ()
+         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index e86e9d3c2b3..88a9c87d98a 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -194,11 +194,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(poa_object.in ()))
@@ -207,11 +207,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the naming services
@@ -237,8 +237,8 @@ main (int argc, char *argv[])
         {
           // create the RT_Info
           config_infos[i].handle =
-            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point,
-                                                      ACE_TRY_ENV);
+            ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // initialize the RT_Info
@@ -255,8 +255,8 @@ main (int argc, char *argv[])
                  config_infos[i].quantum,
                  config_infos[i].threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
-                                  config_infos[i].info_type),
-                 ACE_TRY_ENV);
+                                  config_infos[i].info_type)
+                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -267,7 +267,7 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // register dependency of consumer that will have unresolved remote
@@ -277,7 +277,7 @@ main (int argc, char *argv[])
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -288,7 +288,7 @@ main (int argc, char *argv[])
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -299,7 +299,7 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -307,7 +307,7 @@ main (int argc, char *argv[])
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -315,7 +315,7 @@ main (int argc, char *argv[])
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register dependencies on each of the other consumers by second
@@ -326,7 +326,7 @@ main (int argc, char *argv[])
                         config_infos[1].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -334,7 +334,7 @@ main (int argc, char *argv[])
                         config_infos[3].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -342,7 +342,7 @@ main (int argc, char *argv[])
                         config_infos[5].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -350,7 +350,7 @@ main (int argc, char *argv[])
                         config_infos[6].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL,  // type of dependency
-                        ACE_TRY_ENV);
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::RT_Info_Set_var infos;
@@ -376,14 +376,14 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out, ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+         infos_out, configs_out, anomalies_out TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out (), ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+         infos.out (), configs.out (), anomalies.out () TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index a6744d42c5f..90e248ce9fd 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -24,11 +24,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(poa_object.in ()))
@@ -37,14 +37,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in(), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Store a pointer to the local run-time scheduler.
@@ -63,19 +63,19 @@ main (int argc, char *argv[])
           // Make sure the correct handle is returned by the
           // run-time scheduler's create and lookup methods.
           ACE_ASSERT (infos [i].handle ==
-                      runtime_scheduler->create (infos [i].entry_point,
-                                                 ACE_TRY_ENV));
+                      runtime_scheduler->create (infos [i].entry_point
+                                                 TAO_ENV_ARG_PARAMETER));
           ACE_TRY_CHECK;
 
           ACE_ASSERT (infos [i].handle ==
-                      runtime_scheduler->lookup (infos [i].entry_point,
-                                                 ACE_TRY_ENV));
+                      runtime_scheduler->lookup (infos [i].entry_point
+                                                 TAO_ENV_ARG_PARAMETER));
           ACE_TRY_CHECK;
 
           // Make sure the values in the RT_Info returned by get are OK.
           delete rt_info;
-          rt_info = runtime_scheduler->get (infos [i].handle,
-                                            ACE_TRY_ENV);
+          rt_info = runtime_scheduler->get (infos [i].handle
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (rt_info != 0);
@@ -122,16 +122,16 @@ main (int argc, char *argv[])
                                   infos [i].quantum,
                                   infos [i].threads,
                                   ACE_static_cast (RtecScheduler::Info_Type_t,
-                                                   infos [i].info_type),
-                                  ACE_TRY_ENV);
+                                                   infos [i].info_type)
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Make sure the correct priority values are returned.
           runtime_scheduler->priority (infos [i].handle,
                                        priority,
                                        subpriority,
-                                       p_priority,
-                                       ACE_TRY_ENV);
+                                       p_priority
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (priority == infos [i].priority);
@@ -140,8 +140,8 @@ main (int argc, char *argv[])
           runtime_scheduler->entry_point_priority (infos [i].entry_point,
                                                    priority,
                                                    subpriority,
-                                                   p_priority,
-                                                   ACE_TRY_ENV);
+                                                   p_priority
+                                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (priority == infos [i].priority);
@@ -158,8 +158,8 @@ main (int argc, char *argv[])
           runtime_scheduler->
             dispatch_configuration (configs [j].preemption_priority,
                                     priority,
-                                    dispatching_type,
-                                    ACE_TRY_ENV);
+                                    dispatching_type
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (priority == configs [j].thread_priority);
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index 0747ca1a3ee..8428a57369a 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -19,8 +19,8 @@ TX_Object_i::~TX_Object_i (void)
 }
 
 void
-TX_Object_i::send (const DataSeq & data,
-                   CORBA::Environment & /* ACE_TRY_ENV */)
+TX_Object_i::send (const DataSeq & data
+                   TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->data_ = data;
@@ -31,8 +31,8 @@ TX_Object_i::send (const DataSeq & data,
 }
 
 void
-TX_Object_i::recv (DataSeq_out data,
-                   CORBA::Environment &ACE_TRY_ENV)
+TX_Object_i::recv (DataSeq_out data
+                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (data,
@@ -48,8 +48,8 @@ TX_Object_i::recv (DataSeq_out data,
 }
 
 void
-TX_Object_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TX_Object_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index dd49762157f..df9720482f0 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -33,18 +33,15 @@ public:
   // Destructor
   virtual ~TX_Object_i (void);
 
-  virtual void send (const DataSeq & data,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ())
+  virtual void send (const DataSeq & data
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void recv (DataSeq_out data,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ())
+  virtual void recv (DataSeq_out data
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 74fbd9e11d4..80c2b156565 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -41,14 +41,14 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
                           -1);
 
       TX_Object_var txObject =
-        TX_Object::_narrow (obj.in (), ACE_TRY_ENV);
+        TX_Object::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DataSeq data_input;
@@ -74,19 +74,19 @@ main (int argc, char *argv[])
                   "Sending  octet sequence of length:\t%u\n",
                   data_input.length()));
 
-      txObject->send (data_input, ACE_TRY_ENV);
+      txObject->send (data_input TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DataSeq_var data_output;
 
-      txObject->recv (data_output.out (), ACE_TRY_ENV);
+      txObject->recv (data_output.out () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Received octet sequence of length:\t%u\n",
                   data_output->length()));
 
-      txObject->shutdown (ACE_TRY_ENV);
+      txObject->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Sanity check
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index 54ed08d79ec..2b5bfd756b3 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -23,13 +23,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -46,22 +46,22 @@ main (int argc, char * argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poaObj =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var rootPoa =
-        PortableServer::POA::_narrow (poaObj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poaObj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        rootPoa->the_POAManager (ACE_TRY_ENV);
+        rootPoa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
@@ -69,39 +69,39 @@ main (int argc, char * argv[])
 
       TX_Object_i implObject (orb.in ());
 
-      TX_Object_var txObject = implObject._this (ACE_TRY_ENV);
+      TX_Object_var txObject = implObject._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (txObject.in (), ACE_TRY_ENV);
+        orb->object_to_string (txObject.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it.
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s\n",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      orb->run (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s\n",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n"
                   "Event loop finished.\n"));
 
-      rootPoa->destroy (1, 1, ACE_TRY_ENV);
+      rootPoa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index 166445e286f..b4ea8515927 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Worker::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -21,7 +21,7 @@ Client_Worker::validate_connection (CORBA::Environment &ACE_TRY_ENV)
    {
       ACE_TRY
         {
-          this->server_->test_method (j, ACE_TRY_ENV);
+          this->server_->test_method (j TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
@@ -37,17 +37,17 @@ Client_Worker::validate_connection (CORBA::Environment &ACE_TRY_ENV)
 int
 Client_Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Validate connections befire doing any actual work..
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
        ACE_TRY_CHECK;
 
        for (int i = 0; i < this->niterations_; ++i)
          {
-           this->server_->test_method (i, ACE_TRY_ENV);
+           this->server_->test_method (i TAO_ENV_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
            if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 71b307d1757..a99610317c7 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -53,12 +53,12 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -66,12 +66,12 @@ main (int argc, char *argv[])
 
       // Get Object Reference using IOR file
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Cast to Appropriate Type
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -97,12 +97,12 @@ main (int argc, char *argv[])
       // Shut down the server if -x option given in command line
       if (do_shutdown)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Destroying the ORB..
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index c1e27ecb3f8..189e4ea5804 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -41,16 +41,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -60,11 +60,11 @@ main (int argc, char *argv[])
 
       // Get a Root POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -73,11 +73,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -95,7 +95,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Worker worker (orb.in ());
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index c0810d5df9e..cd3bc2abbc3 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&)
+Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -21,8 +21,8 @@ Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&)
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index c49f47c8741..60fdc9a457b 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x, CORBA::Environment&)
+  CORBA::Long test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index 15b052f6053..715d498538c 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -16,7 +16,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (CORBA::Environment &ACE_TRY_ENV)
+Foo_i::baz (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Foo::Bar::NoSecurityAttributes))
 {
@@ -36,8 +36,8 @@ Foo_i::baz (CORBA::Environment &ACE_TRY_ENV)
 
   // Get the desired security attributes
   Security::AttributeList_var attribute_list =
-    this->current_->get_attributes (attribute_type_list,
-                                    ACE_TRY_ENV);
+    this->current_->get_attributes (attribute_type_list
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If the SecurityLevel1::Current::get_attributes() call above
@@ -81,7 +81,7 @@ Foo_i::baz (CORBA::Environment &ACE_TRY_ENV)
           // internal format.
           X509 *peer = ::d2i_X509 (0,
                                    &der_cert,
-                                   attribute.value.length ()); 
+                                   attribute.value.length ());
 
           ::X509_NAME_oneline (::X509_get_issuer_name (peer),
                                buf,
@@ -109,8 +109,8 @@ Foo_i::baz (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Foo_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Foo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index e7ff0b33106..7dc2b43d35e 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -13,8 +13,8 @@ const char *ior = "file://test.ior";
 
 void
 insecure_invocation_test (CORBA::ORB_ptr orb,
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Object_ptr obj
+                          TAO_ENV_ARG_DECL)
 {
   // Disable protection for this insecure invocation test.
 
@@ -26,8 +26,8 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   // Create the Security::QOPPolicy.
   CORBA::Policy_var policy =
     orb->create_policy (Security::SecQOPPolicy,
-                        no_protection,
-                        ACE_TRY_ENV);
+                        no_protection
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policy_list (1);
@@ -38,12 +38,12 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   // protection).
   CORBA::Object_var object =
     obj->_set_policy_overrides (policy_list,
-                                CORBA::SET_OVERRIDE,
-                                ACE_TRY_ENV);
+                                CORBA::SET_OVERRIDE
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object.in (), ACE_TRY_ENV);
+    Foo::Bar::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -60,7 +60,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
     {
       // This invocation should result in a CORBA::NO_PERMISSION
       // exception.
-      server->baz (ACE_TRY_ENV);
+      server->baz (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::NO_PERMISSION, exc)
@@ -82,11 +82,11 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
 }
 
 void
-secure_invocation_test (CORBA::Object_ptr object,
-                        CORBA::Environment &ACE_TRY_ENV)
+secure_invocation_test (CORBA::Object_ptr object
+                        TAO_ENV_ARG_DECL)
 {
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object, ACE_TRY_ENV);
+    Foo::Bar::_narrow (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -100,10 +100,10 @@ secure_invocation_test (CORBA::Object_ptr object,
     }
 
   // This invocation should return successfully.
-  server->baz (ACE_TRY_ENV);
+  server->baz (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  server->shutdown (ACE_TRY_ENV);
+  server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -138,14 +138,14 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This test sets creates a Security::QOPPolicy with the
@@ -154,17 +154,17 @@ main (int argc, char *argv[])
       // then result in a CORBA::NO_PERMISSION exception.
       //
       // The server is not shutdown by this test.
-      insecure_invocation_test (orb.in (), object.in (), ACE_TRY_ENV);
+      insecure_invocation_test (orb.in (), object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This test uses the default secure SSLIOP settings to securely
       // invoke a method on the server.  No exception should occur.
       //
       // The server *is* shutdown by this test.
-      secure_invocation_test (object.in (), ACE_TRY_ENV);
+      secure_invocation_test (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 7090e8040f5..cbd5ea22072 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -19,13 +19,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -40,11 +40,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -54,23 +54,23 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      obj = orb->resolve_initial_references ("SecurityCurrent",
-                                             ACE_TRY_ENV);
+      obj = orb->resolve_initial_references ("SecurityCurrent"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SecurityLevel2::Current_var security_current =
-        SecurityLevel2::Current::_narrow (obj.in (),
-                                          ACE_TRY_ENV);
+        SecurityLevel2::Current::_narrow (obj.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (security_current.in ()))
@@ -82,42 +82,42 @@ main (int argc, char *argv[])
       Foo_i server_impl (orb.in (), security_current.in ());
 
       Foo::Bar_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n"
                   "Event loop finished.\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
index 402f1e7fdd0..fd43bfedff5 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -14,7 +14,7 @@ SLevel1_Server_i::SLevel1_Server_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV)
+SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -42,8 +42,8 @@ SLevel1_Server_i::authorize_level1 (CORBA::Environment &ACE_TRY_ENV)
   /// the attribute type/s that we want and the return parameter is the
   /// value/s of the attribute type/s that we want.
   Security::AttributeList_var attribute_list =
-    this->ss_current_->get_attributes (attribute_type_list,
-                                       ACE_TRY_ENV);
+    this->ss_current_->get_attributes (attribute_type_list
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   /// Just a preliminary check to see if we received something or
@@ -217,8 +217,8 @@ SLevel1_Server_i::create_check_cert ()
 }
 
 void
-SLevel1_Server_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+SLevel1_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
index 16936a44b4e..8e7d836f771 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
@@ -39,18 +39,18 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SLevel1_Server_var server =
-        SLevel1_Server::_narrow (object.in (), ACE_TRY_ENV);
+        SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -62,7 +62,7 @@ main (int argc, char *argv [])
         }
 
       CORBA::Boolean authorized =
-        server->authorize_level1 (ACE_TRY_ENV);
+        server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (authorized == 0)
@@ -71,11 +71,11 @@ main (int argc, char *argv [])
       else if (authorized == 1)
         ACE_DEBUG ((LM_DEBUG,
                     "DENIED: You Do NOT have enough privileges\n"));
-      
-      server->shutdown (ACE_TRY_ENV);
+
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
index fb2d9fc3c85..e4565c73fa2 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
@@ -20,13 +20,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -42,12 +42,12 @@ main (int argc, char *argv[])
     {
       /// Our regular ORB Initialization.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Get a reference to the RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -57,25 +57,25 @@ main (int argc, char *argv[])
 
       /// Narrow down the reference to the currect interface.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // Resolve reference to SecurityCurrent Object.
-      object = orb->resolve_initial_references ("SecurityCurrent",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("SecurityCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow it down to get the correct reference.
       SecurityLevel1::Current_var ss_current =
-        SecurityLevel1::Current::_narrow (object.in (),
-                                          ACE_TRY_ENV);
+        SecurityLevel1::Current::_narrow (object.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ss_current.in ()))
@@ -87,38 +87,38 @@ main (int argc, char *argv[])
       SLevel1_Server_i level1_server (orb.in (), ss_current.in ());
 
       SLevel1_Server_var server =
-        level1_server._this (ACE_TRY_ENV);
+        level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start the ORB
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 11c303e6fd9..12b1ff7e0c2 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -42,11 +42,11 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id, CORBA::Environment &ACE_TRY_ENV)
+  void id (CORBA::Short id TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
-  CORBA::Short id (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Short id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets id.
 
@@ -64,14 +64,14 @@ My_Test_Object::~My_Test_Object (void)
 }
 
 CORBA::Short
-My_Test_Object::id (CORBA::Environment &)
+My_Test_Object::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
-My_Test_Object::id (CORBA::Short id, CORBA::Environment &)
+My_Test_Object::id (CORBA::Short id TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -206,16 +206,16 @@ CosNaming_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize ORB.
       this->orbmgr_.init (this->argc_,
-                          this->argv_,
-                          ACE_TRY_ENV);
+                          this->argv_
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orbmgr_.activate_poa_manager (ACE_TRY_ENV);
+      this->orbmgr_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -250,16 +250,16 @@ MT_Test::svc (void)
 
   CosNaming::NamingContext_var name_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY_EX (SETUP)
     {
       CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_, ACE_TRY_ENV);
+        orb_->string_to_object (name_service_ior_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SETUP);
 
       name_service =
-        CosNaming::NamingContext::_narrow (name_service_obj.in (),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (name_service_obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SETUP);
     }
   ACE_CATCHANY
@@ -277,8 +277,8 @@ MT_Test::svc (void)
   ACE_TRY_EX (BIND)
     {
       name_service->bind (test_name_,
-                          test_ref_.in (),
-                          ACE_TRY_ENV);
+                          test_ref_.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (BIND);
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK in thread %t\n"));
@@ -305,18 +305,18 @@ MT_Test::svc (void)
   ACE_TRY_EX (RESOLVE)
     {
       CORBA::Object_var result_obj_ref =
-        name_service->resolve (test_name_,
-                               ACE_TRY_ENV);
+        name_service->resolve (test_name_
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (RESOLVE);
 
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in (),
-                              ACE_TRY_ENV);
+        Test_Object::_narrow (result_obj_ref.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (RESOLVE);
 
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (ACE_TRY_ENV);
+          CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RESOLVE);
 
           if (id == CosNaming_Client::OBJ1_ID)
@@ -340,8 +340,8 @@ MT_Test::svc (void)
   // Unbind the object from the Naming Context.
   ACE_TRY_EX (UNBIND)
     {
-      name_service->unbind (test_name_,
-                            ACE_TRY_ENV);
+      name_service->unbind (test_name_
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (UNBIND);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK in thread %t\n"));
@@ -374,14 +374,14 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   My_Test_Object *test_obj_impl =
     new My_Test_Object (CosNaming_Client::OBJ1_ID);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       test_ref_ =
-        test_obj_impl->_this (ACE_TRY_ENV);
+        test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_obj_impl->_remove_ref (ACE_TRY_ENV);
+      test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the Naming Service.  Each thread can use it
@@ -394,8 +394,8 @@ MT_Test::execute (TAO_Naming_Client &root_context)
         root_context.get_context ();
 
       name_service_ior_ =
-        orb_->object_to_string (context.in (),
-                                ACE_TRY_ENV);
+        orb_->object_to_string (context.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -425,17 +425,17 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Dummy object instantiation.
       My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
       Test_Object_var test_obj_ref =
-        test_obj_impl->_this (ACE_TRY_ENV);
+        test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give ownership of this object to POA.
-      test_obj_impl->_remove_ref (ACE_TRY_ENV);
+      test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind an object to the Naming Context.
@@ -443,32 +443,32 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("Foo");
       root_context->bind (test_name,
-                          test_obj_ref.in (),
-                          ACE_TRY_ENV);
+                          test_obj_ref.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK\n"));
 
       // Resolve the object from the Naming Context.
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name,
-                               ACE_TRY_ENV);
+        root_context->resolve (test_name
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in (),
-                              ACE_TRY_ENV);
+        Test_Object::_narrow (result_obj_ref.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (ACE_TRY_ENV);
+          CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n"));
         }
 
       // Unbind the object from the Naming Context.
-      root_context->unbind (test_name,
-                            ACE_TRY_ENV);
+      root_context->unbind (test_name
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK\n"));
@@ -487,7 +487,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Create a tree of contexts: root->level1->level2.  Bind object
@@ -498,28 +498,28 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level1.length (1);
       level1[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (level1,
-                                                       ACE_TRY_ENV);
+      level1_context = root_context->bind_new_context (level1
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a new context.
       CosNaming::NamingContext_var level2_context;
-      level2_context = root_context->new_context (ACE_TRY_ENV);
+      level2_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate a dummy object and bind it under the new context.
       My_Test_Object *impl1 =
         new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var obj1 = impl1->_this (ACE_TRY_ENV);
+      Test_Object_var obj1 = impl1->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl1->_remove_ref (ACE_TRY_ENV);
+      impl1->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
-      level2_context->bind (obj_name, obj1.in (),
-                            ACE_TRY_ENV);
+      level2_context->bind (obj_name, obj1.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind the context we just created under level1.
@@ -527,8 +527,8 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level2.length (2);
       level2[1].id = CORBA::string_dup ("level2_context");
       root_context->bind_context (level2,
-                                  level2_context.in (),
-                                  ACE_TRY_ENV);
+                                  level2_context.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Resolve and unbind level1/level2/foo, and bind it back.
@@ -536,12 +536,12 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       test_name.length (3);
       test_name[2].id = obj_name[0].id;
       CORBA::Object_var result_obj_ref =
-        root_context->resolve (test_name,
-                               ACE_TRY_ENV);
+        root_context->resolve (test_name
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Test_Object_var result_object =
-        Test_Object::_narrow (result_obj_ref.in (),
-                              ACE_TRY_ENV);
+        Test_Object::_narrow (result_obj_ref.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (result_object.in ()))
@@ -549,7 +549,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
                            "Problems with resolving foo in Tree Test - nil object ref.\n"),
                           -1);
 
-      CORBA::Short id = result_object->id (ACE_TRY_ENV);
+      CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (id != CosNaming_Client::OBJ1_ID)
@@ -559,37 +559,37 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       // Unbind the object from the Naming Context and bind it back
       // in.
-      root_context->unbind (test_name,
-                            ACE_TRY_ENV);
+      root_context->unbind (test_name
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (test_name,
-                          obj1.in (),
-                          ACE_TRY_ENV);
+                          obj1.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create new context and rebind under the name level1/level2.
       CosNaming::NamingContext_var new_level2_context;
       new_level2_context =
-        root_context->new_context (ACE_TRY_ENV);
+        root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->rebind_context (level2,
-                                  new_level2_context.in (),
-                                  ACE_TRY_ENV);
+                                  new_level2_context.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind, resolve, rebind, and resolve foo under level1/level2.
       root_context->bind (test_name,
-                          obj1.in (),
-                          ACE_TRY_ENV);
+                          obj1.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name,
-                                              ACE_TRY_ENV);
+      result_obj_ref = root_context->resolve (test_name
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in (),
-                                            ACE_TRY_ENV);
+      result_object = Test_Object::_narrow (result_obj_ref.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Short obj_id = result_object->id (ACE_TRY_ENV);
+      CORBA::Short obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (result_object.in ())
@@ -600,24 +600,24 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       My_Test_Object *impl2 =
         new My_Test_Object (CosNaming_Client::OBJ2_ID);
-      Test_Object_var obj2 = impl2->_this (ACE_TRY_ENV);
+      Test_Object_var obj2 = impl2->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      impl2->_remove_ref (ACE_TRY_ENV);
+      impl2->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_context->rebind (test_name,
-                            obj2.in (),
-                            ACE_TRY_ENV);
+                            obj2.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      result_obj_ref = root_context->resolve (test_name,
-                                              ACE_TRY_ENV);
+      result_obj_ref = root_context->resolve (test_name
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      result_object = Test_Object::_narrow (result_obj_ref.in (),
-                                            ACE_TRY_ENV);
+      result_object = Test_Object::_narrow (result_obj_ref.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj_id = result_object->id (ACE_TRY_ENV);
+      obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (result_object.in ())
@@ -644,7 +644,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Set things up.
@@ -654,56 +654,56 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       context_name.length (1);
       context_name[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
-      level1_context = root_context->bind_new_context (context_name,
-                                                       ACE_TRY_ENV);
+      level1_context = root_context->bind_new_context (context_name
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       context_name[0].id = CORBA::string_dup ("level2_context");
       CosNaming::NamingContext_var level2_context;
-      level2_context = level1_context->bind_new_context (context_name,
-                                                         ACE_TRY_ENV);
+      level2_context = level1_context->bind_new_context (context_name
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind a dummy object foo under each context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
+      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
+      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       root_context->bind (object_name,
-                          obj.in (),
-                          ACE_TRY_ENV);
+                          obj.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       level1_context->bind (object_name,
-                            obj.in (),
-                            ACE_TRY_ENV);
+                            obj.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       level2_context->bind (object_name,
-                            obj.in (),
-                            ACE_TRY_ENV);
+                            obj.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run exceptions tests.
-      invalid_name_test (root_context,
-                         ACE_TRY_ENV);
+      invalid_name_test (root_context
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      already_bound_test (root_context,
-                          ACE_TRY_ENV);
+      already_bound_test (root_context
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      already_bound_test2 (root_context,
-                           ACE_TRY_ENV);
+      already_bound_test2 (root_context
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      not_found_test (root_context,
-                      ACE_TRY_ENV);
+      not_found_test (root_context
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      not_found_test2 (root_context,
-                       ACE_TRY_ENV);
+      not_found_test2 (root_context
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      not_found_test3 (root_context,
-                       ACE_TRY_ENV);
+      not_found_test3 (root_context
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -718,16 +718,16 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
 }
 
 void
-Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CosNaming::Name test_name;
       test_name.length (0);
 
-      root_context->resolve (test_name,
-                             ACE_TRY_ENV);
+      root_context->resolve (test_name
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
     }
@@ -746,8 +746,8 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context,
 }
 
 void
-Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
+                                     TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -755,14 +755,14 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context,
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
+      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
+      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_context->bind (test_name,
-                          obj.in (),
-                          ACE_TRY_ENV);
+                          obj.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
     }
@@ -782,8 +782,8 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context,
 }
 
 void
-Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
+                                      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -792,14 +792,14 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context,
       test_name[0].id = CORBA::string_dup ("level1_context");
       test_name[1].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
+      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
+      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_context->bind (test_name,
-                          obj.in (),
-                          ACE_TRY_ENV);
+                          obj.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
     }
@@ -818,8 +818,8 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context,
 }
 
 void
-Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
+                                 TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -829,8 +829,8 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
       test_name[1].id = CORBA::string_dup ("level2_context");
       test_name[2].id = CORBA::string_dup ("bar");
 
-      root_context->unbind (test_name,
-                            ACE_TRY_ENV);
+      root_context->unbind (test_name
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
     }
@@ -857,8 +857,8 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
 }
 
 void
-Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -868,8 +868,8 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context,
       test_name[1].id = CORBA::string_dup ("level3_context");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name,
-                            ACE_TRY_ENV);
+      root_context->unbind (test_name
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
     }
@@ -899,8 +899,8 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context,
 }
 
 void
-Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -910,7 +910,7 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context,
       test_name[1].id = CORBA::string_dup ("foo");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name, ACE_TRY_ENV);
+      root_context->unbind (test_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
     }
@@ -941,14 +941,14 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context,
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Instantiate four dummy objects.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
+      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
+      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind objects to the naming context.
@@ -965,20 +965,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4.length (1);
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
-                          obj.in (),
-                          ACE_TRY_ENV);
+                          obj.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (name2,
-                          obj.in (),
-                          ACE_TRY_ENV);
+                          obj.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (name3,
-                          obj.in (),
-                          ACE_TRY_ENV);
+                          obj.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (name4,
-                          obj.in (),
-                          ACE_TRY_ENV);
+                          obj.in ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // List the content of the Naming Context.
@@ -986,8 +986,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       CosNaming::BindingList_var bindings_list;
       root_context->list (1,
                           bindings_list.out (),
-                          iter.out (),
-                          ACE_TRY_ENV);
+                          iter.out ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
@@ -1001,8 +1001,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
-      iter->next_one (binding.out (),
-                      ACE_TRY_ENV);
+      iter->next_one (binding.out ()
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (binding->binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -1012,7 +1012,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                   "Second binding: %s\n",
                   binding->binding_name[0].id.in ()));
 
-      iter->next_n (2, bindings_list.out (), ACE_TRY_ENV);
+      iter->next_n (2, bindings_list.out () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (bindings_list->length () != 2
           || bindings_list[0u].binding_type != CosNaming::nobject
@@ -1028,14 +1028,14 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 
       // We already iterated over all the bindings, so the following
       // should return false.
-      CORBA::Boolean result = iter->next_one (binding.out (),
-                                              ACE_TRY_ENV);
+      CORBA::Boolean result = iter->next_one (binding.out ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
-      iter->destroy (ACE_TRY_ENV);
+      iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1052,42 +1052,42 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Create a context and bind an object under it.
 
       CosNaming::NamingContext_var my_context;
-      my_context = root_context->new_context (ACE_TRY_ENV);
+      my_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind a dummy object foo under my_context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
+      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
+      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       my_context->bind (object_name,
-                            obj.in (),
-                            ACE_TRY_ENV);
+                            obj.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Do the testing.
-      not_empty_test (my_context,
-                                      ACE_TRY_ENV);
+      not_empty_test (my_context
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_context->unbind (object_name, ACE_TRY_ENV);
+      my_context->unbind (object_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      my_context->destroy (ACE_TRY_ENV);
+      my_context->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      not_exist_test (my_context,
-                         ACE_TRY_ENV);
+      not_exist_test (my_context
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
@@ -1103,12 +1103,12 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
 }
 
 void
-Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      ref->destroy (ACE_TRY_ENV);
+      ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
@@ -1122,12 +1122,12 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref,
 }
 
 void
-Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      ref->destroy (ACE_TRY_ENV);
+      ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
@@ -1154,7 +1154,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void)
 int
 Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Create a name structure we will reuse.
@@ -1164,20 +1164,20 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 
       // Create and bind a naming context under the <root> context.
       CosNaming::NamingContext_var level1_context =
-        root_context->bind_new_context (test_name,
-                                        ACE_TRY_ENV);
+        root_context->bind_new_context (test_name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create and bind a naming context under <level1> context.
       test_name[0].id = CORBA::string_dup ("level2");
       CosNaming::NamingContext_var level2_context =
-        level1_context->bind_new_context (test_name,
-                                        ACE_TRY_ENV);
+        level1_context->bind_new_context (test_name
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the ior of <level1_context> for use by <Persistent_Test_End>.
       CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in (), ACE_TRY_ENV);
+        orb_->object_to_string (level1_context.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::fprintf (this->file_,
@@ -1213,7 +1213,7 @@ Persistent_Test_End::~Persistent_Test_End (void)
 int
 Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Create a name structure we will reuse.
@@ -1224,11 +1224,11 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       // Convert stringified ior we got from <Persistent_Test_Begin>
       // for <level1> Naming Context to Naming Context reference.
       CORBA::Object_var obj =
-        orb_->string_to_object (ior_, ACE_TRY_ENV);
+        orb_->string_to_object (ior_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (level1_context.in ()))
@@ -1238,7 +1238,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 
       //  Resolve for <level2> context through the persistent ior we
       // got from part 1 of this test.
-      obj = level1_context->resolve (test_name, ACE_TRY_ENV);
+      obj = level1_context->resolve (test_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now, resolve for <level2> context using the <root> context
@@ -1247,7 +1247,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("level1");
       test_name[1].id = CORBA::string_dup ("level2");
       CORBA::Object_var obj2 =
-        root_context->resolve (test_name, ACE_TRY_ENV);
+        root_context->resolve (test_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Make sure we got the same answer through both methods.
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 90aef7d2625..e94a1f5f295 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -171,18 +171,18 @@ private:
   // the following functions isolate specific tests due to the
   // limitation of only 1 TAO_TRY being allowed per function.
 
-  void invalid_name_test (TAO_Naming_Client &root_context,
-                          CORBA::Environment &ACE_TRY_ENV);
-  void already_bound_test (TAO_Naming_Client &root_context,
-                           CORBA::Environment &ACE_TRY_ENV);
-  void already_bound_test2 (TAO_Naming_Client &root_context,
-                            CORBA::Environment &ACE_TRY_ENV);
-  void not_found_test (TAO_Naming_Client &root_context,
-                       CORBA::Environment &ACE_TRY_ENV);
-  void not_found_test2 (TAO_Naming_Client &root_context,
-                        CORBA::Environment &ACE_TRY_ENV);
-  void not_found_test3 (TAO_Naming_Client &root_context,
-                        CORBA::Environment &ACE_TRY_ENV);
+  void invalid_name_test (TAO_Naming_Client &root_context
+                          TAO_ENV_ARG_DECL);
+  void already_bound_test (TAO_Naming_Client &root_context
+                           TAO_ENV_ARG_DECL);
+  void already_bound_test2 (TAO_Naming_Client &root_context
+                            TAO_ENV_ARG_DECL);
+  void not_found_test (TAO_Naming_Client &root_context
+                       TAO_ENV_ARG_DECL);
+  void not_found_test2 (TAO_Naming_Client &root_context
+                        TAO_ENV_ARG_DECL);
+  void not_found_test3 (TAO_Naming_Client &root_context
+                        TAO_ENV_ARG_DECL);
 };
 
 class Destroy_Test : public Naming_Test
@@ -205,10 +205,10 @@ public:
 
 private:
   // = The following functions isolate specific tests.
-  void not_empty_test (CosNaming::NamingContext_var &ref,
-                       CORBA::Environment &ACE_TRY_ENV);
-  void not_exist_test (CosNaming::NamingContext_var &ref,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void not_empty_test (CosNaming::NamingContext_var &ref
+                       TAO_ENV_ARG_DECL);
+  void not_exist_test (CosNaming::NamingContext_var &ref
+                       TAO_ENV_ARG_DECL);
 };
 
 class Persistent_Test_Begin : public Naming_Test
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 70f97cfb451..b1a5b774470 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -30,11 +30,11 @@ Client_i::test_for_secure_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosTime::UTO_var UTO_server =
-           this->clerk_->secure_universal_time (ACE_TRY_ENV);
+           this->clerk_->secure_universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -55,11 +55,11 @@ Client_i::test_for_universal_time (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosTime::UTO_var UTO_server =
-        this->clerk_->universal_time (ACE_TRY_ENV);
+        this->clerk_->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -108,21 +108,21 @@ Client_i::test_for_new_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_universal_time()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosTime::UTO_var UTO_server = this->clerk_->new_universal_time (time,
                                                                       inaccuracy,
-                                                                      tdf,
-                                                                      ACE_TRY_ENV);
+                                                                      tdf
+                                                                      TAO_ENV_ARG_PARAMETER);
 
-      ACE_ASSERT (UTO_server->time (ACE_TRY_ENV) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (ACE_TRY_ENV) == 9999);
-      ACE_ASSERT (UTO_server->tdf (ACE_TRY_ENV) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacchi == 0);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacclo == 9999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).tdf == 99);
+      ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == 9999);
+      ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
 
       ACE_TRY_CHECK;
     }
@@ -148,23 +148,23 @@ Client_i::test_for_uto_from_utc (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing uto_from_utc ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct,
-                                                                ACE_TRY_ENV);
+      CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct
+                                                                TAO_ENV_ARG_PARAMETER);
 
       TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
       inaccuracy <<= 32;
       inaccuracy |= utc_struct.inacclo;
 
-      ACE_ASSERT (UTO_server->time (ACE_TRY_ENV) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (ACE_TRY_ENV) == inaccuracy);
-      ACE_ASSERT (UTO_server->tdf (ACE_TRY_ENV) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacclo == 50);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).inacchi == 50);
-      ACE_ASSERT ((UTO_server->utc_time (ACE_TRY_ENV)).tdf == 99);
+      ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == inaccuracy);
+      ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
 
       ACE_TRY_CHECK;
     }
@@ -186,15 +186,15 @@ Client_i::test_for_new_interval (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_interval ()\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CosTime::TIO_var TIO_server = this->clerk_->new_interval (lower,
-                                                                upper,
-                                                                ACE_TRY_ENV);
+                                                                upper
+                                                                TAO_ENV_ARG_PARAMETER);
 
-      ACE_ASSERT ((TIO_server->time_interval (ACE_TRY_ENV)).lower_bound == 666666666);
-      ACE_ASSERT ((TIO_server->time_interval (ACE_TRY_ENV)).upper_bound == 999999999);
+      ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666);
+      ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999);
 
       ACE_TRY_CHECK;
     }
@@ -324,7 +324,7 @@ Client_i::~Client_i (void)
 int
 Client_i::obtain_initial_references (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -355,12 +355,12 @@ Client_i::obtain_initial_references (void)
                   name));
 
       CORBA::Object_var temp_object =
-        my_name_client_->resolve (clerk_name,
-                                  ACE_TRY_ENV);
+        my_name_client_->resolve (clerk_name
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      clerk_ = CosTime::TimeService::_narrow (temp_object.in (),
-                                              ACE_TRY_ENV);
+      clerk_ = CosTime::TimeService::_narrow (temp_object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (clerk_.in ()))
@@ -388,15 +388,15 @@ Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -409,8 +409,8 @@ Client_i::init (int argc, char **argv)
           // option or a file.
 
           CORBA::Object_var server_object =
-          this->orb_->string_to_object (this->ior_,
-                                        ACE_TRY_ENV);
+          this->orb_->string_to_object (this->ior_
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -419,8 +419,8 @@ Client_i::init (int argc, char **argv)
                                this->ior_),
                               -1);
           this->clerk_ =
-            CosTime::TimeService::_narrow (server_object.in (),
-                                           ACE_TRY_ENV);
+            CosTime::TimeService::_narrow (server_object.in ()
+                                           TAO_ENV_ARG_PARAMETER);
 
           ACE_DEBUG ((LM_DEBUG,
                       "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 62ad3e349ce..6ac66fc4f7a 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -7,18 +7,18 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$")
 
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
-                    CORBA::Boolean verbose,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    CORBA::Boolean verbose
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
     : verbose_ (verbose)
 {
   // Initialize the offer sequences and structures.
-  this->create_offers (ACE_TRY_ENV);
+  this->create_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   // Obtain the necessary trading service interfaces.
-  this->register_ = lookup_if->register_if (ACE_TRY_ENV);
+  this->register_ = lookup_if->register_if (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->admin_ = lookup_if->admin_if (ACE_TRY_ENV);
+  this->admin_ = lookup_if->admin_if (TAO_ENV_SINGLE_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
@@ -33,7 +33,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 }
 
 void
-TAO_Offer_Exporter::export_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::export_offers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -54,13 +54,13 @@ TAO_Offer_Exporter::export_offers (CORBA::Environment& ACE_TRY_ENV)
       this->props_fs_[i][4].value <<= "Default";
     }
 
-  this->export_to (this->register_.in (), ACE_TRY_ENV);
+  this->export_to (this->register_.in () TAO_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
 void
-TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
-                               CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -76,14 +76,14 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
     {
       for (int i = 0; i < NUM_OFFERS; i++)
         {
-          CORBA::Object_ptr offer_obj= this->plotter_[i]._this (ACE_TRY_ENV);
+          CORBA::Object_ptr offer_obj= this->plotter_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosTrading::OfferId_var offer_id =
             reg->_cxx_export (offer_obj,
                               TT_Info::INTERFACE_NAMES[1],
-                              this->props_plotters_[i],
-                              ACE_TRY_ENV);
+                              this->props_plotters_[i]
+                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
@@ -91,13 +91,13 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->printer_[i]._this (ACE_TRY_ENV);
+          offer_obj = this->printer_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[2],
-                                       this->props_printers_[i],
-                                       ACE_TRY_ENV);
+                                       this->props_printers_[i]
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
@@ -105,13 +105,13 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->fs_[i]._this (ACE_TRY_ENV);
+          offer_obj = this->fs_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[3],
-                                       this->props_fs_[i],
-                                       ACE_TRY_ENV);
+                                       this->props_fs_[i]
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK
 
           if (this->verbose_)
@@ -130,7 +130,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
 }
 
 void
-TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -149,7 +149,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
       ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
     }
 
-  CosTrading::Link_var link_if = this->register_->link_if (ACE_TRY_ENV);
+  CosTrading::Link_var link_if = this->register_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose_)
@@ -158,7 +158,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
                   " linked to the root trader.\n"));
     }
 
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV);
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose_)
@@ -178,7 +178,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
+            link_if->describe_link (link_name_seq[i] TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (int j = 0; j < NUM_OFFERS; j++)
@@ -194,7 +194,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
                           ACE_static_cast (const char*, link_name_seq[i])));
             }
 
-          this->export_to (link_info->target_reg.in (), ACE_TRY_ENV);
+          this->export_to (link_info->target_reg.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -207,7 +207,7 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
 
 
 void
-TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::withdraw_offers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -219,7 +219,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
     {
       CORBA::ULong length;
 
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV);
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (offer_id_seq.ptr () != 0)
@@ -227,7 +227,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
           length = offer_id_seq->length ();
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->withdraw (offer_id_seq[i], ACE_TRY_ENV);
+              this->register_->withdraw (offer_id_seq[i] TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -241,7 +241,7 @@ TAO_Offer_Exporter::withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::describe_offers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -252,7 +252,7 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV)
   ACE_TRY
     {
       CORBA::ULong length;
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV);
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (offer_id_seq.ptr () != 0)
@@ -265,14 +265,14 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV)
           for (CORBA::ULong i = 0; i < length; i++)
             {
               CosTrading::Register::OfferInfo_var offer_info =
-                this->register_->describe (offer_id_seq[i], ACE_TRY_ENV);
+                this->register_->describe (offer_id_seq[i] TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (this->verbose_)
                 {
                   ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
                   ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));
-                  TT_Info::dump_properties (offer_info->properties, 0, ACE_TRY_ENV);
+                  TT_Info::dump_properties (offer_info->properties, 0 TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
@@ -288,7 +288,7 @@ TAO_Offer_Exporter::describe_offers (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::modify_offers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented,
                    CosTrading::IllegalOfferId,
@@ -306,7 +306,7 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV)
 
   ACE_TRY
     {
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_TRY_ENV);
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (offer_id_seq.ptr () != 0)
@@ -327,8 +327,8 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV)
             {
               this->register_->modify (offer_id_seq[i],
                                        del_list,
-                                       modify_list,
-                                       ACE_TRY_ENV);
+                                       modify_list
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -343,7 +343,7 @@ TAO_Offer_Exporter::modify_offers (CORBA::Environment& ACE_TRY_ENV)
 
 void
 TAO_Offer_Exporter::
-withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV)
+withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -362,20 +362,20 @@ withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV)
     {
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
-                                   constraint,
-                                   ACE_TRY_ENV);
+                                   constraint
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
-                                   constraint,
-                                   ACE_TRY_ENV);
+                                   constraint
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
-                                   constraint,
-                                   ACE_TRY_ENV);
+                                   constraint
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -388,7 +388,7 @@ withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Exporter::grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
@@ -403,8 +403,8 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
 
       this->admin_->list_offers (NUM_OFFERS,
                                  CosTrading::OfferIdSeq_out (offer_id_seq),
-                                 CosTrading::OfferIdIterator_out (offer_id_iter),
-                                 ACE_TRY_ENV);
+                                 CosTrading::OfferIdIterator_out (offer_id_iter)
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
@@ -417,8 +417,8 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
             {
               any_left =
                 offer_id_iter->next_n (length,
-                                       CosTrading::OfferIdSeq_out (id_seq),
-                                       ACE_TRY_ENV);
+                                       CosTrading::OfferIdSeq_out (id_seq)
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               int offers = id_seq->length ();
@@ -432,7 +432,7 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
             }
           while (any_left);
 
-          offer_id_iter->destroy (ACE_TRY_ENV);
+          offer_id_iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -457,7 +457,7 @@ TAO_Offer_Exporter::grab_offerids (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Offer_Exporter::create_offers (CORBA::Environment &)
+TAO_Offer_Exporter::create_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   const int QUEUE_SIZE = 4;
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index dfe4070df25..95e5b719f3d 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -24,13 +24,13 @@ class TAO_Offer_Exporter
 public:
 
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
-                      CORBA::Boolean verbose,
-                      CORBA::Environment& ACE_TRY_ENV)
+                      CORBA::Boolean verbose
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ~TAO_Offer_Exporter (void);
 
-  void export_offers (CORBA::Environment& ACE_TRY_ENV)
+  void export_offers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -43,7 +43,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Export a number of offers to the Trading Service.
 
-  void export_offers_to_all (CORBA::Environment& ACE_TRY_ENV)
+  void export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -57,21 +57,21 @@ public:
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
 
-  void withdraw_offers (CORBA::Environment& ACE_TRY_ENV)
+  void withdraw_offers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Withdraw all exported offers.
 
-  void describe_offers (CORBA::Environment& ACE_TRY_ENV)
+  void describe_offers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Describe all the offers registered with the bootstrapped trader.
 
-  void modify_offers (CORBA::Environment& ACE_TRY_ENV)
+  void modify_offers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -86,7 +86,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Remove some properties and change some properties in each offer.
 
-  void withdraw_offers_using_constraints (CORBA::Environment& ACE_TRY_ENV)
+  void withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -96,15 +96,15 @@ public:
 
 private:
 
-  CosTrading::OfferIdSeq* grab_offerids (CORBA::Environment& ACE_TRY_ENV)
+  CosTrading::OfferIdSeq* grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
-  void create_offers (CORBA::Environment &ACE_TRY_ENV);
+  void create_offers (TAO_ENV_SINGLE_ARG_DECL);
   // Fill in each of the offer structures.
 
-  void export_to (CosTrading::Register_ptr reg,
-                  CORBA::Environment& ACE_TRY_ENV)
+  void export_to (CosTrading::Register_ptr reg
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 7debd543db3..440f470bda9 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -12,7 +12,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Importer::perform_queries (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -34,12 +34,12 @@ TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV)
   policies.return_card (16*NUM_OFFERS);
   policies.link_follow_rule (CosTrading::always);
 
-  this->perform_queries_with_policies (policies, ACE_TRY_ENV);
+  this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
 void
-TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
+TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -63,7 +63,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
 
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_TRY_ENV);
+  CosTrading::Link_var link_if = this->lookup_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose_)
@@ -71,7 +71,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
       ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
                   " linked to the root trader.\n"));
     }
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV);
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (link_name_seq->length () > 0)
@@ -83,14 +83,14 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0u], ACE_TRY_ENV);
+        link_if->describe_link (link_name_seq[0u] TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
-      CosTrading::Link_var link_if2 = lookup_if->link_if (ACE_TRY_ENV);
+      CosTrading::Link_var link_if2 = lookup_if->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (ACE_TRY_ENV);
+      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (link_name_seq2->length () > 0)
@@ -117,7 +117,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
               policies.starting_trader (new CosTrading::TraderName
                                         (2, 2, trader_name, 1));
 
-              this->perform_queries_with_policies (policies, ACE_TRY_ENV);
+              this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -137,8 +137,8 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
 
 void
 TAO_Offer_Importer::
-perform_queries_with_policies (const TAO_Policy_Creator& policies,
-                               CORBA::Environment& ACE_TRY_ENV)
+perform_queries_with_policies (const TAO_Policy_Creator& policies
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -189,8 +189,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies,
                                 8,
                                 offer_seq_out,
                                 offer_iterator_out,
-                                limits_applied_out,
-                                ACE_TRY_ENV);
+                                limits_applied_out
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosTrading::OfferSeq_var offer_seq (offer_seq_ptr);
@@ -201,8 +201,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies,
             {
               ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n"));
               this->display_results (*offer_seq_ptr,
-                                     offer_iterator_ptr,
-                                     ACE_TRY_ENV);
+                                     offer_iterator_ptr
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (limits_applied_out->length () > 0)
@@ -227,8 +227,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies,
 
 void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
-                                     CosTrading::OfferIterator_ptr offer_iterator,
-                                     CORBA::Environment& ACE_TRY_ENV) const
+                                     CosTrading::OfferIterator_ptr offer_iterator
+                                     TAO_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -241,14 +241,14 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
         {
           // Call back to the exported object.
           TAO_Trader_Test::Remote_Output_var remote_output =
-            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (),
-                                                     ACE_TRY_ENV);
+            TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          remote_output->confirm (ACE_TRY_ENV);
+          remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          TT_Info::dump_properties (offer_seq[i].properties, 1, ACE_TRY_ENV);
+          TT_Info::dump_properties (offer_seq[i].properties, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
         }
@@ -266,8 +266,8 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
               CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr);
 
               any_left = offer_iterator->next_n (length,
-                                                 iter_offers_out,
-                                                 ACE_TRY_ENV);
+                                                 iter_offers_out
+                                                 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CosTrading::OfferSeq_var iter_offers (iter_offers_ptr);
@@ -275,15 +275,15 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
                 {
                   // Call back to the exported object.
                   TAO_Trader_Test::Remote_Output_var remote_output =
-                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (),
-                                                             ACE_TRY_ENV);
+                    TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  remote_output->confirm (ACE_TRY_ENV);
+                  remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   CosTrading::PropertySeq& props = iter_offers[i].properties;
-                  TT_Info::dump_properties (props, 1, ACE_TRY_ENV);
+                  TT_Info::dump_properties (props, 1 TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
@@ -291,7 +291,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
 
             } while (any_left);
 
-          offer_iterator->destroy (ACE_TRY_ENV);
+          offer_iterator->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index a499a4b3f89..3f47723c4e6 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -32,7 +32,7 @@ public:
   TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose = 1);
 
-  void perform_queries (CORBA::Environment& ACE_TRY_ENV)
+  void perform_queries (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -46,7 +46,7 @@ public:
                      CosTrading::DuplicatePolicyName));
   // Barrage the bootstrapped-to trader with queries.
 
-  void perform_directed_queries (CORBA::Environment& ACE_TRY_ENV)
+  void perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -63,8 +63,8 @@ public:
 
 private:
 
-  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager,
-                                      CORBA::Environment& ACE_TRY_ENV)
+  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -80,8 +80,8 @@ private:
   // pass in <policy_manager>.
 
   void display_results (const CosTrading::OfferSeq& offer_seq,
-                        CosTrading::OfferIterator_ptr offer_iterator,
-                        CORBA::Environment& ACE_TRY_ENV) const
+                        CosTrading::OfferIterator_ptr offer_iterator
+                        TAO_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Display the results of the query to the screen.
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index ba20cd0fc76..dedb5b91f77 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -6,19 +6,19 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
 
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
-                           CORBA::Boolean verbose,
-                           CORBA::Environment& ACE_TRY_ENV)
+                           CORBA::Boolean verbose
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   : verbose_ (verbose),
     lookup_ (lookup_if)
 {
   // Obtain the Service Type Repository.
-  CosTrading::TypeRepository_var obj = lookup_if->type_repos (ACE_TRY_ENV);
+  CosTrading::TypeRepository_var obj = lookup_if->type_repos (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow the Service Type Repository.
-  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in (),
-                                                                  ACE_TRY_ENV);
+  this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ()
+                                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Build the service type descriptions.
@@ -26,7 +26,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::remove_all_types (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -39,7 +39,7 @@ TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV)
     {
       ACE_TRY
         {
-          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i], ACE_TRY_ENV);
+          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosTrading::UnknownServiceType, excp)
@@ -62,7 +62,7 @@ TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::add_all_types (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -76,12 +76,12 @@ TAO_Service_Type_Exporter::add_all_types (CORBA::Environment& ACE_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "adding all types to the Repository.\n"));
-  this->add_all_types_to (this->repos_.ptr (), ACE_TRY_ENV);
+  this->add_all_types_to (this->repos_.ptr () TAO_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -96,12 +96,12 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
               "add all types to all repositories.\n"));
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_TRY_ENV);
+  CosTrading::Link_var link_if = this->lookup_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
               " linked to the root trader.\n"));
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV);
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Exporting service types with each of the linked"
@@ -114,19 +114,19 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i], ACE_TRY_ENV);
+            link_if->describe_link (link_name_seq[i] TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
 
           CosTrading::TypeRepository_var remote_repos =
-            link_info->target->type_repos (ACE_TRY_ENV);
+            link_info->target->type_repos (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           str =
-            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in (),
-                                                             ACE_TRY_ENV);
+            CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -138,15 +138,15 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV
       ACE_CHECK;
 
       // @@ Seth, But this one?
-      this->add_all_types_to (str, ACE_TRY_ENV);
+      this->add_all_types_to (str TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_Service_Type_Exporter::
-add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
-                  CORBA::Environment& ACE_TRY_ENV)
+add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -164,8 +164,8 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
           repos->add_type (TT_Info::INTERFACE_NAMES[i],
                            this->type_structs_[i].if_name,
                            this->type_structs_[i].props,
-                           this->type_structs_[i].super_types,
-                           ACE_TRY_ENV);
+                           this->type_structs_[i].super_types
+                           TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste)
@@ -203,7 +203,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
 }
 
 void
-TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::list_all_types (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -214,7 +214,7 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
 
       sst.all_ (1);
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names =
-        this->repos_->list_types (sst, ACE_TRY_ENV);
+        this->repos_->list_types (sst TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong l = type_names->length ();
@@ -240,7 +240,7 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -253,8 +253,8 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i],
-                                         ACE_TRY_ENV);
+            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
@@ -274,7 +274,7 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+TAO_Service_Type_Exporter::fully_describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -287,8 +287,8 @@ TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& ACE_TRY
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i],
-                                               ACE_TRY_ENV);
+            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]
+                                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
@@ -320,7 +320,6 @@ dump_typestruct (const char* type_name,
       "Mandatory and Readonly"
     };
 
-  CORBA::Environment env;
   ACE_DEBUG ((LM_DEBUG, "Type Name: %s\n", type_name));
   ACE_DEBUG ((LM_DEBUG, "Interface Name: %s\n", type_struct.if_name.in ()));
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index e5645cb087b..3ddbee392b9 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -23,18 +23,18 @@ class TAO_Service_Type_Exporter
 public:
 
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
-                             CORBA::Boolean verbose,
-                             CORBA::Environment& ACE_TRY_ENV)
+                             CORBA::Boolean verbose
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void remove_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void remove_all_types (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::HasSubTypes));
   // Remove all service types from the trading service instance.
 
-  void add_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void add_all_types (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -46,7 +46,7 @@ public:
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
   // Add all the generated service types to the trading service instance.
 
-  void add_all_types_to_all (CORBA::Environment& ACE_TRY_ENV)
+  void add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -59,19 +59,19 @@ public:
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
 
-  void list_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void list_all_types (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // List all the service types registered with the trading service
   // instance.
 
-  void describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType));
   // Describe all the service types registered with the trading
   // service instance.
 
-  void fully_describe_all_types (CORBA::Environment& ACE_TRY_ENV)
+  void fully_describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -84,8 +84,8 @@ private:
   void create_types (void);
   // Generate the service type description structures.
 
-  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos,
-                         CORBA::Environment& ACE_TRY_ENV)
+  void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index 4534fec6f2e..67a7e894c17 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -10,14 +10,14 @@ ACE_RCSID(Trading, Simple_Dynamic, "$Id$")
 template <class T>
 TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
   : dp_ (dp)
-{  
+{
 }
 
 template <class T> CORBA::Any*
 TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
                                         CORBA::TypeCode_ptr,
-                                        const CORBA::Any&,
-                                        CORBA::Environment&)
+                                        const CORBA::Any&
+                                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* return_value = 0;
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index fde0264654c..2b646a75c56 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -34,8 +34,8 @@ public:
 
   virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
-                              const CORBA::Any& /* extra_info */,
-                              CORBA::Environment &)
+                              const CORBA::Any& /* extra_info */
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 private:
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 06d39cb1576..8a4f464d1f4 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -139,8 +139,8 @@ const char* TT_Info::QUERIES[][3] =
 
 void
 TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
-                          CORBA::Boolean print_dynamic,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Boolean print_dynamic
+                          TAO_ENV_ARG_DECL)
 {
   TAO_Property_Evaluator prop_eval (prop_seq);
 
@@ -157,7 +157,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
 
           if (print_dynamic || ! is_dynamic)
             {
-              value = prop_eval.property_value(k, ACE_TRY_ENV);
+              value = prop_eval.property_value(k TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               tc = value->type ();
@@ -177,7 +177,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
 
       if (tc == 0)
         continue;
-      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq, ACE_TRY_ENV);
+      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (check)
@@ -192,7 +192,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
         }
       else
         {
-          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq, ACE_TRY_ENV);
+          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           if (check)
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 2e346d7e5df..9ad80c25ab7 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -15,8 +15,8 @@ class TT_Info
 public:
 
   static void dump_properties (const CosTrading::PropertySeq& prop_seq,
-                               CORBA::Boolean print_dynamic = 1,
-                               CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                               CORBA::Boolean print_dynamic = 1
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Dump the contents of this property sequence.
 
   enum INTERFACES
@@ -37,7 +37,7 @@ public:
 
     Remote_Output (void) {}
 
-    virtual void confirm (CORBA::Environment &)
+    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -50,7 +50,7 @@ public:
 
     Printer (void) {}
 
-    virtual void confirm (CORBA::Environment &)
+    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -62,7 +62,7 @@ public:
   public:
     Plotter (void) {}
 
-    virtual void confirm (CORBA::Environment &)
+    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -74,7 +74,7 @@ public:
   public:
     File_System (void) {}
 
-    virtual void confirm (CORBA::Environment &)
+    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -86,7 +86,7 @@ public:
   public:
     PostScript_Printer (void) {}
 
-    virtual void confirm (CORBA::Environment &)
+    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -178,20 +178,20 @@ public:
 
 class TT_Parse_Args
   // = TITLE
-  // Utility to parse the command-line arguments to the trading service tests. 
+  // Utility to parse the command-line arguments to the trading service tests.
 {
   public:
-  
+
   TT_Parse_Args (int& argc, char** argv);
 
   ~TT_Parse_Args ();
-  
+
   int federated () const;
   // True if the test should test the federated features of the trading
   // service.
 
   int quiet () const;
-  // True if the tests should supress all but the most essential output. 
+  // True if the tests should supress all but the most essential output.
 
   char* ior () const;
   // Not null if the test user supplied an explicit ior.
@@ -199,7 +199,7 @@ class TT_Parse_Args
   private:
 
   int federated_, quiet_;
-  char* ior_; 
+  char* ior_;
 };
 
 #endif /* TAO_TRADER_TEST_UTILS_H */
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 8bc004979aa..cf065e56c5d 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -32,7 +32,7 @@ main (int argc, char** argv)
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv, ACE_TRY_ENV);
+      orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
@@ -49,68 +49,68 @@ main (int argc, char** argv)
       TAO_Trading_Components_i& trd_comp = trader->trading_components ();
 
       // Set the service type repository
-      sup_attr.type_repos (type_repos._this (ACE_TRY_ENV));
+      sup_attr.type_repos (type_repos._this (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
-         verbose,
-         ACE_TRY_ENV);
+         verbose
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.remove_all_types (ACE_TRY_ENV);
+      type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.add_all_types (ACE_TRY_ENV);
+      type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.list_all_types (ACE_TRY_ENV);
+      type_exporter.list_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.describe_all_types (ACE_TRY_ENV);
+      type_exporter.describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.fully_describe_all_types (ACE_TRY_ENV);
+      type_exporter.fully_describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
       TAO_Offer_Exporter offer_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
-         verbose,
-         ACE_TRY_ENV);
+         verbose
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
+      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
+      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.modify_offers (ACE_TRY_ENV);
+      offer_exporter.modify_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers_using_constraints (ACE_TRY_ENV);
+      offer_exporter.withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
+      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
+      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Offer Importer tests
@@ -118,7 +118,7 @@ main (int argc, char** argv)
       TAO_Offer_Importer offer_importer
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose);
 
-      offer_importer.perform_queries (ACE_TRY_ENV);
+      offer_importer.perform_queries (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index ff031a1c450..34801bf7be1 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -16,7 +16,7 @@ main (int argc, char** argv)
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv, ACE_TRY_ENV);
+      orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
@@ -29,7 +29,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (trading_obj.in ()))
@@ -40,86 +40,86 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV);
+        CosTrading::Lookup::_narrow (trading_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter (lookup_if.in (),
-                                               ! parse_args.quiet (),
-                                               ACE_TRY_ENV);
+                                               ! parse_args.quiet ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.remove_all_types (ACE_TRY_ENV);
+      type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.add_all_types (ACE_TRY_ENV);
+      type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.remove_all_types (ACE_TRY_ENV);
+      type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.add_all_types (ACE_TRY_ENV);
+      type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args.federated ())
         {
-          type_exporter.add_all_types_to_all (ACE_TRY_ENV);
+          type_exporter.add_all_types_to_all (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      type_exporter.list_all_types (ACE_TRY_ENV);
+      type_exporter.list_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.describe_all_types (ACE_TRY_ENV);
+      type_exporter.describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.fully_describe_all_types (ACE_TRY_ENV);
+      type_exporter.fully_describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n"));
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
-      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet (), ACE_TRY_ENV);
+      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // = Test series.
 
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
+      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
+      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.modify_offers (ACE_TRY_ENV);
+      offer_exporter.modify_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers_using_constraints (ACE_TRY_ENV);
+      offer_exporter.withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers (ACE_TRY_ENV);
+      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (ACE_TRY_ENV);
+      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args.federated ())
         {
-          offer_exporter.export_offers_to_all (ACE_TRY_ENV);
+          offer_exporter.export_offers_to_all (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      offer_exporter.describe_offers (ACE_TRY_ENV);
+      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n"));
@@ -143,7 +143,7 @@ main (int argc, char** argv)
         ACE_DEBUG ((LM_WARNING, "Unable to open %s for output.\n", file));
       }
 
-      orb_manager.run (ACE_TRY_ENV);
+      orb_manager.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index 7f95d30dcfb..58c14450669 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -11,7 +11,7 @@ main (int argc, char** argv)
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv, ACE_TRY_ENV);
+      orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
@@ -23,7 +23,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (trading_obj.in ()))
@@ -34,19 +34,19 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV);
+        CosTrading::Lookup::_narrow (trading_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
       TAO_Offer_Importer offer_importer (lookup_if.in (), ! parse_args.quiet ());
 
-      offer_importer.perform_queries (ACE_TRY_ENV);
+      offer_importer.perform_queries (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args.federated ())
         {
-          offer_importer.perform_directed_queries (ACE_TRY_ENV);
+          offer_importer.perform_directed_queries (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 584c4243460..7ff9800e620 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -34,7 +34,7 @@ IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void)
 }
 
 int
-IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
+IOR_corbaname_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY
@@ -46,7 +46,7 @@ IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
       // The corbaname URL contains the host at which an NamingContext
       // Object can be found and also the stringified form of an entry
-      // in the Naming Service seperated by '#'. For simplicity, 
+      // in the Naming Service seperated by '#'. For simplicity,
       // in this example, we are specifying the stringified form of
       // the binding directly without using <to_string> method on
       // <name>. "#" refers to the seperator between the host and the
@@ -56,19 +56,19 @@ IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
       // Append the seperator '#' to the host.
       corbaname_url += "#";
-      
+
       // Append the stringified name to the resultant.
       corbaname_url += "STATUS";
 
       // Resolve the stringified name.
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (corbaname_url.c_str (),
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (corbaname_url.c_str ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow
       corbaname::Status_var factory =
-        corbaname::Status::_narrow (factory_object.in (), ACE_TRY_ENV);
+        corbaname::Status::_narrow (factory_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -80,8 +80,8 @@ IOR_corbaname_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
         }
 
       // Invoke a request on the server
-      CORBA::Boolean ret_value = 
-        factory->print_status (ACE_TRY_ENV);
+      CORBA::Boolean ret_value =
+        factory->print_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value == 0)
@@ -117,7 +117,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -125,8 +125,8 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
       this->orb_ =
         CORBA::ORB_init (this->argc_,
                          this->argv_,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // There must be at least one argument, the file that has to be
@@ -136,7 +136,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
                            "Address of naming context not specified\n",
                            this->argv_[0]),
                            -1);
-      
+
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 46bbdf3ee08..5c54587bf12 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -5,34 +5,34 @@
 
 int main (int argc, char* argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA Manager
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the servant
@@ -44,13 +44,13 @@ int main (int argc, char* argv[])
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down the reference
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_context_object.in(),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_context_object.in()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind Status to the Naming Context
@@ -59,12 +59,12 @@ int main (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("STATUS");
 
       naming_context->bind (name,
-                            status.in (),
-                            ACE_TRY_ENV);
+                            status.in ()
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the orb
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA, waiting until the destruction terminates
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index 9f585d1c5db..2d5f59b38ae 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -32,12 +32,12 @@ ACE_RCSID(tests_svc_loader, tests_svc_loader, "$Id$")
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // There must be at least one argument, the file that has to be
@@ -53,12 +53,12 @@ int main (int argc, char *argv [])
 
       // Use the first argument to create the object reference.
       CORBA::Object_var object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check if this object reference is a valid one..
       CORBA::Boolean not_exists =
-        object->_non_existent (ACE_TRY_ENV);
+        object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (not_exists)
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
index 7ce0d3fface..3b5956fa0ef 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.h b/TAO/performance-tests/AMI_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.h
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
index d4b20578bb9..896ac02f08d 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
@@ -23,8 +23,8 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 }
 
 void
-Roundtrip_Handler::test_method (Test::Timestamp send_time,
-                                CORBA::Environment &)
+Roundtrip_Handler::test_method (Test::Timestamp send_time
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->pending_callbacks_--;
@@ -34,14 +34,14 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       this->pending_callbacks_--;
-      holder->raise_test_method (ACE_TRY_ENV);
+      holder->raise_test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -52,19 +52,19 @@ Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
 }
 
 void
-Roundtrip_Handler::shutdown (CORBA::Environment &)
+Roundtrip_Handler::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_TRY_ENV);
+      holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
index e25fc22c03c..3475d61f1df 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
@@ -32,17 +32,17 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time,
-                            CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method (Test::Timestamp send_time
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                  CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/AMI_Latency/client.cpp b/TAO/performance-tests/AMI_Latency/client.cpp
index b70854b9e5c..b706de3e081 100644
--- a/TAO/performance-tests/AMI_Latency/client.cpp
+++ b/TAO/performance-tests/AMI_Latency/client.cpp
@@ -74,11 +74,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -87,22 +87,22 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -127,10 +127,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
 
       Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_TRY_ENV);
+        roundtrip_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
@@ -139,11 +139,11 @@ main (int argc, char *argv[])
         {
           // Invoke asynchronous operation....
           roundtrip->sendc_test_method (roundtrip_handler.in (),
-                                        ACE_OS::gethrtime (),
-                                        ACE_TRY_ENV);
+                                        ACE_OS::gethrtime ()
+                                        TAO_ENV_ARG_PARAMETER);
 
           ACE_Time_Value tv (0, 20000);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -159,13 +159,13 @@ main (int argc, char *argv[])
                                              test_end - test_start,
                                              niterations);
 
-      roundtrip->shutdown (ACE_TRY_ENV);
+      roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/AMI_Latency/server.cpp b/TAO/performance-tests/AMI_Latency/server.cpp
index a332a8d6932..b2e88f6c0e6 100644
--- a/TAO/performance-tests/AMI_Latency/server.cpp
+++ b/TAO/performance-tests/AMI_Latency/server.cpp
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -88,11 +88,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -105,11 +105,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -122,7 +122,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in ());
@@ -138,10 +138,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index 3f4a993f3f1..f86c6f605cb 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -17,8 +17,8 @@ Callback_i::done (void)
 
 void
 Callback_i::response (Test::TimeStamp time_stamp,
-                      const Test::Payload &,
-                      CORBA::Environment &)
+                      const Test::Payload &
+                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index 917032bcdfb..95b9850ee4e 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -22,8 +22,8 @@ public:
   /// Implement the CORBA methods
   //@{
   void response (Test::TimeStamp,
-                 const Test::Payload &,
-                 CORBA::Environment &)
+                 const Test::Payload &
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 7859d40803b..67c2780de3e 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -9,8 +9,8 @@
 ACE_RCSID(Callback, Server_i, "$Id$")
 
 void
-Server_i::set_callback (Test::Callback_ptr callback,
-                        CORBA::Environment &)
+Server_i::set_callback (Test::Callback_ptr callback
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_ = Test::Callback::_duplicate (callback);
@@ -18,18 +18,18 @@ Server_i::set_callback (Test::Callback_ptr callback,
 
 void
 Server_i::request (Test::TimeStamp time_stamp,
-                   const Test::Payload &payload,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   const Test::Payload &payload
+                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     return;
 
-  this->callback_->response (time_stamp, payload, ACE_TRY_ENV);
+  this->callback_->response (time_stamp, payload TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Server_i::shutdown (CORBA::Environment &)
+Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->done_ = 1;
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index e561c2c3ec8..5cf73c65ce7 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -17,16 +17,16 @@ public:
 
   /// Implement the CORBA methods
   //@{
-  void set_callback (Test::Callback_ptr callback,
-                     CORBA::Environment &)
+  void set_callback (Test::Callback_ptr callback
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void request (Test::TimeStamp,
-                const Test::Payload &,
-                CORBA::Environment &)
+                const Test::Payload &
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 586838059e6..3b51bd5e2a7 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -73,17 +73,17 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -93,16 +93,16 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -111,14 +111,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -126,11 +126,11 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Server_var server =
-        Test::Server::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (server.in ()))
         {
@@ -143,10 +143,10 @@ main (int argc, char *argv [])
 
       Callback_i callback_i (iterations);
 
-      Test::Callback_var callback = callback_i._this (ACE_TRY_ENV);
+      Test::Callback_var callback = callback_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->set_callback (callback.in (), ACE_TRY_ENV);
+      server->set_callback (callback.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected callback\n"));
@@ -158,7 +158,7 @@ main (int argc, char *argv [])
       while (!callback_i.done () || !task.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -188,15 +188,15 @@ main (int argc, char *argv [])
                                              end - start,
                                              stats.samples_count ());
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&callback_i, ACE_TRY_ENV);
+        root_poa->servant_to_id (&callback_i TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -223,20 +223,20 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-h (dump full sample history) "
-			   "-i <iterations> "
-			   "-k <IOR> "
+                           "-i <iterations> "
+                           "-k <IOR> "
                            "\n",
                            argv [0]),
                           -1);
@@ -270,7 +270,7 @@ Task::svc (void)
       for (;;)
         {
           Test::TimeStamp creation = ACE_OS::gethrtime ();
-          this->server_->request (creation, payload, ACE_TRY_ENV);
+          this->server_->request (creation, payload TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_Time_Value tv (0, 5000);
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index a9beeb5e404..3f86e8c1254 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -42,17 +42,17 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -62,16 +62,16 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -80,14 +80,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -95,38 +95,38 @@ main (int argc, char *argv [])
 
       Server_i server_i;
 
-      Test::Server_var server = server_i._this (ACE_TRY_ENV);
+      Test::Server_var server = server_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file_name != 0)
         {
-	  FILE *output_file = ACE_OS::fopen (ior_file_name, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_file_name),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", str.in ());
-	  ACE_OS::fclose (output_file);
+          FILE *output_file = ACE_OS::fopen (ior_file_name, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_file_name),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", str.in ());
+          ACE_OS::fclose (output_file);
         }
 
       while (!server_i.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&server_i, ACE_TRY_ENV);
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+        root_poa->servant_to_id (&server_i TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -149,14 +149,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_file_name = get_opts.optarg;
-	break;
+        ior_file_name = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <ior_file_name>"
+                           "-o <ior_file_name>"
                            "\n",
                            argv [0]),
                           -1);
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 8273d5089ca..fdf0a8886fa 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -200,8 +200,8 @@ DII_Cubit_Client::init (int argc, char **argv)
       // Initialize the ORB.
       this->orb_var_ = CORBA::ORB_init (this->argc_,
                                         this->argv_,
-                                        "internet",
-                                        ACE_TRY_ENV);
+                                        "internet"
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -213,13 +213,13 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // Get a factory object reference from the factory IOR.
       this->factory_var_ =
-        this->orb_var_->string_to_object (this->factory_IOR_,
-                                          ACE_TRY_ENV);
+        this->orb_var_->string_to_object (this->factory_IOR_
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a Cubit object with a DII request on the Cubit factory.
-      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit",
-                                                               ACE_TRY_ENV));
+      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit"
+                                                               TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -233,7 +233,7 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // Invoke the <make_cubit> operation to ask the Cubit factory
       // for a Cubit object.
-      mc_req->invoke (ACE_TRY_ENV);
+      mc_req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Extract the returned object reference from the request.
@@ -387,8 +387,8 @@ DII_Cubit_Client::cube_short_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_short",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_short"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -402,7 +402,7 @@ DII_Cubit_Client::cube_short_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       req->return_value () >>= ret_short;
@@ -431,8 +431,8 @@ DII_Cubit_Client::cube_long_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_long",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_long"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -446,7 +446,7 @@ DII_Cubit_Client::cube_long_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -476,8 +476,8 @@ DII_Cubit_Client::cube_octet_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_octet",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_octet"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -493,7 +493,7 @@ DII_Cubit_Client::cube_octet_dii (void)
       // Invoke, check for an exception and verify the result.
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -524,8 +524,8 @@ DII_Cubit_Client::cube_union_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_union",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_union"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -545,7 +545,7 @@ DII_Cubit_Client::cube_union_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -579,8 +579,8 @@ DII_Cubit_Client::cube_struct_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_struct",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_struct"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -599,7 +599,7 @@ DII_Cubit_Client::cube_struct_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -631,8 +631,8 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence",
-                                                         ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence"
+                                                         TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -652,7 +652,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -692,8 +692,8 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -714,7 +714,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -821,13 +821,13 @@ DII_Cubit_Client::run (void)
       // Shut down server via a DII request.
       if (this->shutdown_)
         {
-          CORBA::Request_var req (this->obj_var_->_request ("shutdown",
-                                                            ACE_TRY_ENV));
+          CORBA::Request_var req (this->obj_var_->_request ("shutdown"
+                                                            TAO_ENV_ARG_PARAMETER));
 
           ACE_TRY_CHECK;
 
           // Cubit::shutdown () is a oneway operation.
-          req->send_oneway (ACE_TRY_ENV);
+          req->send_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index aa872d04ec0..90854fdd211 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -382,7 +382,7 @@ Cubit_Client::check_enabled (unsigned int mask) const
 // Exercise the union.  Cube a union.
 
 void
-Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -397,8 +397,8 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-        r = this->cubit_->cube_union (u,
-                                      ACE_TRY_ENV);
+        r = this->cubit_->cube_union (u
+                                      TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -425,8 +425,8 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-        r = this->cubit_->cube_union (u,
-                                      ACE_TRY_ENV);
+        r = this->cubit_->cube_union (u
+                                      TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -458,8 +458,8 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
 // Cube a short.
 
 void
-Cubit_Client::cube_short (int i,
-                          CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_short (int i
+                          TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -470,8 +470,8 @@ Cubit_Client::cube_short (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_SHORT_START);
 
-        ret_short = cubit_->cube_short (arg_short,
-                                        ACE_TRY_ENV);
+        ret_short = cubit_->cube_short (arg_short
+                                        TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -509,13 +509,13 @@ Cubit_Client::cube_short (int i,
 // Oneway test.
 
 void
-Cubit_Client::cube_oneway (int,
-                           CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_oneway (int
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START);
-      this->cubit_->cube_oneway (ACE_TRY_ENV);
+      this->cubit_->cube_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -530,13 +530,13 @@ Cubit_Client::cube_oneway (int,
 }
 
 void
-Cubit_Client::cube_void (int,
-                         CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_void (int
+                         TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START);
-      this->cubit_->cube_void (ACE_TRY_ENV);
+      this->cubit_->cube_void (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -553,8 +553,8 @@ Cubit_Client::cube_void (int,
 // Cube an octet
 
 void
-Cubit_Client::cube_octet (int i,
-                          CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_octet (int i
+                          TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -565,8 +565,8 @@ Cubit_Client::cube_octet (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_START);
 
-        ret_octet = this->cubit_->cube_octet (arg_octet,
-                                              ACE_TRY_ENV);
+        ret_octet = this->cubit_->cube_octet (arg_octet
+                                              TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -605,8 +605,8 @@ Cubit_Client::cube_octet (int i,
 // calculate the cube from a long
 
 void
-Cubit_Client::cube_long (int i,
-                         CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_long (int i
+                         TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -617,8 +617,8 @@ Cubit_Client::cube_long (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_START);
 
-        ret_long = this->cubit_->cube_long (arg_long,
-                                            ACE_TRY_ENV);
+        ret_long = this->cubit_->cube_long (arg_long
+                                            TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -660,8 +660,8 @@ Cubit_Client::cube_long (int i,
 // Cube the numbers in a struct
 
 void
-Cubit_Client::cube_struct (int i,
-                           CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_struct (int i
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -678,8 +678,8 @@ Cubit_Client::cube_struct (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_STRUCT_START);
 
-        ret_struct = this->cubit_->cube_struct (arg_struct,
-                                                ACE_TRY_ENV);
+        ret_struct = this->cubit_->cube_struct (arg_struct
+                                                TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -717,8 +717,8 @@ Cubit_Client::cube_struct (int i,
 
 void
 Cubit_Client::cube_long_sequence (int,
-                                  int l,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  int l
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -745,8 +745,8 @@ Cubit_Client::cube_long_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_SEQUENCE_START);
 
         this->cubit_->cube_long_sequence (input,
-                                          vout,
-                                          ACE_TRY_ENV);
+                                          vout
+                                          TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -790,8 +790,8 @@ Cubit_Client::cube_long_sequence (int,
 
 void
 Cubit_Client::cube_octet_sequence (int,
-                                   int l,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   int l
+                                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -819,8 +819,8 @@ Cubit_Client::cube_octet_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_SEQUENCE_START);
 
         this->cubit_->cube_octet_sequence (input,
-                                           vout,
-                                           ACE_TRY_ENV);
+                                           vout
+                                           TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -865,8 +865,8 @@ Cubit_Client::cube_octet_sequence (int,
 
 void
 Cubit_Client::cube_many_sequence (int,
-                                  int l,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  int l
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -901,8 +901,8 @@ Cubit_Client::cube_many_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_MANY_SEQUENCE_START);
 
         this->cubit_->cube_many_sequence (input,
-                                          vout,
-                                          ACE_TRY_ENV);
+                                          vout
+                                          TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -950,8 +950,8 @@ Cubit_Client::cube_many_sequence (int,
 void
 Cubit_Client::cube_rti_data (int,
                              int numUpdates,
-                             int numAttrs,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             int numAttrs
+                             TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1021,8 +1021,8 @@ Cubit_Client::cube_rti_data (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_RTI_DATA_START);
 
         this->cubit_->cube_rti_data (input,
-                                     vout,
-                                     ACE_TRY_ENV);
+                                     vout
+                                     TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -1053,8 +1053,8 @@ Cubit_Client::cube_rti_data (int,
 // calculate the cube from long contained in an any
 
 void
-Cubit_Client::cube_any (int i,
-                        CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_any (int i
+                        TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1068,8 +1068,8 @@ Cubit_Client::cube_any (int i,
       arg_any <<= arg_long;
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_START);
-        ret_any = this->cubit_->cube_any (arg_any,
-                                          ACE_TRY_ENV);
+        ret_any = this->cubit_->cube_any (arg_any
+                                          TAO_ENV_ARG_PARAMETER);
       }
       ACE_TRY_CHECK;
 
@@ -1113,8 +1113,8 @@ Cubit_Client::cube_any (int i,
 // Cube the numbers in a struct
 
 void
-Cubit_Client::cube_any_struct (int i,
-                               CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_any_struct (int i
+                               TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1133,8 +1133,8 @@ Cubit_Client::cube_any_struct (int i,
       arg_any <<= arg_struct;
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_STRUCT_START);
-        ret_any = this->cubit_->cube_any_struct (arg_any,
-                                                 ACE_TRY_ENV);
+        ret_any = this->cubit_->cube_any_struct (arg_any
+                                                 TAO_ENV_ARG_PARAMETER);
       }
       ACE_TRY_CHECK;
 
@@ -1246,7 +1246,7 @@ Cubit_Client::run ()
 
   // Show the results one type at a time.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // VOID
@@ -1258,8 +1258,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_void (i,
-                               ACE_TRY_ENV);
+              this->cube_void (i
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1279,8 +1279,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_short (i,
-                                ACE_TRY_ENV);
+              this->cube_short (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1300,8 +1300,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_octet (i,
-                                ACE_TRY_ENV);
+              this->cube_octet (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1321,8 +1321,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_long (i,
-                               ACE_TRY_ENV);
+              this->cube_long (i
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1341,8 +1341,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_struct (i,
-                                 ACE_TRY_ENV);
+              this->cube_struct (i
+                                 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1362,7 +1362,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_union (ACE_TRY_ENV);
+              this->cube_union (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1383,8 +1383,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_long_sequence (this->loop_count_,
-                                        4,
-                                        ACE_TRY_ENV);
+                                        4
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1405,8 +1405,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_long_sequence (this->loop_count_,
-                                        1024,
-                                        ACE_TRY_ENV);
+                                        1024
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1432,8 +1432,8 @@ Cubit_Client::run ()
               for (i = 0; i < this->loop_count_; ++i)
                 {
                   this->cube_octet_sequence (this->loop_count_,
-                                             bytes_in_octet_sequence_,
-                                             ACE_TRY_ENV);
+                                             bytes_in_octet_sequence_
+                                             TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -1442,8 +1442,8 @@ Cubit_Client::run ()
               for (i = 0; i < this->loop_count_; ++i)
                 {
                   this->cube_octet_sequence (this->loop_count_,
-                                             16,
-                                             ACE_TRY_ENV);
+                                             16
+                                             TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -1465,8 +1465,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_octet_sequence (this->loop_count_,
-                                         4096,
-                                         ACE_TRY_ENV);
+                                         4096
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1487,8 +1487,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_many_sequence (this->loop_count_,
-                                        4,
-                                        ACE_TRY_ENV);
+                                        4
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1509,8 +1509,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_many_sequence (this->loop_count_,
-                                        1024,
-                                        ACE_TRY_ENV);
+                                        1024
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1530,16 +1530,16 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_short (i,
-                                ACE_TRY_ENV);
+              this->cube_short (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->cube_octet (i,
-                                ACE_TRY_ENV);
+              this->cube_octet (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->cube_long (i,
-                               ACE_TRY_ENV);
+              this->cube_long (i
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1560,8 +1560,8 @@ Cubit_Client::run ()
             {
               this->cube_rti_data (this->loop_count_,
                                    2,
-                                   5,
-                                   ACE_TRY_ENV);
+                                   5
+                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1581,8 +1581,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_oneway (i,
-                                 ACE_TRY_ENV);
+              this->cube_oneway (i
+                                 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1602,8 +1602,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_any (i,
-                              ACE_TRY_ENV);
+              this->cube_any (i
+                              TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1622,8 +1622,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_any_struct (i,
-                                     ACE_TRY_ENV);
+              this->cube_any_struct (i
+                                     TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
             }
@@ -1635,8 +1635,8 @@ Cubit_Client::run ()
                              elapsed_time);
         }
 
-      this->shutdown_server (this->shutdown_,
-                             ACE_TRY_ENV);
+      this->shutdown_server (this->shutdown_
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1650,8 +1650,8 @@ Cubit_Client::run ()
 }
 
 int
-Cubit_Client::shutdown_server (int do_shutdown,
-                               CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::shutdown_server (int do_shutdown
+                               TAO_ENV_ARG_DECL)
 {
   if (do_shutdown)
     {
@@ -1660,7 +1660,7 @@ Cubit_Client::shutdown_server (int do_shutdown,
 
       ACE_TRY_EX(NOT_COLLOCATED)
         {
-          this->cubit_->shutdown (ACE_TRY_ENV);
+          this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (NOT_COLLOCATED);
         }
       ACE_CATCHANY
@@ -1713,8 +1713,8 @@ Cubit_Client::init (int argc, char **argv)
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -1743,13 +1743,13 @@ Cubit_Client::init (int argc, char **argv)
         }
 
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (this->cubit_factory_key_,
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (this->cubit_factory_key_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
-        Cubit_Factory::_narrow (factory_object.in(),
-                                ACE_TRY_ENV);
+        Cubit_Factory::_narrow (factory_object.in()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
@@ -1765,7 +1765,7 @@ Cubit_Client::init (int argc, char **argv)
 
       // Now retrieve the Cubit obj ref corresponding to the key.
       this->cubit_ =
-        this->factory_->make_cubit (ACE_TRY_ENV);
+        this->factory_->make_cubit (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->cubit_.in ()))
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 5899ad7c74d..1915358559c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -82,59 +82,59 @@ private:
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
   // Prints the time stats.
 
-  void cube_union (CORBA::Environment &ACE_TRY_ENV);
+  void cube_union (TAO_ENV_SINGLE_ARG_DECL);
   // Exercise the union.  Cube a union.
 
-  void cube_struct (int i,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void cube_struct (int i
+                    TAO_ENV_ARG_DECL);
   // calculate the cube from a struct.
 
-  void cube_long (int i,
-                  CORBA::Environment &ACE_TRY_ENV);
+  void cube_long (int i
+                  TAO_ENV_ARG_DECL);
   // calculate the cube from a long.
 
-  void cube_oneway (int i,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void cube_oneway (int i
+                    TAO_ENV_ARG_DECL);
   // Oneway operation test.
 
-  void cube_void (int i,
-                  CORBA::Environment &ACE_TRY_ENV);
+  void cube_void (int i
+                  TAO_ENV_ARG_DECL);
   // Twoway operation test.
 
-  void cube_octet (int i,
-                   CORBA::Environment &ACE_TRY_ENV);
+  void cube_octet (int i
+                   TAO_ENV_ARG_DECL);
   // Cube an octet.
 
-  void cube_short (int i,
-                   CORBA::Environment &ACE_TRY_ENV);
+  void cube_short (int i
+                   TAO_ENV_ARG_DECL);
   // Cube a short.
 
-  void cube_long_sequence (int i, int l,
-                           CORBA::Environment &ACE_TRY_ENV);
+  void cube_long_sequence (int i, int l
+                           TAO_ENV_ARG_DECL);
   // Cube a sequence <l> is the length of the sequence.
 
-  void cube_octet_sequence (int i, int l,
-                            CORBA::Environment &ACE_TRY_ENV);
+  void cube_octet_sequence (int i, int l
+                            TAO_ENV_ARG_DECL);
   // Cube a sequence of octets, <l> is the length of the sequence.
 
-  void cube_many_sequence (int i, int l,
-                           CORBA::Environment &ACE_TRY_ENV);
+  void cube_many_sequence (int i, int l
+                           TAO_ENV_ARG_DECL);
   // Cube a sequence of manys, <l> is the length of the sequence.
 
-  void cube_rti_data (int i, int numUpdates, int numAttrs,
-                      CORBA::Environment &ACE_TRY_ENV);
+  void cube_rti_data (int i, int numUpdates, int numAttrs
+                      TAO_ENV_ARG_DECL);
   // Cube a sequence <l> is the length of the sequence.
 
-  void cube_any_struct (int i,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void cube_any_struct (int i
+                    TAO_ENV_ARG_DECL);
   // calculate the cube from a struct in an any.
 
-  void cube_any (int i,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void cube_any (int i
+                 TAO_ENV_ARG_DECL);
   // calculate the cube from a long in an any.
 
-  int shutdown_server (int do_shutdown,
-                       CORBA::Environment &ACE_TRY_ENV);
+  int shutdown_server (int do_shutdown
+                       TAO_ENV_ARG_DECL);
   // Invoke the method with <do_shutdown> != 0 to shutdown the server.
 
   int argc_;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index f54292b49bb..313495d228b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -55,15 +55,15 @@ Cubit_Server::parse_args (void)
 
 int
 Cubit_Server::init (int argc,
-                    char** argv,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    char** argv
+                    TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -88,8 +88,8 @@ Cubit_Server::init (int argc,
 
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
-                                                 this->factory_impl_,
-                                                 ACE_TRY_ENV);
+                                                 this->factory_impl_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -108,9 +108,9 @@ Cubit_Server::init (int argc,
 }
 
 int
-Cubit_Server::run (CORBA::Environment& env)
+Cubit_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cubit_Server::run"),
                       -1);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 633b4424037..d31269dd6ee 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -51,11 +51,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the Cubit_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 73897ae501b..6eca9eb5f98 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -126,10 +126,10 @@ Cubit_Factory_i::~Cubit_Factory_i (void)
 }
 
 Cubit_ptr
-Cubit_Factory_i::make_cubit (CORBA::Environment &env)
+Cubit_Factory_i::make_cubit (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return my_cubit_._this (env);
+  return my_cubit_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -152,7 +152,7 @@ Cubit_i::~Cubit_i (void)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (CORBA::Environment &)
+Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -164,14 +164,14 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
 }
 
 void
-Cubit_i::cube_oneway (CORBA::Environment &)
+Cubit_i::cube_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
-Cubit_i::cube_void (CORBA::Environment &)
+Cubit_i::cube_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
@@ -180,54 +180,50 @@ Cubit_i::cube_void (CORBA::Environment &)
 // Cube an octet
 
 CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &env)
+Cubit_i::cube_octet (CORBA::Octet o
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START);
 
-  ACE_UNUSED_ARG (env);
   return o * o * o;
 }
 
 // Cube a short.
 
 CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &env)
+Cubit_i::cube_short (CORBA::Short s
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START);
 
-  ACE_UNUSED_ARG (env);
   return s * s * s;
 }
 
 // Cube a long
 
 CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &env)
+Cubit_i::cube_long (CORBA::Long l
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START);
 
-  ACE_UNUSED_ARG (env);
   return l * l * l;
 }
 
 // Cube a struct
 
 Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &env)
+Cubit_i::cube_struct (const Cubit::Many &values
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START);
 
   Cubit::Many temp;
 
-  ACE_UNUSED_ARG (env);
   temp.o = values.o * values.o * values.o;
   temp.s = values.s * values.s * values.s;
   temp.l = values.l * values.l * values.l;
@@ -238,15 +234,14 @@ Cubit_i::cube_struct (const Cubit::Many &values,
 // Cube a union
 
 Cubit::oneof
-Cubit_i::cube_union (const Cubit::oneof &values,
-                     CORBA::Environment &env)
+Cubit_i::cube_union (const Cubit::oneof &values
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START);
 
   Cubit::oneof temp;
 
-  ACE_UNUSED_ARG (env);
   switch (values._d ())
     {
     case Cubit::e_0th:
@@ -273,8 +268,8 @@ Cubit_i::cube_union (const Cubit::oneof &values,
 // Cube a sequence
 void
 Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
-                             Cubit::long_seq_out output,
-                             CORBA::Environment &)
+                             Cubit::long_seq_out output
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -300,8 +295,8 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 // Cube an octet sequence
 void
 Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
-                              Cubit::octet_seq_out output,
-                              CORBA::Environment &)
+                              Cubit::octet_seq_out output
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START);
@@ -341,8 +336,8 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 
 void
 Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
-                             Cubit::many_seq_out output,
-                             CORBA::Environment &)
+                             Cubit::many_seq_out output
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START);
@@ -375,8 +370,8 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 
 void
 Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
-                        Cubit::RtiPacket_out output,
-                        CORBA::Environment &)
+                        Cubit::RtiPacket_out output
+                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -407,13 +402,12 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
 // Cube a long contained in an any
 
 CORBA::Any *
-Cubit_i::cube_any (const CORBA::Any & any,
-                   CORBA::Environment &env)
+Cubit_i::cube_any (const CORBA::Any & any
+                   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_START);
 
-  ACE_UNUSED_ARG (env);
   CORBA::Long l;
   any >>= l;
   l = l * l * l;
@@ -425,14 +419,13 @@ Cubit_i::cube_any (const CORBA::Any & any,
 // Cube a struct contained in an any
 
 CORBA::Any *
-Cubit_i::cube_any_struct (const CORBA::Any & any,
-                          CORBA::Environment &env)
+Cubit_i::cube_any_struct (const CORBA::Any & any
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_STRUCT_START);
   Cubit::Many * arg_struct;
   Cubit::Many ret_struct;
-  ACE_UNUSED_ARG (env);
   any >>= arg_struct;
 
   ret_struct.o = arg_struct->o * arg_struct->o * arg_struct->o;
@@ -446,7 +439,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any,
 
 // Shutdown.
 
-void Cubit_i::shutdown (CORBA::Environment &)
+void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 06245519b80..454be029601 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -37,77 +37,77 @@ public:
   ~Cubit_i (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns the default POA for this servant.
 
-  virtual void cube_oneway (CORBA::Environment &env)
+  virtual void cube_oneway (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a oneway call.
 
-  virtual void cube_void (CORBA::Environment &env)
+  virtual void cube_void (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a twoway call.
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env)
+  virtual CORBA::Octet cube_octet (CORBA::Octet o
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet
 
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env)
+  virtual CORBA::Short cube_short (CORBA::Short s
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a short
 
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env)
+  virtual CORBA::Long cube_long (CORBA::Long l
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env)
+  virtual Cubit::Many cube_struct (const Cubit::Many &values
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct.
 
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values,
-                                   CORBA::Environment &env)
+  virtual Cubit::oneof cube_union (const Cubit::oneof &values
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
-                                   Cubit::long_seq_out output,
-                                   CORBA::Environment &env)
+                                   Cubit::long_seq_out output
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
-                                    Cubit::octet_seq_out output,
-                                    CORBA::Environment &_env)
+                                    Cubit::octet_seq_out output
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
-                                   Cubit::many_seq_out output,
-                                   CORBA::Environment &_tao_environment)
+                                   Cubit::many_seq_out output
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an Many sequence.
 
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
-                              Cubit::RtiPacket_out output,
-                              CORBA::Environment &env)
+                              Cubit::RtiPacket_out output
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
-  virtual CORBA::Any * cube_any (const CORBA::Any & any,
-                                CORBA::Environment &env)
+  virtual CORBA::Any * cube_any (const CORBA::Any & any
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long in an any
 
-  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any,
-                                       CORBA::Environment &env)
+  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct in an any
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown routine.
 
@@ -135,7 +135,7 @@ public:
   ~Cubit_Factory_i (void);
   // Destructor.
 
-  virtual Cubit_ptr make_cubit (CORBA::Environment &env)
+  virtual Cubit_ptr make_cubit (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make a cubit object.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index ece59a9223c..bd4b767c5a4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -43,15 +43,15 @@ svr_worker (void *arg)
   ACE_TRY_NEW_ENV
     {
       int result = cubit_server.init (args.argc (),
-                                      args.argv (),
-                                      ACE_TRY_ENV);
+                                      args.argv ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
         return (void *) 1;
 
       barrier->server_init_.wait ();
-      cubit_server.run (ACE_TRY_ENV);
+      cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       barrier->client_fini_.wait ();
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index 9279da7ee3a..af690c0ace4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -46,13 +46,13 @@ main (int argc, char *argv[])
               "\n\tIDL_Cubit: server\n\n"));
   ACE_TRY_NEW_ENV
     {
-      int ret = cubit_server.init (argc, argv, ACE_TRY_ENV);
+      int ret = cubit_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret == -1)
         return -1;
 
-      cubit_server.run (ACE_TRY_ENV);
+      cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 8b5ea0b0310..1105a5a099c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -64,14 +64,14 @@ Cubit_Task::svc (void)
                        "Create Servants failed.\n"),
                       -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       GLOBALS::instance ()->barrier_->wait ();
 
       // Handle requests for this object until we're killed, or one of
       // the methods asks us to exit.
-      int r = this->orb_manager_.run (ACE_TRY_ENV);
+      int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
@@ -84,7 +84,7 @@ Cubit_Task::svc (void)
       CORBA::ORB_var orb =
         this->orb_manager_.orb ();
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -105,7 +105,7 @@ Cubit_Task::svc (void)
 int
 Cubit_Task::initialize_orb (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       ACE_ARGV args (this->orbargs_);
@@ -121,8 +121,8 @@ Cubit_Task::initialize_orb (void)
       int r = this->orb_manager_.init_child_poa (argc,
                                                  argv,
                                                  "persistent_poa",
-                                                 orb_name,
-                                                 ACE_TRY_ENV);
+                                                 orb_name
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return -1;
@@ -166,23 +166,23 @@ Cubit_Task::get_servant_ior (u_int index)
 int
 Cubit_Task::create_servants (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       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;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var manager =
-        poa->the_POAManager(ACE_TRY_ENV);
+        poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      manager->activate(ACE_TRY_ENV);
+      manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the array of cubit implementations.
@@ -232,13 +232,13 @@ Cubit_Task::create_servants (void)
           // some client.  Then release the object.
 
           Cubit_var cubit =
-            this->servants_[i]->_this (ACE_TRY_ENV);
+            this->servants_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
           CORBA::String_var str =
-            this->orb_->object_to_string (cubit.in (),
-                                          ACE_TRY_ENV);
+            this->orb_->object_to_string (cubit.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->servants_iors_[i] =
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 770718a9684..8235905755c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -553,7 +553,7 @@ Client::find_frequency (void)
 }
 
 CORBA::ORB_ptr
-Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
+Client::init_orb (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "I'm thread %t\n"));
@@ -582,8 +582,8 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
   ACE_OS::sprintf (orbid, "orb:%d", this->id_);
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        orbid,
-                                        ACE_TRY_ENV);
+                                        orbid
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   if (this->id_ == 0)
@@ -613,7 +613,7 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
+Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL)
 {
   char *my_ior =
     this->ts_->use_utilization_test_ == 1
@@ -632,8 +632,8 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
                       -1);
 
   CORBA::Object_var objref =
-    orb->string_to_object (my_ior,
-                           ACE_TRY_ENV);
+    orb->string_to_object (my_ior
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (objref.in ()))
@@ -643,8 +643,8 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
 
   // Narrow the CORBA::Object reference to the stub object,
   // checking the type along the way using _is_a.
-  this->cubit_ = Cubit::_narrow (objref.in (),
-                                 ACE_TRY_ENV);
+  this->cubit_ = Cubit::_narrow (objref.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->cubit_))
@@ -656,8 +656,8 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
               "(%t) Binding succeeded\n"));
 
   CORBA::String_var str =
-    orb->object_to_string (this->cubit_,
-                           ACE_TRY_ENV);
+    orb->object_to_string (this->cubit_
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -670,18 +670,18 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
 int
 Client::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = this->init_orb (ACE_TRY_ENV);
+      CORBA::ORB_var orb = this->init_orb (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Find the frequency of CORBA requests based on thread id.
       this->find_frequency ();
 
       // Get the cubit object from the file.
-      int r = this->get_cubit (orb.in (), ACE_TRY_ENV);
+      int r = this->get_cubit (orb.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r != 0)
         return r;
@@ -716,14 +716,14 @@ Client::svc (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%t) CALLING SHUTDOWN() ON THE SERVANT\n"));
-          this->cubit_->shutdown (ACE_TRY_ENV);
+          this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       CORBA::release (this->cubit_);
       this->cubit_ = 0;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -746,7 +746,7 @@ Client::svc (void)
 int
 Client::cube_octet (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -757,11 +757,11 @@ Client::cube_octet (void)
       START_QUANTIFY;
 
       if (this->ts_->use_utilization_test_ == 1 && this->ts_->remote_invocations_ == 0)
-        ret_octet = this->cubit_impl_.cube_octet (arg_octet,
-                                                  ACE_TRY_ENV);
+        ret_octet = this->cubit_impl_.cube_octet (arg_octet
+                                                  TAO_ENV_ARG_PARAMETER);
       else
-        ret_octet = this->cubit_->cube_octet (arg_octet,
-                                              ACE_TRY_ENV);
+        ret_octet = this->cubit_->cube_octet (arg_octet
+                                              TAO_ENV_ARG_PARAMETER);
 
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
@@ -792,7 +792,7 @@ Client::cube_octet (void)
 int
 Client::cube_short (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -801,8 +801,8 @@ Client::cube_short (void)
       CORBA::Short ret_short;
 
       START_QUANTIFY;
-      ret_short = this->cubit_->cube_short (arg_short,
-                                            ACE_TRY_ENV);
+      ret_short = this->cubit_->cube_short (arg_short
+                                            TAO_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
       arg_short = arg_short * arg_short * arg_short;
@@ -829,7 +829,7 @@ Client::cube_short (void)
 int
 Client::cube_long (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -838,8 +838,8 @@ Client::cube_long (void)
       CORBA::Long ret_long;
 
       START_QUANTIFY;
-      ret_long = this->cubit_->cube_long (arg_long,
-                                          ACE_TRY_ENV);
+      ret_long = this->cubit_->cube_long (arg_long
+                                          TAO_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
 
@@ -866,7 +866,7 @@ Client::cube_long (void)
 int
 Client::cube_struct (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       Cubit::Many arg_struct;
@@ -879,8 +879,8 @@ Client::cube_struct (void)
       arg_struct.o = func (this->num_);
 
       START_QUANTIFY;
-      ret_struct = this->cubit_->cube_struct (arg_struct,
-                                              ACE_TRY_ENV);
+      ret_struct = this->cubit_->cube_struct (arg_struct
+                                              TAO_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
 
@@ -940,12 +940,12 @@ Client::make_request (void)
     }
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           this->call_count_++;
           START_QUANTIFY;
-          this->cubit_->noop (ACE_TRY_ENV);
+          this->cubit_->noop (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           STOP_QUANTIFY;
         }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 4472daab77c..554ad87b619 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -279,14 +279,14 @@ public:
   // cubed.
 
 private:
-  CORBA::ORB_ptr init_orb (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ORB_ptr init_orb (TAO_ENV_SINGLE_ARG_DECL);
   // initialize the ORB.
 
   void read_ior (void);
   // reads the cubit ior from a file.
 
-  int get_cubit (CORBA::ORB_ptr orb,
-                 CORBA::Environment &ACE_TRY_ENV);
+  int get_cubit (CORBA::ORB_ptr orb
+                 TAO_ENV_ARG_DECL);
   // gets the cubit object.
 
   int run_tests (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index f27c6c029f9..8de8568c427 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -18,32 +18,32 @@ Cubit_i::~Cubit_i (void)
 }
 
 CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &)
+Cubit_i::cube_octet (CORBA::Octet o
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Octet) (o * o * o);
 }
 
 CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &)
+Cubit_i::cube_short (CORBA::Short s
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Short) (s * s * s);
 }
 
 CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &)
+Cubit_i::cube_long (CORBA::Long l
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Long) (l * l * l);
 }
 
 Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &)
+Cubit_i::cube_struct (const Cubit::Many &values
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Cubit::Many out_values;
@@ -56,13 +56,13 @@ Cubit_i::cube_struct (const Cubit::Many &values,
 }
 
 void
-Cubit_i::noop (CORBA::Environment &)
+Cubit_i::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // does nothing.
 }
 
-void Cubit_i::shutdown (CORBA::Environment &)
+void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -71,7 +71,7 @@ void Cubit_i::shutdown (CORBA::Environment &)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (CORBA::Environment &)
+Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index 1c8f2cad34d..bc65208821d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -29,30 +29,30 @@ public:
            PortableServer::POA_ptr poa);
   ~Cubit_i (void);
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env)
+  virtual CORBA::Octet cube_octet (CORBA::Octet o
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env)
+  virtual CORBA::Short cube_short (CORBA::Short s
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env)
+  virtual CORBA::Long cube_long (CORBA::Long l
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env)
+  virtual Cubit::Many cube_struct (const Cubit::Many &values
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void noop (CORBA::Environment &env)
+  virtual void noop (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableServer::POA_ptr
-      _default_POA (CORBA::Environment &ACE_TRY_ENV);
+      _default_POA (TAO_ENV_SINGLE_ARG_DECL);
   // The default POA
 
 protected:
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.cpp b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
index 8d780f15724..c211bfe9bc6 100644
--- a/TAO/performance-tests/DII_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.h b/TAO/performance-tests/DII_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/DII_Latency/Roundtrip.h
+++ b/TAO/performance-tests/DII_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/DII_Latency/client.cpp b/TAO/performance-tests/DII_Latency/client.cpp
index e5161b45f1f..482e58c9e40 100644
--- a/TAO/performance-tests/DII_Latency/client.cpp
+++ b/TAO/performance-tests/DII_Latency/client.cpp
@@ -82,14 +82,14 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -103,14 +103,14 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULongLong dummy = 0;
           request->add_in_arg("send_time") <<= dummy;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -122,13 +122,13 @@ main (int argc, char *argv[])
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           request->add_in_arg("send_time") <<= start;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -159,10 +159,10 @@ main (int argc, char *argv[])
       if (do_shutdown)
         {
           CORBA::Request_var request =
-            object->_request ("shutdown", ACE_TRY_ENV);
+            object->_request ("shutdown" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
diff --git a/TAO/performance-tests/DII_Latency/server.cpp b/TAO/performance-tests/DII_Latency/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/DII_Latency/server.cpp
+++ b/TAO/performance-tests/DII_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
index c82471f6199..fb1d5cc8570 100644
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
@@ -12,12 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request,
-                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::invoke (CORBA::ServerRequest_ptr request
+                   TAO_ENV_ARG_DECL)
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0, ACE_TRY_ENV);
+      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -26,18 +26,18 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any type_id (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("type_id", type_id, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *arg;
@@ -52,7 +52,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
       CORBA::Any result;
       result <<= CORBA::Any::from_boolean (type_matches);
 
-      request->set_result (result, ACE_TRY_ENV);
+      request->set_result (result TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -61,21 +61,21 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any send_time (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("send_time", send_time, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->set_result (*(nv->value ()), ACE_TRY_ENV);
+      request->set_result (*(nv->value ()) TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -84,14 +84,14 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   CORBA::Any bad_operation;
   CORBA::BAD_OPERATION exception;
   bad_operation <<= exception;
-  request->set_exception (bad_operation, ACE_TRY_ENV);
+  request->set_exception (bad_operation TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::RepositoryId
 Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr,
-                               CORBA::Environment &)
+                               PortableServer::POA_ptr
+                               TAO_ENV_ARG_DECL_NOT_USED)
 {
   return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
 }
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.h b/TAO/performance-tests/DSI_Latency/Roundtrip.h
index 443773bc9ef..563cf2cd1e7 100644
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.h
+++ b/TAO/performance-tests/DSI_Latency/Roundtrip.h
@@ -27,12 +27,12 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV);
+  virtual void invoke (CORBA::ServerRequest_ptr request
+                       TAO_ENV_ARG_DECL);
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa,
-      CORBA_Environment &ACE_TRY_ENV);
+      PortableServer::POA_ptr poa
+      TAO_ENV_ARG_DECL);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/DSI_Latency/client.cpp b/TAO/performance-tests/DSI_Latency/client.cpp
index 30c10985240..482ba2f894c 100644
--- a/TAO/performance-tests/DSI_Latency/client.cpp
+++ b/TAO/performance-tests/DSI_Latency/client.cpp
@@ -82,18 +82,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -148,7 +148,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/DSI_Latency/server.cpp b/TAO/performance-tests/DSI_Latency/server.cpp
index b9a151045c4..3cf93d52143 100644
--- a/TAO/performance-tests/DSI_Latency/server.cpp
+++ b/TAO/performance-tests/DSI_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,17 +94,17 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (roundtrip_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (oid.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -117,18 +117,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.h b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Deferred_Latency/client.cpp b/TAO/performance-tests/Deferred_Latency/client.cpp
index aee7b04814c..a2ee46b8d11 100644
--- a/TAO/performance-tests/Deferred_Latency/client.cpp
+++ b/TAO/performance-tests/Deferred_Latency/client.cpp
@@ -93,18 +93,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -138,20 +138,20 @@ main (int argc, char *argv[])
               CORBA::ULongLong start = ACE_OS::gethrtime ();
 
               request[j] =
-                roundtrip->_request ("test_method",
-                                     ACE_TRY_ENV);
+                roundtrip->_request ("test_method"
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               request[j]->add_in_arg () <<= start;
               request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-              request[j]->send_deferred (ACE_TRY_ENV);
+              request[j]->send_deferred (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           for (j = 0; j != burst; ++j)
             {
-              request[j]->get_response (ACE_TRY_ENV);
+              request[j]->get_response (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::ULongLong retval;
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Deferred_Latency/server.cpp b/TAO/performance-tests/Deferred_Latency/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Deferred_Latency/server.cpp
+++ b/TAO/performance-tests/Deferred_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index 7ce0d3fface..3b5956fa0ef 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index d4b20578bb9..896ac02f08d 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -23,8 +23,8 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 }
 
 void
-Roundtrip_Handler::test_method (Test::Timestamp send_time,
-                                CORBA::Environment &)
+Roundtrip_Handler::test_method (Test::Timestamp send_time
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->pending_callbacks_--;
@@ -34,14 +34,14 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       this->pending_callbacks_--;
-      holder->raise_test_method (ACE_TRY_ENV);
+      holder->raise_test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -52,19 +52,19 @@ Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
 }
 
 void
-Roundtrip_Handler::shutdown (CORBA::Environment &)
+Roundtrip_Handler::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_TRY_ENV);
+      holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index e25fc22c03c..3475d61f1df 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -32,17 +32,17 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time,
-                            CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method (Test::Timestamp send_time
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                  CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index b70854b9e5c..b706de3e081 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -74,11 +74,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -87,22 +87,22 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -127,10 +127,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
 
       Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_TRY_ENV);
+        roundtrip_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
@@ -139,11 +139,11 @@ main (int argc, char *argv[])
         {
           // Invoke asynchronous operation....
           roundtrip->sendc_test_method (roundtrip_handler.in (),
-                                        ACE_OS::gethrtime (),
-                                        ACE_TRY_ENV);
+                                        ACE_OS::gethrtime ()
+                                        TAO_ENV_ARG_PARAMETER);
 
           ACE_Time_Value tv (0, 20000);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -159,13 +159,13 @@ main (int argc, char *argv[])
                                              test_end - test_start,
                                              niterations);
 
-      roundtrip->shutdown (ACE_TRY_ENV);
+      roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp
index a332a8d6932..b2e88f6c0e6 100644
--- a/TAO/performance-tests/Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Latency/AMI/server.cpp
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -88,11 +88,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -105,11 +105,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -122,7 +122,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in ());
@@ -138,10 +138,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index 8d780f15724..c211bfe9bc6 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index e5161b45f1f..482e58c9e40 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -82,14 +82,14 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -103,14 +103,14 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULongLong dummy = 0;
           request->add_in_arg("send_time") <<= dummy;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -122,13 +122,13 @@ main (int argc, char *argv[])
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           request->add_in_arg("send_time") <<= start;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -159,10 +159,10 @@ main (int argc, char *argv[])
       if (do_shutdown)
         {
           CORBA::Request_var request =
-            object->_request ("shutdown", ACE_TRY_ENV);
+            object->_request ("shutdown" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Latency/DII/server.cpp
+++ b/TAO/performance-tests/Latency/DII/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
index c82471f6199..fb1d5cc8570 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -12,12 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request,
-                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::invoke (CORBA::ServerRequest_ptr request
+                   TAO_ENV_ARG_DECL)
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0, ACE_TRY_ENV);
+      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -26,18 +26,18 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any type_id (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("type_id", type_id, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *arg;
@@ -52,7 +52,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
       CORBA::Any result;
       result <<= CORBA::Any::from_boolean (type_matches);
 
-      request->set_result (result, ACE_TRY_ENV);
+      request->set_result (result TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -61,21 +61,21 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any send_time (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("send_time", send_time, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->set_result (*(nv->value ()), ACE_TRY_ENV);
+      request->set_result (*(nv->value ()) TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -84,14 +84,14 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   CORBA::Any bad_operation;
   CORBA::BAD_OPERATION exception;
   bad_operation <<= exception;
-  request->set_exception (bad_operation, ACE_TRY_ENV);
+  request->set_exception (bad_operation TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::RepositoryId
 Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr,
-                               CORBA::Environment &)
+                               PortableServer::POA_ptr
+                               TAO_ENV_ARG_DECL_NOT_USED)
 {
   return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
 }
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.h b/TAO/performance-tests/Latency/DSI/Roundtrip.h
index 443773bc9ef..563cf2cd1e7 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.h
@@ -27,12 +27,12 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV);
+  virtual void invoke (CORBA::ServerRequest_ptr request
+                       TAO_ENV_ARG_DECL);
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa,
-      CORBA_Environment &ACE_TRY_ENV);
+      PortableServer::POA_ptr poa
+      TAO_ENV_ARG_DECL);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index 30c10985240..482ba2f894c 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -82,18 +82,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -148,7 +148,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp
index b9a151045c4..3cf93d52143 100644
--- a/TAO/performance-tests/Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Latency/DSI/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,17 +94,17 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (roundtrip_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (oid.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -117,18 +117,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index aee7b04814c..a2ee46b8d11 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -93,18 +93,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -138,20 +138,20 @@ main (int argc, char *argv[])
               CORBA::ULongLong start = ACE_OS::gethrtime ();
 
               request[j] =
-                roundtrip->_request ("test_method",
-                                     ACE_TRY_ENV);
+                roundtrip->_request ("test_method"
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               request[j]->add_in_arg () <<= start;
               request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-              request[j]->send_deferred (ACE_TRY_ENV);
+              request[j]->send_deferred (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           for (j = 0; j != burst; ++j)
             {
-              request[j]->get_response (ACE_TRY_ENV);
+              request[j]->get_response (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::ULongLong retval;
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Latency/Deferred/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index b89b3efb533..976dfc67a00 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -83,18 +83,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index 3271329b0db..ee32b19f696 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index 76f101734c9..eb8e866becc 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index 896f685f99d..a38a0fe51b4 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
index 912b380725a..00e272a02fa 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index 8f88421e8a0..97f1ef0a50b 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index 01a2dce839d..0337e54c34f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index a522c394b8c..f3ef1a10bd1 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
index 503d226a4c7..7090cfdf18e 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
@@ -65,11 +65,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -78,11 +78,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -95,11 +95,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker_Thread worker (orb.in ());
@@ -122,10 +122,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 793e0ca8e70..46b6edd2b4b 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -74,8 +74,8 @@ set_rt_scheduling (void)
 
 void
 object_creation_test (PortableServer::POA_ptr poa,
-                      int create_reference_with_id,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      int create_reference_with_id
+                      TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nCreating %d object references with %s\n",
@@ -101,15 +101,15 @@ object_creation_test (PortableServer::POA_ptr poa,
         {
           object =
             poa->create_reference_with_id (oid.in (),
-                                           "IDL:Test/Simple:1.0",
-                                           ACE_TRY_ENV);
+                                           "IDL:Test/Simple:1.0"
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
           object =
-            poa->create_reference ("IDL:Test/Simple:1.0",
-                                   ACE_TRY_ENV);
+            poa->create_reference ("IDL:Test/Simple:1.0"
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -135,13 +135,13 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "",
-                         ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -150,15 +150,15 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -167,33 +167,33 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("TestPOA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       object_creation_test (root_poa.in (),
-                            0, // POA::create_reference
-                            ACE_TRY_ENV);
+                            0  // POA::create_reference
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object_creation_test (child_poa.in (),
-                            1, // POA::create_reference_with_id
-                            ACE_TRY_ENV);
+                            1  // POA::create_reference_with_id
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index b657312df7b..22f2bd9048f 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -33,13 +33,13 @@ main (int argc, char *argv [])
 
   ACE_TRY_NEW_ENV;
     {
-      int r = demux_test_client.init (argc, argv,
-                                      ACE_TRY_ENV);
+      int r = demux_test_client.init (argc, argv
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return -1;
 
-      demux_test_client.run (ACE_TRY_ENV);
+      demux_test_client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 87c64e773a7..cd69c06c803 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -44,8 +44,8 @@ Demux_Test_Client::~Demux_Test_Client (void)
 //
 
 int
-Demux_Test_Client::init (int argc, char *argv [],
-                         CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Client::init (int argc, char *argv []
+                         TAO_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -55,7 +55,7 @@ Demux_Test_Client::init (int argc, char *argv [],
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_ORB);
     }
   ACE_CATCHANY
@@ -101,14 +101,14 @@ Demux_Test_Client::init (int argc, char *argv [],
         // Get the IOR and output it to the file
         ACE_TRY_EX (IOR)
           {
-            CORBA::Object_var objref = this->orb_->string_to_object (str,
-                                                                     ACE_TRY_ENV);
+            CORBA::Object_var objref = this->orb_->string_to_object (str
+                                                                     TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (IOR);
 
             // now narrow to Demux_Test object
 
-            this->demux_test_[i][j] = Demux_Test::_narrow (objref.in (),
-                                                           ACE_TRY_ENV);
+            this->demux_test_[i][j] = Demux_Test::_narrow (objref.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
 
             ACE_TRY_CHECK_EX (IOR);
 
@@ -252,7 +252,7 @@ Demux_Test_Client::parse_args (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   // open a temporary results file
   if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -267,19 +267,19 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
       switch (this->is_)
         {
         case Demux_Test_Client::LINEAR:
-          (void) this->run_linear_test (ACE_TRY_ENV);
+          (void) this->run_linear_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::RANDOM:
-          (void) this->run_random_test (ACE_TRY_ENV);
+          (void) this->run_random_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::BEST:
-          (void) this->run_best_test (ACE_TRY_ENV);
+          (void) this->run_best_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::WORST:
-          (void) this->run_worst_test (ACE_TRY_ENV);
+          (void) this->run_worst_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         }
@@ -301,7 +301,7 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
   ACE_TRY_EX (SHUTDOWN)
     {
       // call the shutdown method one the first object
-      this->demux_test_[0][0]->shutdown (ACE_TRY_ENV);
+      this->demux_test_[0][0]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SHUTDOWN);
     }
   ACE_CATCHANY
@@ -329,7 +329,7 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Demux_Test_Client::run_linear_test (CORBA::Environment &env)
+Demux_Test_Client::run_linear_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong j, k, l, m;
   ACE_hrtime_t start, end;
@@ -342,7 +342,7 @@ Demux_Test_Client::run_linear_test (CORBA::Environment &env)
             start = ACE_OS::gethrtime ();
 
             // invoke the method
-            this->op_db_[l].op_ (this->demux_test_[j][k].in (), env);
+            this->op_db_[l].op_ (this->demux_test_[j][k].in () TAO_ENV_ARG_PARAMETER);
 
             end = ACE_OS::gethrtime ();
 
@@ -355,7 +355,7 @@ Demux_Test_Client::run_linear_test (CORBA::Environment &env)
 }
 
 int
-Demux_Test_Client::run_random_test (CORBA::Environment &)
+Demux_Test_Client::run_random_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Random test\n"));
@@ -363,7 +363,7 @@ Demux_Test_Client::run_random_test (CORBA::Environment &)
 }
 
 int
-Demux_Test_Client::run_best_test (CORBA::Environment &)
+Demux_Test_Client::run_best_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Best Test\n"));
@@ -371,7 +371,7 @@ Demux_Test_Client::run_best_test (CORBA::Environment &)
 }
 
 int
-Demux_Test_Client::run_worst_test (CORBA::Environment &)
+Demux_Test_Client::run_worst_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Worst test\n"));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index 767f28c1a60..a6ed4afce27 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -38,7 +38,7 @@ public:
     WORST
   };
 
-  typedef void (*OP_PTR) (Demux_Test_ptr, CORBA::Environment &);
+  typedef void (*OP_PTR) (Demux_Test_ptr TAO_ENV_ARG_DECL_NOT_USED);
 
   struct Operation_DB_Entry
   {
@@ -51,12 +51,10 @@ public:
   ~Demux_Test_Client (void);
   // DTOR
 
-  int init (int argc, char *argv [], CORBA::Environment &env
-            = CORBA::Environment::default_environment ());
+  int init (int argc, char *argv [] TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // initialize the client test bed
 
-  int run (CORBA::Environment &env
-           = CORBA::Environment::default_environment ());
+  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run the tests
 
 private:
@@ -67,20 +65,16 @@ private:
   int init_operation_db (void);
   // initialize the operation database
 
-  int run_linear_test (CORBA::Environment &env
-                       = CORBA::Environment::default_environment ());
+  int run_linear_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run linear strategy
 
-  int run_random_test (CORBA::Environment &env
-                       = CORBA::Environment::default_environment ());
+  int run_random_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run random strategy
 
-  int run_best_test (CORBA::Environment &env
-                     = CORBA::Environment::default_environment ());
+  int run_best_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run best strategy (w.r.t to linear)
 
-  int run_worst_test (CORBA::Environment &env
-                      = CORBA::Environment::default_environment ());
+  int run_worst_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run worst strategy (w.r.t to linear)
 
   int print_results (void);
@@ -121,9 +115,9 @@ private:
 
   CORBA::ULong step_;
   // Step for the no. of objects to be skipped while making remote calls
-  // on the given no. of objects. 
+  // on the given no. of objects.
   // If the step is 100, a call will be made to every 100th Object.
-  
+
   Operation_DB_Entry op_db_[TAO_DEMUX_TEST_MAX_OPS];
   // database of operations
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.i b/TAO/performance-tests/POA/Demux/demux_test_client.i
index e1788341625..9a113cb2f85 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.i
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.i
@@ -1,14 +1,14 @@
 //$Id$
-static void M302 (Demux_Test_ptr objref, 
-                CORBA::Environment &env)
+static void M302 (Demux_Test_ptr objref
+                  TAO_ENV_ARG_DECL)
 {
-  objref->M302 (env);
+  objref->M302 (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-static void shutdown (Demux_Test_ptr objref, 
-                CORBA::Environment &env)
+static void shutdown (Demux_Test_ptr objref
+                      TAO_ENV_ARG_DECL)
 {
-  objref->shutdown (env);
+  objref->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int Demux_Test_Client::init_operation_db (void)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 821f2bd00e4..eeb3430c372 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -45,8 +45,8 @@ Demux_Test_Server::~Demux_Test_Server (void)
 //
 
 int
-Demux_Test_Server::init (int argc, char *argv [],
-                         CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Server::init (int argc, char *argv []
+                         TAO_ENV_ARG_DECL)
 {
   printf ("here\n");
 
@@ -58,7 +58,7 @@ Demux_Test_Server::init (int argc, char *argv [],
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GET_ORB);
     }
   ACE_CATCHANY
@@ -77,8 +77,8 @@ Demux_Test_Server::init (int argc, char *argv [],
       // Get the Root POA
 
       temp =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GET_ROOT_POA);
       if (CORBA::is_nil (temp.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -86,8 +86,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                           1);
 
       this->root_poa_ =
-        PortableServer::POA::_narrow (temp.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (temp.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_ROOT_POA);
     }
   ACE_CATCHANY
@@ -104,7 +104,7 @@ Demux_Test_Server::init (int argc, char *argv [],
     {
 
       this->poa_mgr_ =
-        this->root_poa_->the_POAManager (ACE_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_POA_MGR);
     }
   ACE_CATCHANY
@@ -146,8 +146,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the USER_ID policy ... \n"));
 
           policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                          ACE_TRY_ENV);
+            this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
+                                                          TAO_ENV_ARG_PARAMETER);
         }
       else
         {
@@ -155,8 +155,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the SYSTEM_ID policy ... \n"));
 
           policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID,
-                                                          ACE_TRY_ENV);
+            this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID
+                                                          TAO_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK_EX (POLICY);
@@ -168,8 +168,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the TRANSIENT Lifespan policy for the POAs\n"));
 
           policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT,
-                                                     ACE_TRY_ENV);
+            this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT
+                                                     TAO_ENV_ARG_PARAMETER);
         }
       else
         {
@@ -177,8 +177,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the PERSISTENT Lifespan policy for the POAs\n"));
 
           policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                     ACE_TRY_ENV);
+            this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                                     TAO_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK_EX (POLICY);
@@ -229,8 +229,8 @@ Demux_Test_Server::init (int argc, char *argv [],
         {
           this->child_poa_[i] = prev_poa->create_POA (poa_name,
                                                       this->poa_mgr_.in (),
-                                                      policies,
-                                                      ACE_TRY_ENV);
+                                                      policies
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (CREATE_POA);
         }
       ACE_CATCHANY
@@ -257,8 +257,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                                   -1);
 
                   //id = this->child_poa_[i]->activate_object (&this->demux_test_[j],
-                  id = this->child_poa_[i]->activate_object (demux_test_i_ptr,
-                                                             ACE_TRY_ENV);
+                  id = this->child_poa_[i]->activate_object (demux_test_i_ptr
+                                                             TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (ACTIVATE_OBJ);
                 }
               ACE_CATCHANY
@@ -273,12 +273,12 @@ Demux_Test_Server::init (int argc, char *argv [],
               // Get the IOR and output it to the file
               ACE_TRY_EX (IOR)
                 {
-                  CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in (),
-                                                                                      ACE_TRY_ENV);
+                  CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in ()
+                                                                                      TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (IOR);
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in (), ACE_TRY_ENV);
+                    (demux_var.in () TAO_ENV_ARG_PARAMETER);
 
                   ACE_TRY_CHECK_EX (IOR);
 
@@ -318,17 +318,17 @@ Demux_Test_Server::init (int argc, char *argv [],
                     PortableServer::string_to_ObjectId (servant_name);
 
                   this->child_poa_[i]->activate_object_with_id (oid.in (),
-                                                                demux_test_i_ptr,
-                                                                ACE_TRY_ENV);
+                                                                demux_test_i_ptr
+                                                                TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   // Get Object reference for demux_test_i impl object.
-                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (ACE_TRY_ENV);
+                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
                   ACE_TRY_CHECK;
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in (), ACE_TRY_ENV);
+                    (demux_var.in () TAO_ENV_ARG_PARAMETER);
 
                   ACE_TRY_CHECK;
 
@@ -359,7 +359,7 @@ Demux_Test_Server::init (int argc, char *argv [],
 
   ACE_TRY_EX (ACTIVATE)
     {
-      this->poa_mgr_->activate (ACE_TRY_ENV);
+      this->poa_mgr_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK_EX (ACTIVATE);
     }
@@ -468,11 +468,11 @@ Demux_Test_Server::init_naming_service (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index 2fa321e1e00..b0cc927ed31 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -39,10 +39,10 @@ public:
   ~Demux_Test_Server (void);
   // dtor
 
-  int run (CORBA::Environment &);
+  int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Execute client code.
 
-  int init (int argc, char **argv, CORBA::Environment &);
+  int init (int argc, char **argv TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize the communication endpoint with server.
 
   int calculate_avg_latency (void);
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index f8fd3773138..27014a37cff 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -34,13 +34,13 @@ int main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       int r =
-        demux_test_server.init (argc, argv, ACE_TRY_ENV);
+        demux_test_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return -1;
 
-      demux_test_server.run (ACE_TRY_ENV);
+      demux_test_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 4fcf47e544c..88490f1c62e 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -12,7 +12,7 @@ Factory::Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Simple_ptr
-Factory::create_simple_object (CORBA::Environment &ACE_TRY_ENV)
+Factory::create_simple_object (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple *simple_impl;
@@ -23,12 +23,12 @@ Factory::create_simple_object (CORBA::Environment &ACE_TRY_ENV)
 
   PortableServer::ServantBase_var owner_transfer(simple_impl);
 
-  return simple_impl->_this (ACE_TRY_ENV);
+  return simple_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Factory::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index d5d76c835c4..6ff7ad5edb4 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -10,16 +10,16 @@ Simple::Simple (void)
 }
 
 void
-Simple::destroy (CORBA::Environment &ACE_TRY_ENV)
+Simple::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index 0f9a24b6ad3..e667ac7a147 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -80,18 +80,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Factory_var factory =
-        Test::Factory::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Factory::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -116,8 +116,8 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[i] = 
-            factory->create_simple_object (ACE_TRY_ENV);
+          references[i] =
+            factory->create_simple_object (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (ACE_TRY_ENV);
+          references[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          factory->shutdown (ACE_TRY_ENV);
+          factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index 5a2d5ab1793..2a62b297e31 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-i <niterations> "
+                           "-i <niterations> "
                            "-h "
                            "\n",
                            argv [0]),
@@ -72,11 +72,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -85,14 +85,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -118,8 +118,8 @@ main (int argc, char *argv[])
                           1);
           PortableServer::ServantBase_var owner_transfer(simple_impl);
 
-          references[i] = 
-            simple_impl->_this (ACE_TRY_ENV);
+          references[i] =
+            simple_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (ACE_TRY_ENV);
+          references[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -160,10 +160,10 @@ main (int argc, char *argv[])
       destruction.collect_basic_stats (destruction_stats);
       destruction_stats.dump_results ("Destruction", gsf);
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 9ff3bc35c29..6d8fc18cd9c 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -18,14 +18,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -62,11 +62,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(factory_impl);
 
       Test::Factory_var factory =
-        factory_impl->_this (ACE_TRY_ENV);
+        factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (factory.in (), ACE_TRY_ENV);
+        orb->object_to_string (factory.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -109,18 +109,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index fbd12fa1eb4..d6147cbaae3 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -242,8 +242,8 @@ private:
 };
 
 void
-child_poa_testing (PortableServer::POA_ptr root_poa,
-                   CORBA::Environment &ACE_TRY_ENV)
+child_poa_testing (PortableServer::POA_ptr root_poa
+                   TAO_ENV_ARG_DECL)
 {
   // Policies for the child POA.
   CORBA::PolicyList policies (1);
@@ -251,16 +251,16 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 
   // Id Assignment Policy
   policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                           ACE_TRY_ENV);
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the child POA under the RootPOA.
   PortableServer::POA_var child_poa =
     root_poa->create_POA ("child POA",
                           PortableServer::POAManager::_nil (),
-                          policies,
-                          ACE_TRY_ENV);
+                          policies
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create an array of servants
@@ -298,8 +298,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 
         objects[i] =
           child_poa->create_reference_with_id (object_ids[i].in (),
-                                               "IDL:test:1.0",
-                                               ACE_TRY_ENV);
+                                               "IDL:test:1.0"
+                                               TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -313,8 +313,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
     for (i = 0; i < iterations; i++)
       {
         child_poa->activate_object_with_id (object_ids[i].in (),
-                                            &servants[i],
-                                            ACE_TRY_ENV);
+                                            &servants[i]
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -327,8 +327,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 
     for (i = 0; i < iterations; i++)
       {
-        child_poa->deactivate_object (object_ids[i].in (),
-                                      ACE_TRY_ENV);
+        child_poa->deactivate_object (object_ids[i].in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -342,15 +342,15 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -358,14 +358,14 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
+                                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an array of servants
@@ -395,7 +395,7 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            objects[i] = servants[i]._this (ACE_TRY_ENV);
+            objects[i] = servants[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
@@ -407,21 +407,21 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            object_ids[i] = root_poa->servant_to_id (&servants[i],
-                                                     ACE_TRY_ENV);
+            object_ids[i] = root_poa->servant_to_id (&servants[i]
+                                                     TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
 
       // Create the child POA.
-      child_poa_testing (root_poa.in (),
-                         ACE_TRY_ENV);
+      child_poa_testing (root_poa.in ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy RootPOA.
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Cleanup
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 9b504d6fff5..cffa1ac71c4 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -165,12 +165,12 @@ PP_Test_Client::parse_args (void)
 void
 PP_Test_Client::send_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
-      this->objref_->send_oneway (ACE_TRY_ENV);
+      this->objref_->send_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -190,12 +190,12 @@ PP_Test_Client::send_oneway (void)
 void
 PP_Test_Client::send_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
-      this->objref_->send_void (ACE_TRY_ENV);
+      this->objref_->send_void (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -259,7 +259,7 @@ PP_Test_Client::run ()
 int
 PP_Test_Client::shutdown_server (int do_shutdown)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -268,7 +268,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
           ACE_DEBUG ((LM_DEBUG,
                       "shutdown on Pluggable_Test object\n"));
 
-          this->objref_->shutdown (ACE_TRY_ENV);
+          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -290,7 +290,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
 int
 PP_Test_Client::run_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -312,7 +312,7 @@ PP_Test_Client::run_oneway (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (ACE_TRY_ENV);
+          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -333,7 +333,7 @@ PP_Test_Client::run_oneway (void)
 int
 PP_Test_Client::run_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -355,7 +355,7 @@ PP_Test_Client::run_void (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (ACE_TRY_ENV);
+          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -403,8 +403,8 @@ PP_Test_Client::init (int argc, char **argv)
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -421,13 +421,13 @@ PP_Test_Client::init (int argc, char **argv)
         }
 
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (this->factory_key_,
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (this->factory_key_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
-        Pluggable_Test_Factory::_narrow (factory_object.in(),
-                                ACE_TRY_ENV);
+        Pluggable_Test_Factory::_narrow (factory_object.in()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
@@ -444,7 +444,7 @@ PP_Test_Client::init (int argc, char **argv)
       // Now retrieve the Pluggable_Test obj ref corresponding to the key.
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_MAKE_PLUGGABLE_START);
 
-      this->objref_ = this->factory_->make_pluggable_test (ACE_TRY_ENV);
+      this->objref_ = this->factory_->make_pluggable_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->objref_.in ()))
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index 8f91dae07e7..6b223de0f87 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -48,15 +48,15 @@ PP_Test_Server::parse_args (void)
 
 int
 PP_Test_Server::init (int argc,
-                      char** argv,
-                      CORBA::Environment& ACE_TRY_ENV)
+                      char** argv
+                      TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -78,8 +78,8 @@ PP_Test_Server::init (int argc,
 
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
-                                                 this->factory_impl_,
-                                                 ACE_TRY_ENV);
+                                                 this->factory_impl_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -99,9 +99,9 @@ PP_Test_Server::init (int argc,
 }
 
 int
-PP_Test_Server::run (CORBA::Environment& ACE_TRY_ENV)
+PP_Test_Server::run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
 {
-  int result = this->orb_manager_.run (ACE_TRY_ENV);
+  int result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index 31aea34bb9f..4be6dcaf311 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -49,11 +49,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the server state - parsing arguments, etc.
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index 657fce2b66d..99b513899e8 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -15,13 +15,13 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tPluggable_Test: server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       int status = pp_test_server.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
         }
       else
         {
-          pp_test_server.run (ACE_TRY_ENV);
+          pp_test_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index c2aff04156b..3c40536d884 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -11,8 +11,8 @@
 ACE_RCSID(Latency, test_i, "$Id$")
 
 void
-Test_i::test_method (CORBA::Long id,
-                     CORBA::Environment&)
+Test_i::test_method (CORBA::Long id
+                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -22,17 +22,17 @@ Test_i::test_method (CORBA::Long id,
 }
 
 void
-Test_i::shutdown (const char *orb_id,
-                  CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (const char *orb_id
+                  TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         0,
-                                        orb_id,
-                                        ACE_TRY_ENV);
+                                        orb_id
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  orb->shutdown (0, ACE_TRY_ENV);
+  orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index b7bef2f7279..a3d93fa6f2d 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -31,12 +31,12 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Long id,
-                    CORBA::Environment&)
+  void test_method (CORBA::Long id
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (const char *orb_id,
-                 CORBA::Environment&)
+  void shutdown (const char *orb_id
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index cced0e943f0..fc251f64bd0 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -149,13 +149,13 @@ main (int argc, char *argv[])
 
       // Obtain Priority Mapping used by the ORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PriorityMappingManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PriorityMappingManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mapping_manager.in ()))
@@ -260,11 +260,11 @@ Client::svc (void)
                        priorities[this->id_]);
 
       CORBA::Object_var object =
-        orb_->string_to_object (ior, ACE_TRY_ENV);
+        orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -281,12 +281,12 @@ Client::svc (void)
       for (int j = 0; j < 100; ++j)
         {
           /* CORBA::PolicyList_var pols;
-          server->_validate_connection (pols.out (),
-                                        ACE_TRY_ENV);
+          server->_validate_connection (pols.out ()
+                                        TAO_ENV_ARG_PARAMETER);
           */
 
-          server->test_method (this->id_,
-                               ACE_TRY_ENV);
+          server->test_method (this->id_
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -300,8 +300,8 @@ Client::svc (void)
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
           // Invoke method.
-          server->test_method (this->id_,
-                               ACE_TRY_ENV);
+          server->test_method (this->id_
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
@@ -320,7 +320,7 @@ Client::svc (void)
 
       /* char orb_name[50];
       ACE_OS::sprintf (orb_name, "%d", priorities[this->id_]);
-      server->shutdown (orb_name, ACE_TRY_ENV);
+      server->shutdown (orb_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;*/
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index c1349e95874..37c900601af 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
       int argc_ = argc;
       for (int i = 0; i < argc; ++i)
         argv_[i] = argv[i];
-      orb = CORBA::ORB_init (argc_, argv_, "", ACE_TRY_ENV);
+      orb = CORBA::ORB_init (argc_, argv_, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments.
@@ -129,13 +129,13 @@ main (int argc, char *argv[])
 
       // Obtain Priority Mapping used by the ORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PriorityMappingManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PriorityMappingManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mapping_manager.in ()))
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception in Orb per priority server:");
+                           "Caught exception in Orb per priority server:");
       return 1;
     }
   ACE_ENDTRY;
@@ -214,11 +214,11 @@ Server::svc (void)
       char orb_name[64];
       ACE_OS::sprintf (orb_name, "%d", this->priority_);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc_, argv_, orb_name, ACE_TRY_ENV);
+        CORBA::ORB_init (argc_, argv_, orb_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -227,23 +227,23 @@ Server::svc (void)
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (this->server_, ACE_TRY_ENV);
+        root_poa->activate_object (this->server_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        root_poa->id_to_reference (oid.in (), ACE_TRY_ENV);
+        root_poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in (), ACE_TRY_ENV);
+        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -266,10 +266,10 @@ Server::svc (void)
       ACE_OS::fclose (output_file);
 
       // Start orb event loop.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 789d5bf9e11..87606c83135 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -141,18 +141,18 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -164,13 +164,13 @@ main (int argc, char *argv[])
         }
 
       // Obtain Priority Mapping used by the ORB.
-      object = orb->resolve_initial_references ("PriorityMappingManager",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("PriorityMappingManager"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mapping_manager.in ()))
@@ -222,7 +222,7 @@ main (int argc, char *argv[])
         }
       throughput.dump_results ("Aggregated", gsf);
 
-      server->shutdown ("", ACE_TRY_ENV);
+      server->shutdown ("" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -285,12 +285,12 @@ Client::svc (void)
       for (int j = 0; j < 100; ++j)
         {
           /*    CORBA::PolicyList_var pols;
-          server_->_validate_connection (pols.out (),
-                                         ACE_TRY_ENV);
+          server_->_validate_connection (pols.out ()
+                                         TAO_ENV_ARG_PARAMETER);
           */
 
-          server_->test_method (this->id_,
-                                ACE_TRY_ENV);
+          server_->test_method (this->id_
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -304,8 +304,8 @@ Client::svc (void)
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
           // Invoke method.
-          server_->test_method (this->id_,
-                                ACE_TRY_ENV);
+          server_->test_method (this->id_
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index e54dc4d81bf..6c42cd630b2 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -59,11 +59,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -72,11 +72,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -85,11 +85,11 @@ main (int argc, char *argv[])
       Test_i server_impl;
 
       Test_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -107,10 +107,10 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index bf5c8550509..54e8585486f 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -131,8 +131,8 @@ print_params (void)
 }
 
 static void
-twoway_work_test (Test_ptr server,
-                  CORBA::Environment &ACE_TRY_ENV)
+twoway_work_test (Test_ptr server
+                  TAO_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -152,8 +152,8 @@ twoway_work_test (Test_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->twoway_work_test (work,
-                                ACE_TRY_ENV);
+      server->twoway_work_test (work
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -176,8 +176,8 @@ twoway_work_test (Test_ptr server,
 }
 
 static void
-oneway_work_test (Test_ptr server,
-                  CORBA::Environment &ACE_TRY_ENV)
+oneway_work_test (Test_ptr server
+                  TAO_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -197,8 +197,8 @@ oneway_work_test (Test_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->oneway_work_test (work,
-                                ACE_TRY_ENV);
+      server->oneway_work_test (work
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -221,8 +221,8 @@ oneway_work_test (Test_ptr server,
 }
 
 static void
-oneway_payload_test (Test_ptr server,
-                     CORBA::Environment &ACE_TRY_ENV)
+oneway_payload_test (Test_ptr server
+                     TAO_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -245,8 +245,8 @@ oneway_payload_test (Test_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->oneway_payload_test (the_data,
-                                   ACE_TRY_ENV);
+      server->oneway_payload_test (the_data
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -428,8 +428,8 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the command line options.
@@ -441,31 +441,31 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (obj.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj = orb->resolve_initial_references ("PolicyCurrent",
-                                             ACE_TRY_ENV);
+      obj = orb->resolve_initial_references ("PolicyCurrent"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (obj.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
-      obj = orb->string_to_object (ior,
-                                   ACE_TRY_ENV);
+      obj = orb->string_to_object (ior
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test_var server = Test::_narrow (obj.in (),
-                                       ACE_TRY_ENV);
+      Test_var server = Test::_narrow (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print testing parameters.
@@ -474,8 +474,8 @@ main (int argc, char *argv[])
       // Run the test.
       if (test_twoway)
         {
-          twoway_work_test (server.in (),
-                            ACE_TRY_ENV);
+          twoway_work_test (server.in ()
+                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -491,8 +491,8 @@ main (int argc, char *argv[])
           // Set up the sync scope policy.
           sync_scope_policy_list[0] =
             orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                                sync_scope_any,
-                                ACE_TRY_ENV);
+                                sync_scope_any
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           switch (level)
@@ -500,29 +500,29 @@ main (int argc, char *argv[])
             case ORB:
               // Set the sync scope policy at the ORB level.
               policy_manager->set_policy_overrides (sync_scope_policy_list,
-                                                    CORBA::ADD_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
             case THREAD:
               // Set the sync scope policy at the thread level.
               policy_current->set_policy_overrides (sync_scope_policy_list,
-                                                    CORBA::ADD_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
             case OBJECT:
               // Set the sync scope policy at the object level.
               obj = server->_set_policy_overrides (sync_scope_policy_list,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Get the new object reference with the updated policy.
-              server = Test::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+              server = Test::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
@@ -531,7 +531,7 @@ main (int argc, char *argv[])
           }
 
           // We are done with this policy.
-          sync_scope_policy_list[0]->destroy (ACE_TRY_ENV);
+          sync_scope_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Are we buffering the oneway requests?
@@ -554,33 +554,33 @@ main (int argc, char *argv[])
               // Set up the buffering constraint policy.
               buffering_constraint_policy_list[0] =
                 orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                                    buffering_constraint_any,
-                                    ACE_TRY_ENV);
+                                    buffering_constraint_any
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Set up the constraints (at the object level).
               obj = server->_set_policy_overrides (buffering_constraint_policy_list,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // We are done with this policy.
-              buffering_constraint_policy_list[0]->destroy (ACE_TRY_ENV);
+              buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Get the new object reference with the updated policy.
-              server = Test::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+              server = Test::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           // Run the oneway test.
           if (payload_test)
-            oneway_payload_test (server.in (),
-                                 ACE_TRY_ENV);
+            oneway_payload_test (server.in ()
+                                 TAO_ENV_ARG_PARAMETER);
           else
-            oneway_work_test (server.in (),
-                              ACE_TRY_ENV);
+            oneway_work_test (server.in ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -589,7 +589,7 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,
                       "\nShutting down server\n"));
 
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -599,7 +599,7 @@ main (int argc, char *argv[])
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index d6600543687..6e6af098253 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -59,8 +59,8 @@ set_rt_mode (void)
         }
       else
         ACE_ERROR ((LM_ERROR,
-		    "client (%P|%t): sched_params failed %p\n",
-		    "set_rt_mode"));
+                    "client (%P|%t): sched_params failed %p\n",
+                    "set_rt_mode"));
     }
 
   // Get our thread handle.
@@ -70,8 +70,8 @@ set_rt_mode (void)
   // Set our thread priority.
   if (ACE_OS::thr_setprio (self, priority) != 0)
     ACE_ERROR ((LM_ERROR,
-		"server (%P|%t):thr_setprio failed %p\n",
-		"set_rt_mode"));
+                "server (%P|%t):thr_setprio failed %p\n",
+                "set_rt_mode"));
 
   // Do a sanity check.
   if (ACE_OS::thr_getprio (self, priority) == 0)
@@ -94,8 +94,8 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the command line options.
@@ -107,28 +107,28 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i server_impl (orb.in ());
 
       Test_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -149,17 +149,17 @@ main (int argc, char *argv[])
 
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 7b768d0ea90..17c0cfa9726 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -10,8 +10,8 @@ ACE_RCSID(Reliable, test_i, "$Id$")
 #endif /* __ACE_INLINE__ */
 
 void
-Test_i::oneway_work_test (CORBA::ULong work,
-                          CORBA::Environment &)
+Test_i::oneway_work_test (CORBA::ULong work
+                          TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -24,15 +24,15 @@ Test_i::oneway_work_test (CORBA::ULong work,
 }
 
 void
-Test_i::oneway_payload_test (const Test::data &,
-                             CORBA::Environment &)
+Test_i::oneway_payload_test (const Test::data &
+                             TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Test_i::twoway_work_test (CORBA::ULong work,
-                          CORBA::Environment &)
+Test_i::twoway_work_test (CORBA::ULong work
+                          TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -45,9 +45,9 @@ Test_i::twoway_work_test (CORBA::ULong work,
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index ee52b2c8d3f..2ef26b8c187 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -31,23 +31,19 @@ public:
   // ctor
 
   // = The Test methods.
-  void oneway_payload_test (const Test::data &d,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ())
+  void oneway_payload_test (const Test::data &d
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void oneway_work_test (CORBA::ULong work,
-                         CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+  void oneway_work_test (CORBA::ULong work
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_work_test (CORBA::ULong work,
-                         CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+  void twoway_work_test (CORBA::ULong work
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ())
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 6e0264cf576..abd88699003 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -244,14 +244,14 @@ start_synchronization (test_ptr test,
   ACE_TRY_NEW_ENV
     {
       for (CORBA::ULong i = 0;
-	   i < synchronization_iterations;
-	   ++i)
-	{
-	  test->method (work,
-			prime_number,
-			ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+           i < synchronization_iterations;
+           ++i)
+        {
+          test->method (work,
+                        prime_number
+                        TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
     }
   ACE_CATCHANY
     {
@@ -358,7 +358,7 @@ max_throughput (test_ptr test,
   ACE_TRY_NEW_ENV
     {
       CORBA_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean result =
@@ -386,8 +386,8 @@ max_throughput (test_ptr test,
             break;
 
           test->method (work,
-                        prime_number,
-                        ACE_TRY_ENV);
+                        prime_number
+                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ++calls_made;
@@ -430,9 +430,9 @@ public:
 
   int svc (void);
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
-  void reset_priority (CORBA::Environment &ACE_TRY_ENV);
+  void reset_priority (TAO_ENV_SINGLE_ARG_DECL);
   void print_stats (ACE_hrtime_t test_end);
-  int setup (CORBA::Environment &ACE_TRY_ENV);
+  int setup (TAO_ENV_SINGLE_ARG_DECL);
   void missed_start_deadline (CORBA::ULong invocation);
   void missed_end_deadline (CORBA::ULong invocation);
 
@@ -483,18 +483,18 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Paced_Worker::reset_priority (CORBA::Environment &ACE_TRY_ENV)
+Paced_Worker::reset_priority (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (set_priority)
     {
-      this->current_->the_priority (this->priority_,
-                                    ACE_TRY_ENV);
+      this->current_->the_priority (this->priority_
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->current_->the_priority (continuous_worker_priority,
-                                    ACE_TRY_ENV);
+      this->current_->the_priority (continuous_worker_priority
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -600,16 +600,16 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end)
 }
 
 int
-Paced_Worker::setup (CORBA::Environment &ACE_TRY_ENV)
+Paced_Worker::setup (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
-      this->reset_priority (ACE_TRY_ENV);
+      this->reset_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (ACE_TRY_ENV);
+    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Boolean result =
@@ -647,7 +647,7 @@ Paced_Worker::svc (void)
   ACE_TRY_NEW_ENV
     {
       int result =
-        this->setup (ACE_TRY_ENV);
+        this->setup (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -670,8 +670,8 @@ Paced_Worker::svc (void)
             }
 
           this->test_->method (work,
-                               prime_number,
-                               ACE_TRY_ENV);
+                               prime_number
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t time_after_call =
@@ -725,7 +725,7 @@ public:
   int svc (void);
   void print_stats (ACE_Sample_History &history,
                     ACE_hrtime_t test_end);
-  int setup (CORBA::Environment &ACE_TRY_ENV);
+  int setup (TAO_ENV_SINGLE_ARG_DECL);
   void print_collective_stats (void);
 
   test_var test_;
@@ -827,17 +827,17 @@ Continuous_Worker::print_collective_stats (void)
 }
 
 int
-Continuous_Worker::setup (CORBA::Environment &ACE_TRY_ENV)
+Continuous_Worker::setup (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
-      this->current_->the_priority (continuous_worker_priority,
-                                    ACE_TRY_ENV);
+      this->current_->the_priority (continuous_worker_priority
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (ACE_TRY_ENV);
+    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Boolean result =
@@ -862,7 +862,7 @@ Continuous_Worker::svc (void)
       ACE_Sample_History history (this->iterations_);
 
       int result =
-        this->setup (ACE_TRY_ENV);
+        this->setup (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -875,8 +875,8 @@ Continuous_Worker::svc (void)
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
           this->test_->method (work,
-                               prime_number,
-                               ACE_TRY_ENV);
+                               prime_number
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -911,7 +911,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -922,31 +922,31 @@ main (int argc, char *argv[])
       fudge_priorities (orb.in ());
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
-        test::_narrow (object.in (), ACE_TRY_ENV);
+        test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("PriorityMappingManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PriorityMappingManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                                  ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMapping &priority_mapping =
@@ -1145,7 +1145,7 @@ main (int argc, char *argv[])
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_TRY_ENV);
+          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index 1789a23b11f..10950362126 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -21,14 +21,14 @@ public:
           PortableServer::POA_ptr poa);
 
   void method (CORBA::ULong work,
-               CORBA::ULong prime_number,
-               CORBA::Environment &)
+               CORBA::ULong prime_number
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   CORBA::ORB_var orb_;
@@ -44,8 +44,8 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 void
 test_i::method (CORBA::ULong work,
-                CORBA::ULong prime_number,
-                CORBA::Environment &)
+                CORBA::ULong prime_number
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -60,17 +60,17 @@ test_i::method (CORBA::ULong work,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -169,12 +169,12 @@ parse_args (int argc, char *argv[])
 int
 write_ior_to_file (const char *ior_file,
                    CORBA::ORB_ptr orb,
-                   CORBA::Object_ptr object,
-                   CORBA_Environment &ACE_TRY_ENV)
+                   CORBA::Object_ptr object
+                   TAO_ENV_ARG_DECL)
 {
   CORBA::String_var ior =
-    orb->object_to_string (object,
-                           ACE_TRY_ENV);
+    orb->object_to_string (object
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   FILE *output_file =
@@ -204,48 +204,48 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       fudge_priorities (orb.in ());
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -272,8 +272,8 @@ main (int argc, char *argv[])
                                              max_buffered_requests,
                                              max_request_buffer_size,
                                              allow_borrowing,
-                                             policies,
-                                             ACE_TRY_ENV);
+                                             policies
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (ACE_OS::strcmp (lanes_file, "empty-file") != 0)
@@ -289,8 +289,8 @@ main (int argc, char *argv[])
                                 max_buffered_requests,
                                 max_request_buffer_size,
                                 allow_borrowing,
-                                policies,
-                                ACE_TRY_ENV);
+                                policies
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result != 0)
@@ -300,8 +300,8 @@ main (int argc, char *argv[])
             get_priority_bands ("server",
                                 bands_file,
                                 rt_orb.in (),
-                                policies,
-                                ACE_TRY_ENV);
+                                policies
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result != 0)
@@ -320,50 +320,50 @@ main (int argc, char *argv[])
                                        pool_priority,
                                        allow_request_buffering,
                                        max_buffered_requests,
-                                       max_request_buffer_size,
-                                       ACE_TRY_ENV);
+                                       max_request_buffer_size
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           policies.length (policies.length () + 1);
           policies[policies.length () - 1] =
-            rt_orb->create_threadpool_policy (threadpool_id,
-                                              ACE_TRY_ENV);
+            rt_orb->create_threadpool_policy (threadpool_id
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-	  if (ACE_OS::strcmp (bands_file, "empty-file") != 0)
-	    {
-	      result =
-		get_priority_bands ("server",
-				    bands_file,
-				    rt_orb.in (),
-				    policies,
-				    ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
-	      
-	      if (result != 0)
-		return result;
-	    }
+          if (ACE_OS::strcmp (bands_file, "empty-file") != 0)
+            {
+              result =
+                get_priority_bands ("server",
+                                    bands_file,
+                                    rt_orb.in (),
+                                    policies
+                                    TAO_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              if (result != 0)
+                return result;
+            }
         }
 
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
         root_poa->create_implicit_activation_policy
-        (PortableServer::IMPLICIT_ACTIVATION,
-         ACE_TRY_ENV);
+        (PortableServer::IMPLICIT_ACTIVATION
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              default_thread_priority,
-                                              ACE_TRY_ENV);
+                                              default_thread_priority
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("RT POA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i *servant =
@@ -374,26 +374,26 @@ main (int argc, char *argv[])
       ACE_UNUSED_ARG (safe_servant);
 
       test_var test =
-        servant->_this (ACE_TRY_ENV);
+        servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result =
         write_ior_to_file (ior_output_file,
                            orb.in (),
-                           test.in (),
-                           ACE_TRY_ENV);
+                           test.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Single_Threaded_Latency/client.cpp b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
index b89b3efb533..976dfc67a00 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/client.cpp
+++ b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
@@ -83,18 +83,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Single_Threaded_Latency/server.cpp b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/server.cpp
+++ b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
index 3271329b0db..ee32b19f696 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
index 76f101734c9..eb8e866becc 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
index 896f685f99d..a38a0fe51b4 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
index 912b380725a..00e272a02fa 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
index 8f88421e8a0..97f1ef0a50b 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
index 01a2dce839d..0337e54c34f 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Thread_Pool_Latency/client.cpp b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
index a522c394b8c..f3ef1a10bd1 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/client.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Thread_Pool_Latency/server.cpp b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
index 503d226a4c7..7090cfdf18e 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/server.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
@@ -65,11 +65,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -78,11 +78,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -95,11 +95,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker_Thread worker (orb.in ());
@@ -122,10 +122,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index da9f6df9b71..05b0fe9a001 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -17,8 +17,8 @@ Receiver::Receiver (void)
 }
 
 void
-Receiver::receive_data (const Test::Message &the_message,
-                        CORBA::Environment &)
+Receiver::receive_data (const Test::Message &the_message
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -45,7 +45,7 @@ Receiver::receive_data (const Test::Message &the_message,
 }
 
 void
-Receiver::done (CORBA::Environment &ACE_TRY_ENV)
+Receiver::done (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->message_count_ == 0)
@@ -87,12 +87,12 @@ Receiver::done (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+      PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index d3f74c51d74..ab15144cacb 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -25,11 +25,11 @@ public:
   Receiver (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Message &message,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_data (const Test::Message &message
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void done (CORBA::Environment &ACE_TRY_ENV)
+  virtual void done (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index 680c542f853..059a7d3bd6b 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -12,7 +12,7 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Receiver_ptr
-Receiver_Factory::create_receiver (CORBA::Environment &ACE_TRY_ENV)
+Receiver_Factory::create_receiver (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Receiver *receiver_impl;
@@ -22,12 +22,12 @@ Receiver_Factory::create_receiver (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (Test::Receiver::_nil ());
   PortableServer::ServantBase_var transfer_ownership(receiver_impl);
 
-  return receiver_impl->_this (ACE_TRY_ENV);
+  return receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Receiver_Factory::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Receiver_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 02590168ec6..847d371f043 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -23,20 +23,20 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'b':
-	message_size = ACE_OS::atoi (get_opts.optarg);
-	break;
+        message_size = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'i':
-	message_count = ACE_OS::atoi (get_opts.optarg);
-	break;
+        message_count = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'n':
-	test_runs = ACE_OS::atoi (get_opts.optarg);
-	break;
+        test_runs = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'x':
         do_shutdown = 1;
@@ -46,10 +46,10 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
-			   "-b <message_size> "
-			   "-i <message_count> "
-			   "-n <test_repetitions> "
+                           "-k <ior> "
+                           "-b <message_size> "
+                           "-i <message_count> "
+                           "-n <test_repetitions> "
                            "\n",
                            argv [0]),
                           -1);
@@ -64,18 +64,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Receiver_Factory_var receiver_factory =
-        Test::Receiver_Factory::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Receiver_Factory::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (receiver_factory.in ()))
@@ -100,18 +100,18 @@ main (int argc, char *argv[])
           message.the_payload.length (message_size);
 
           Test::Receiver_var receiver =
-            receiver_factory->create_receiver (ACE_TRY_ENV);
+            receiver_factory->create_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           for (int i = 0; i != message_count; ++i)
             {
               message.message_id = i;
-              receiver->receive_data (message, ACE_TRY_ENV);
+              receiver->receive_data (message TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          receiver->done (ACE_TRY_ENV);
+          receiver->done (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start;
 
@@ -140,11 +140,11 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          receiver_factory->shutdown (ACE_TRY_ENV);
+          receiver_factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 24df94eba30..d0cf1854377 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -18,13 +18,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,11 +39,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl);
 
       Test::Receiver_Factory_var receiver_factory =
-        receiver_factory_impl->_this (ACE_TRY_ENV);
+        receiver_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (receiver_factory.in (), ACE_TRY_ENV);
+        orb->object_to_string (receiver_factory.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,22 +82,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 87199e80a69..6242f60c692 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -46,7 +46,7 @@ endif # COMSPEC
 ####
 TAO_BASE_LIBS=-lTAO $(ACELIB) $(LIBS)
 RT_TAO_BASE_LIBS=-lTAO_RTCORBA $(TAO_BASE_LIBS)
-TAO_SRVR_LIBS=-lTAO_PortableServer $(TAO_BASE_LIBS) 
+TAO_SRVR_LIBS=-lTAO_PortableServer $(TAO_BASE_LIBS)
 RT_TAO_SRVR_LIBS=-lTAO_RTPortableServer -lTAO_PortableServer $(RT_TAO_BASE_LIBS)
 TAO_CLNT_LIBS= $(TAO_BASE_LIBS)
 RT_TAO_CLNT_LIBS= $(RT_TAO_BASE_LIBS)
@@ -63,6 +63,12 @@ ifeq ($(findstring g++,$(CXX)),g++)
   endif # g++ < 2.8
 endif # g++
 
+ifeq ($(exceptions),1)
+  ifeq ($(include_env),1)
+    CPPFLAGS += -DTAO_ENV_BKWD_COMPAT
+  endif
+endif
+
 ifeq ($(minimum_corba),1)
   ifndef rt_corba
     rt_corba = 0
@@ -184,9 +190,9 @@ CPPFLAGS += \
 #### Build rules.
 ####
 IDL_EXT_MINUS=$(IDL_CLIENT_INL_EXT) $(IDL_CLIENT_SRC_EXT) \
-	$(IDL_SERVER_HDR_EXT) $(IDL_SERVER_INL_EXT) \
-	$(IDL_SERVER_SRC_EXT) $(IDL_SERVER_THDR_EXT) \
-	$(IDL_SERVER_TINL_EXT) $(IDL_SERVER_TSRC_EXT)
+        $(IDL_SERVER_HDR_EXT) $(IDL_SERVER_INL_EXT) \
+        $(IDL_SERVER_SRC_EXT) $(IDL_SERVER_THDR_EXT) \
+        $(IDL_SERVER_TINL_EXT) $(IDL_SERVER_TSRC_EXT)
 IDL_EXT=$(IDL_CLIENT_HDR_EXT) $(IDL_EXT_MINUS)
 IDL_EXT2_MINUS=Cli.i Cli.cpp Ser.h Ser.i Ser.cpp Ser_T.h Ser_T.i Ser_T.cpp
 IDL_EXT2=Cli.h $(IDL_EXT2_MINUS)
@@ -195,19 +201,19 @@ IDL_EXT2=Cli.h $(IDL_EXT2_MINUS)
 
 ifneq ($(use_flick),1)
 $(foreach ext, $(IDL_EXT_MINUS), %$(ext)): %$(IDL_CLIENT_HDR_EXT)
-	@
+        @
 
 ifneq ($(tao_dont_use_idl_make_rule),1)
 %C.h: %.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $<
+        $(TAO_IDL) $(TAO_IDLFLAGS) $<
 endif
 
 $(foreach ext, $(IDL_EXT2_MINUS), %$(ext)): %Cli.h
-	@
+        @
 
 ifneq ($(tao_dont_use_idl_make_rule),1)
 %Cli.h: %.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $<
+        $(TAO_IDL) $(TAO_IDLFLAGS) $<
 endif
 
 else
@@ -228,14 +234,14 @@ CORBA_BE=$(FLICK_OBJDIR)/bin/flick-c-pbe-iiopxx
 
 ifneq ($(tao_dont_use_idl_make_rule),1)
 $(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl
-	$(CORBA_FE) $< && \
-	$(CORBA_PG) -c -o $*-client.prc $*.aoi && \
-	$(CORBA_BE) $*-client.prc -o $*$(IDL_CLIENT_SRC_EXT) -h $*$(IDL_CLIENT_HDR_EXT) -f $*$(IDL_SERVER_HDR_EXT) --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \
-	echo > $*$(IDL_CLIENT_INL_EXT)
-	$(CORBA_FE) $< && \
-	$(CORBA_PG) -s -o $*-server.prc $*.aoi && \
-	$(CORBA_BE) $*-server.prc --no_mu_stubs -o $*$(IDL_SERVER_SRC_EXT) -h $*$(IDL_SERVER_HDR_EXT) -F $*$(IDL_CLIENT_HDR_EXT) --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \
-	echo > $*$(IDL_SERVER_INL_EXT) && \
+        $(CORBA_FE) $< && \
+        $(CORBA_PG) -c -o $*-client.prc $*.aoi && \
+        $(CORBA_BE) $*-client.prc -o $*$(IDL_CLIENT_SRC_EXT) -h $*$(IDL_CLIENT_HDR_EXT) -f $*$(IDL_SERVER_HDR_EXT) --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \
+        echo > $*$(IDL_CLIENT_INL_EXT)
+        $(CORBA_FE) $< && \
+        $(CORBA_PG) -s -o $*-server.prc $*.aoi && \
+        $(CORBA_BE) $*-server.prc --no_mu_stubs -o $*$(IDL_SERVER_SRC_EXT) -h $*$(IDL_SERVER_HDR_EXT) -F $*$(IDL_CLIENT_HDR_EXT) --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \
+        echo > $*$(IDL_SERVER_INL_EXT) && \
         echo > $*$(IDL_SERVER_THDR_EXT) && \
         echo > $*$(IDL_SERVER_TINL_EXT) && \
         echo > $*$(IDL_SERVER_TSRC_EXT)
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 126290e6801..9e7cf13aad7 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -36,32 +36,28 @@ public:
   virtual ~TAO_Abstract_ServantBase (void);
 
   /// Local implementation of the CORBA::Object::_is_a method.
-  virtual CORBA::Boolean _is_a (const char* logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()) = 0;
+  virtual CORBA::Boolean _is_a (const char* logical_type_id
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Default <_non_existent>: always returns false.
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ()) = 0;
+  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Query the Interface Repository.
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
   //@{
   /// @name Reference counting hooks: no-ops by default.
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
-                         TAO_default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   //@}
 
   /// Get the correct vtable.
   virtual void *_downcast (const char *repository_id) = 0;
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV) = 0;
+  virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL) = 0;
 
 protected:
   /// Default constructor, only derived classes can be created.
@@ -81,13 +77,13 @@ protected:
    * any) or the exceptions thrown into @param request.
    */
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *servant_upcall,
-                          CORBA_Environment &ACE_TRY_ENV) = 0;
+                          void *servant_upcall
+                          TAO_ENV_ARG_DECL) = 0;
 
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
                                             void *servant_upcall,
-                                            void *derived_this,
-                                            CORBA::Environment &ACE_TRY_ENV) = 0;
+                                            void *derived_this
+                                            TAO_ENV_ARG_DECL) = 0;
 
   /// Find an operation in the operation table.
   virtual int _find (const char *opname,
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 2c9e324c692..164f766fe81 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -106,8 +106,8 @@ TAO_Acceptor_Registry::get_acceptor (CORBA::ULong tag)
 int
 TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                              ACE_Reactor *reactor,
-                             int ignore_address,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             int ignore_address
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // protocol_factories is in the following form
@@ -248,8 +248,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                                          reactor,
                                          addrs,
                                          factory,
-                                         ignore_address,
-                                         ACE_TRY_ENV);
+                                         ignore_address
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (-1);
 
               if (result != 0)
@@ -469,8 +469,8 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                ACE_Reactor *reactor,
                                ACE_CString &addrs,
                                TAO_ProtocolFactorySetItor &factory,
-                               int ignore_address,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               int ignore_address
+                               TAO_ENV_ARG_DECL)
 {
   ACE_CString options_tmp;
   this->extract_endpoint_options (addrs,
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index 2253cad75c2..2f403b09a52 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -65,8 +65,8 @@ public:
   /// Initialize all registered acceptors.  Return -1 on error.
   int open (TAO_ORB_Core *orb_core,
             ACE_Reactor *reactor,
-            int ignore_address,
-            CORBA::Environment &ACE_TRY_ENV)
+            int ignore_address
+            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Close all open acceptors.
@@ -118,8 +118,8 @@ private:
               ACE_Reactor *reactor,
               ACE_CString &address,
               TAO_ProtocolFactorySetItor &factory,
-              int ignore_address,
-              CORBA::Environment &ACE_TRY_ENV);
+              int ignore_address
+              TAO_ENV_ARG_DECL);
 
 private:
   // The acceptor registry should not be copied.
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index 1f363431999..2af75966552 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -43,30 +43,30 @@ TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
 }
 
 void
-TAO_Adapter_Registry::close (int wait_for_completion,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Adapter_Registry::close (int wait_for_completion
+                             TAO_ENV_ARG_DECL)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      this->adapters_[i]->close (wait_for_completion, ACE_TRY_ENV);
+      this->adapters_[i]->close (wait_for_completion TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_Adapter_Registry::check_close (int wait_for_completion,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Adapter_Registry::check_close (int wait_for_completion
+                                   TAO_ENV_ARG_DECL)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      this->adapters_[i]->check_close (wait_for_completion, ACE_TRY_ENV);
+      this->adapters_[i]->check_close (wait_for_completion TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_Adapter_Registry::insert (TAO_Adapter *adapter,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_Adapter_Registry::insert (TAO_Adapter *adapter
+                              TAO_ENV_ARG_DECL)
 {
   if (this->adapters_capacity_ == this->adapters_count_)
     {
@@ -105,16 +105,16 @@ TAO_Adapter_Registry::insert (TAO_Adapter *adapter,
 void
 TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
                                 TAO_ServerRequest &request,
-                                CORBA::Object_out forward_to,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Object_out forward_to
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
       int r = this->adapters_[i]->dispatch (key,
                                             request,
-                                            forward_to,
-                                            ACE_TRY_ENV);
+                                            forward_to
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (r != TAO_Adapter::DS_MISMATCHED_KEY)
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index 5986595da5f..599a6921fa3 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -41,17 +41,17 @@ public:
   virtual ~TAO_Adapter (void);
 
   /// Initialize the Adapter
-  virtual void open (CORBA::Environment &) = 0;
+  virtual void open (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
 
   /// The ORB is shutting down, destroy any resources attached to this
   /// adapter.
-  virtual void close (int wait_for_completion,
-                      CORBA::Environment &) = 0;
+  virtual void close (int wait_for_completion
+                      TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
   /// Check if the adapter can be closed in the current context, raise
   /// an exception if not.
-  virtual void check_close (int wait_for_completion,
-                            CORBA::Environment &) = 0;
+  virtual void check_close (int wait_for_completion
+                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
   /**
    * Return the priority assigned to this adapter.
@@ -63,8 +63,8 @@ public:
   /// Return the status....
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
-                        CORBA::Object_out forward_to,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Object_out forward_to
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   enum {
@@ -118,20 +118,20 @@ public:
    * is invoked in an innapropriate context (think shutting down the
    * POA while performing an upcall).
    */
-  void close (int wait_for_completion,
-              CORBA::Environment &ACE_TRY_ENV);
+  void close (int wait_for_completion
+              TAO_ENV_ARG_DECL);
 
   /**
    * Verify if the close() call can be invoked in the current
    * context for *all* adapters.
    * Raise the right exception if not.
    */
-  void check_close (int wait_for_completion,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void check_close (int wait_for_completion
+                    TAO_ENV_ARG_DECL);
 
   /// Insert a new adapter into the registry.
-  void insert (TAO_Adapter *adapter,
-               CORBA::Environment &ACE_TRY_ENV);
+  void insert (TAO_Adapter *adapter
+               TAO_ENV_ARG_DECL);
 
   /**
    * Dispatch the request to all the adapters.
@@ -140,8 +140,8 @@ public:
    */
   void dispatch (TAO_ObjectKey &key,
                  TAO_ServerRequest &request,
-                 CORBA::Object_out forward_to,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::Object_out forward_to
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a collocated object using the given profile and stub.
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 35aadd83e34..557f76dc8c1 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -30,11 +30,11 @@ CORBA_Any::type (void) const
 // otherwise raises an exception.
 
 void
-CORBA_Any::type (CORBA::TypeCode_ptr tc,
-                 CORBA::Environment &ACE_TRY_ENV)
+CORBA_Any::type (CORBA::TypeCode_ptr tc
+                 TAO_ENV_ARG_DECL)
 {
-  CORBA::Boolean equiv = this->type_->equivalent (tc,
-                                                  ACE_TRY_ENV);
+  CORBA::Boolean equiv = this->type_->equivalent (tc
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equiv)
@@ -278,8 +278,8 @@ CORBA_Any::free_value (void)
 
 void
 CORBA_Any::_tao_encode (TAO_OutputCDR &cdr,
-                        TAO_ORB_Core *orb_core,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        TAO_ORB_Core *orb_core
+                        TAO_ENV_ARG_DECL)
 {
   // Always append the CDR stream, even when the value_.
   if (this->cdr_ == 0)
@@ -292,13 +292,13 @@ CORBA_Any::_tao_encode (TAO_OutputCDR &cdr,
                    orb_core);
   TAO_Marshal_Object::perform_append (this->type_.in (),
                                       &in,
-                                      &cdr,
-                                      ACE_TRY_ENV);
+                                      &cdr
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_Any::_tao_decode (TAO_InputCDR &cdr,
-                        CORBA::Environment &ACE_TRY_ENV)
+CORBA_Any::_tao_decode (TAO_InputCDR &cdr
+                        TAO_ENV_ARG_DECL)
 {
   // Just read into the CDR stream...
 
@@ -313,8 +313,8 @@ CORBA_Any::_tao_decode (TAO_InputCDR &cdr,
   // Skip over the next aregument.
   CORBA::TypeCode::traverse_status status =
     TAO_Marshal_Object::perform_skip (this->type_.in (),
-                                      &cdr,
-                                      ACE_TRY_ENV);
+                                      &cdr
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -522,12 +522,12 @@ CORBA_Any::operator<<= (CORBA::TypeCode_ptr tc)
 void
 CORBA_Any::operator<<= (const CORBA_Exception &exception)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      exception._tao_encode (stream, ACE_TRY_ENV);
+      exception._tao_encode (stream TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->_tao_replace (exception._type (),
@@ -548,12 +548,12 @@ CORBA_Any::operator<<= (const CORBA_Exception &exception)
 void
 CORBA_Any::operator<<= (CORBA_Exception *exception)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      exception->_tao_encode (stream, ACE_TRY_ENV);
+      exception->_tao_encode (stream TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->_tao_replace (exception->_type (),
@@ -717,13 +717,13 @@ CORBA_Any::operator<<= (from_wstring ws)
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Short &s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_short,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_short
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -746,13 +746,13 @@ CORBA_Any::operator>>= (CORBA::Short &s) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::UShort &s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ushort,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_ushort
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -778,13 +778,13 @@ CORBA_Any::operator>>= (CORBA::UShort &s) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Long &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_long,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_long
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -810,13 +810,13 @@ CORBA_Any::operator>>= (CORBA::Long &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::ULong &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulong,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_ulong
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -842,13 +842,13 @@ CORBA_Any::operator>>= (CORBA::ULong &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::LongLong &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_longlong,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_longlong
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -874,13 +874,13 @@ CORBA_Any::operator>>= (CORBA::LongLong &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::ULongLong &l) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_ulonglong,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_ulonglong
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result)
@@ -915,13 +915,13 @@ CORBA_Any::operator>>= (CORBA::ULongLong &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Float &f) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_float,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_float
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -947,13 +947,13 @@ CORBA_Any::operator>>= (CORBA::Float &f) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Double &d) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_double,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_double
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -979,13 +979,13 @@ CORBA_Any::operator>>= (CORBA::Double &d) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::LongDouble &ld) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_longdouble,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_longdouble
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1011,13 +1011,13 @@ CORBA_Any::operator>>= (CORBA::LongDouble &ld) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Any &a) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_any,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_any
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1045,14 +1045,14 @@ CORBA_Any::operator>>= (CORBA::Any &a) const
 CORBA::Boolean
 CORBA_Any::operator>>= (const CORBA::Any *&a) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       a = 0;
       CORBA::Boolean equivalent =
-        this->type_->equivalent (CORBA::_tc_any,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_any
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!equivalent)
@@ -1105,15 +1105,15 @@ CORBA_Any::operator>>= (const CORBA::Any *&a) const
 CORBA::Boolean
 CORBA_Any::operator>>= (const char *&s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       s = 0;
 
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_string,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_string
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1172,15 +1172,15 @@ CORBA::Any::_tao_any_wstring_destructor (void *x)
 CORBA::Boolean
 CORBA_Any::operator>>= (const CORBA::WChar *&s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       s = 0;
 
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_wstring,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_wstring
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1232,13 +1232,13 @@ CORBA::Any::_tao_any_tc_destructor (void *x)
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_TypeCode,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_TypeCode
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1285,13 +1285,13 @@ CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_boolean b) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_boolean,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_boolean
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1317,13 +1317,13 @@ CORBA_Any::operator>>= (to_boolean b) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_octet o) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_octet,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_octet
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1349,13 +1349,13 @@ CORBA_Any::operator>>= (to_octet o) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_char c) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_char,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_char
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1381,13 +1381,13 @@ CORBA_Any::operator>>= (to_char c) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_wchar wc) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
-        this->type_->equivalent (CORBA::_tc_wchar,
-                                 ACE_TRY_ENV);
+        this->type_->equivalent (CORBA::_tc_wchar
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1413,12 +1413,12 @@ CORBA_Any::operator>>= (to_wchar wc) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_string s) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ULong kind =
-        this->type_->kind (ACE_TRY_ENV);
+        this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tcvar =
@@ -1426,10 +1426,10 @@ CORBA_Any::operator>>= (to_string s) const
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (ACE_TRY_ENV);
+          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          kind = tcvar->kind (ACE_TRY_ENV);
+          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1438,7 +1438,7 @@ CORBA_Any::operator>>= (to_string s) const
           return 0;
         }
 
-      CORBA::ULong bound = tcvar->length (ACE_TRY_ENV);
+      CORBA::ULong bound = tcvar->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s.bound_ != bound)
@@ -1483,12 +1483,12 @@ CORBA_Any::operator>>= (to_string s) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_wstring ws) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ULong kind =
-        this->type_->kind (ACE_TRY_ENV);
+        this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tcvar =
@@ -1496,10 +1496,10 @@ CORBA_Any::operator>>= (to_wstring ws) const
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (ACE_TRY_ENV);
+          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          kind = tcvar->kind (ACE_TRY_ENV);
+          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1508,7 +1508,7 @@ CORBA_Any::operator>>= (to_wstring ws) const
           return 0;
         }
 
-      CORBA::ULong bound = tcvar->length (ACE_TRY_ENV);
+      CORBA::ULong bound = tcvar->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ws.bound_ != bound)
@@ -1553,12 +1553,12 @@ CORBA_Any::operator>>= (to_wstring ws) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_object obj) const
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ULong kind =
-        this->type_->kind (ACE_TRY_ENV);
+        this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tcvar =
@@ -1566,10 +1566,10 @@ CORBA_Any::operator>>= (to_object obj) const
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (ACE_TRY_ENV);
+          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          kind = tcvar->kind (ACE_TRY_ENV);
+          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1663,8 +1663,8 @@ operator<< (TAO_OutputCDR& cdr,
                           x._tao_byte_order ());
       TAO_Marshal_Object::perform_append (tc.in (),
                                           &input,
-                                          &cdr,
-                                          ACE_TRY_ENV);
+                                          &cdr
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
@@ -1698,7 +1698,7 @@ operator>> (TAO_InputCDR &cdr,
 
       // Skip over the next aregument.
       CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc.in (), &cdr, ACE_TRY_ENV);
+        TAO_Marshal_Object::perform_skip (tc.in (), &cdr TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 045f6f831f3..3d61cb26f42 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -282,9 +282,8 @@ public:
 
   /// For use along with <<= of a value of aliased type when the alias must
   /// be preserved.
-  void type (CORBA::TypeCode_ptr type,
-             CORBA_Environment &ACE_TRY_ENV =
-               TAO_default_environment ());
+  void type (CORBA::TypeCode_ptr type
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Returns 0 if the Any has not been assigned a value, following the
@@ -334,12 +333,12 @@ public:
 
   /// Encode the contents of the Any into <cdr>
   void _tao_encode (TAO_OutputCDR &cdr,
-                    TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    TAO_ORB_Core *orb_core
+                    TAO_ENV_ARG_DECL);
 
   /// Decode the <cdr> using the typecode in the Any object.
-  void _tao_decode (TAO_InputCDR &cdr,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void _tao_decode (TAO_InputCDR &cdr
+                    TAO_ENV_ARG_DECL);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA_Any_ptr _ptr_type;
diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
index d36f84ba290..5b1ee420c1c 100644
--- a/TAO/tao/Asynch_Invocation.cpp
+++ b/TAO/tao/Asynch_Invocation.cpp
@@ -56,19 +56,19 @@ TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation (void)
 }
 
 int
-TAO_GIOP_Asynch_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Asynch_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
 
-  return this->invoke_i (ACE_TRY_ENV);
+  return this->invoke_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_GIOP_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Asynch_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_GIOP_Invocation::start (ACE_TRY_ENV);
+  this->TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->target_spec_.target_specifier (this->profile_->object_key ());
@@ -79,7 +79,7 @@ TAO_GIOP_Asynch_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 int
-TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int retval = 0;
@@ -126,8 +126,8 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
     } // if (this->rd_)
 
   // Just send the request, without trying to wait for the reply.
-  retval = TAO_GIOP_Invocation::invoke (0,
-                                        ACE_TRY_ENV);
+  retval = TAO_GIOP_Invocation::invoke (0
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   if (retval != TAO_INVOKE_OK)
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Asynch_Reply_Dispatcher.cpp
index 7dc7e3aecd4..a0401b63755 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher.cpp
@@ -165,8 +165,8 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
           // Call the Reply Handler's skeleton.
           reply_handler_skel_ (this->reply_cdr_,
                                this->reply_handler_.in (),
-                               reply_error,
-                               ACE_TRY_ENV);
+                               reply_error
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -201,7 +201,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 
       TAO_OutputCDR out_cdr;
 
-      comm_failure._tao_encode (out_cdr, ACE_TRY_ENV);
+      comm_failure._tao_encode (out_cdr TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -212,8 +212,8 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
         {
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
-                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION,
-                                     ACE_TRY_ENV);
+                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -247,7 +247,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
 
       TAO_OutputCDR out_cdr;
 
-      timeout_failure._tao_encode (out_cdr, ACE_TRY_ENV);
+      timeout_failure._tao_encode (out_cdr TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Turn into an output CDR
@@ -257,8 +257,8 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
         {
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
-                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION,
-                                     ACE_TRY_ENV);
+                                     TAO_AMI_REPLY_SYSTEM_EXCEPTION
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index 3a2cd6ee2e0..443e2101691 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -42,13 +42,13 @@ public:
   /// Activate the BiDirGIOP library
   virtual int activate (CORBA::ORB_ptr,
                         int argc,
-                        char *argv [],
-                        CORBA::Environment &ACE_TRY_ENV)
+                        char *argv []
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual int parse_policy (TAO_ORB_Core *orb_core,
-                            CORBA::Policy_ptr policy,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Policy_ptr policy
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 16b877d750e..b186e4af8b7 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -13,8 +13,8 @@ TAO_BiDirGIOP_Loader::TAO_BiDirGIOP_Loader (void)
 int
 TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr,
                                 int,
-                                char *[],
-                                CORBA::Environment &ACE_TRY_ENV)
+                                char *[]
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_DEF_GIOP_MINOR >= 2)
@@ -35,8 +35,8 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr,
 
       bidir_orb_initializer = tmp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (bidir_orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (bidir_orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -45,14 +45,14 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr,
 
 int
 TAO_BiDirGIOP_Loader::parse_policy (TAO_ORB_Core *orb_core,
-                                    CORBA::Policy_ptr policy,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Policy_ptr policy
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   BiDirPolicy::BidirectionalPolicy_var bidir_policy
-    = BiDirPolicy::BidirectionalPolicy::_narrow (policy,
-                                                 ACE_TRY_ENV);
+    = BiDirPolicy::BidirectionalPolicy::_narrow (policy
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Bidirectional policy. If we have a BiDirectional policy, we set a
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index f1957a828fd..11c83c4b68c 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -34,14 +34,14 @@ public:
   /// Creates a  factory and returns it.
   virtual int activate (CORBA::ORB_ptr,
                         int argc,
-                        char *argv [],
-                        CORBA::Environment &ACE_TRY_ENV)
+                        char *argv []
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Parse the policy sent by the ORB_Core
   virtual int parse_policy (TAO_ORB_Core *orb_core,
-                            CORBA::Policy_ptr policy,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Policy_ptr policy
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to force the initialization of the ORB code.
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 97c37a96607..c5f5bace974 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -34,25 +34,25 @@ static const CORBA::Long _oc_BiDirPolicy_BidirectionalPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x42694469), 
-  ACE_NTOHL (0x72506f6c), 
-  ACE_NTOHL (0x6963792f), 
-  ACE_NTOHL (0x42696469), 
-  ACE_NTOHL (0x72656374), 
-  ACE_NTOHL (0x696f6e61), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x42694469),
+  ACE_NTOHL (0x72506f6c),
+  ACE_NTOHL (0x6963792f),
+  ACE_NTOHL (0x42696469),
+  ACE_NTOHL (0x72656374),
+  ACE_NTOHL (0x696f6e61),
+  ACE_NTOHL (0x6c506f6c),
+  ACE_NTOHL (0x69637956),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:BiDirPolicy/BidirectionalPolicyValue:1.0
   25,
-  ACE_NTOHL (0x42696469), 
-  ACE_NTOHL (0x72656374), 
-  ACE_NTOHL (0x696f6e61), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x69637956), 
-  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x42696469),
+  ACE_NTOHL (0x72656374),
+  ACE_NTOHL (0x696f6e61),
+  ACE_NTOHL (0x6c506f6c),
+  ACE_NTOHL (0x69637956),
+  ACE_NTOHL (0x616c7565),
   ACE_NTOHL (0x0),  // name = BidirectionalPolicyValue
   CORBA::tk_ushort,
 
@@ -134,7 +134,7 @@ BiDirPolicy::BidirectionalPolicy_var::operator const ::BiDirPolicy::Bidirectiona
   return this->ptr_;
 }
 
-BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast 
+BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -194,11 +194,11 @@ BiDirPolicy::BidirectionalPolicy_var::tao_nil (void)
 
 ::BiDirPolicy::BidirectionalPolicy_ptr
 BiDirPolicy::BidirectionalPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::BiDirPolicy::BidirectionalPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::BiDirPolicy::BidirectionalPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -279,16 +279,16 @@ BiDirPolicy::BidirectionalPolicy::~BidirectionalPolicy (void)
 {}
 
 BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return BidirectionalPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return BidirectionalPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -338,7 +338,7 @@ void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index 44fae6bfc07..6c5944e6118 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -76,7 +76,7 @@ TAO_NAMESPACE  BiDirPolicy
 
   class BidirectionalPolicy;
   typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -87,31 +87,31 @@ TAO_NAMESPACE  BiDirPolicy
   {
   public:
     BidirectionalPolicy_var (void); // default constructor
-    BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {} 
+    BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {}
     BidirectionalPolicy_var (const BidirectionalPolicy_var &); // copy constructor
     ~BidirectionalPolicy_var (void); // destructor
-    
+
     BidirectionalPolicy_var &operator= (BidirectionalPolicy_ptr);
     BidirectionalPolicy_var &operator= (const BidirectionalPolicy_var &);
     BidirectionalPolicy_ptr operator-> (void) const;
-    
+
     operator const BidirectionalPolicy_ptr &() const;
     operator BidirectionalPolicy_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     BidirectionalPolicy_ptr in (void) const;
     BidirectionalPolicy_ptr &inout (void);
     BidirectionalPolicy_ptr &out (void);
     BidirectionalPolicy_ptr _retn (void);
     BidirectionalPolicy_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static BidirectionalPolicy_ptr tao_duplicate (BidirectionalPolicy_ptr);
     static void tao_release (BidirectionalPolicy_ptr);
     static BidirectionalPolicy_ptr tao_nil (void);
-    static BidirectionalPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static BidirectionalPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     BidirectionalPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -138,7 +138,7 @@ TAO_NAMESPACE  BiDirPolicy
     operator BidirectionalPolicy_ptr &();
     BidirectionalPolicy_ptr &ptr (void);
     BidirectionalPolicy_ptr operator-> (void);
-  
+
   private:
     BidirectionalPolicy_ptr &ptr_;
   };
@@ -163,35 +163,32 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy
     // the static operations
     static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
     static BidirectionalPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static BidirectionalPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static BidirectionalPolicy_ptr _nil (void)
       {
         return (BidirectionalPolicy_ptr)0;
       }
 
     virtual BiDirPolicy::BidirectionalPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     BidirectionalPolicy ();
-    
+
     virtual ~BidirectionalPolicy (void);
   private:
     BidirectionalPolicy (const BidirectionalPolicy &);
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
index 30946960ebd..9eb9335f312 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
@@ -49,11 +49,11 @@ tao_BiDirPolicy_BidirectionalPolicy_nil (
 
 ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
 tao_BiDirPolicy_BidirectionalPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return BiDirPolicy::BidirectionalPolicy::_narrow (p, ACE_TRY_ENV);
+  return BiDirPolicy::BidirectionalPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index 47cc91ac035..e80e938dd88 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -41,8 +41,6 @@ TAO_BiDir_ORBInitializer::register_policy_factories (
     PortableInterceptor::PolicyFactory::_nil ();
   PortableInterceptor::PolicyFactory_var policy_factory;
 
-  TAO_ENV_ARG_DEFN;
-
   /// This policy factory is used for all BiDir related policies.
   ACE_NEW_THROW_EX (temp_factory,
                     TAO_BiDir_PolicyFactory,
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 1051005aefe..c50d6828e66 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -21,8 +21,6 @@ TAO_BiDir_PolicyFactory::create_policy (
 {
   CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
 
-  TAO_ENV_ARG_DEFN;
-
   if (type == BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE)
     {
       BiDirPolicy::BidirectionalPolicyValue val;
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 80f7b830f0d..b4f95769ba0 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -63,16 +63,16 @@ void CORBA_Bounds::_raise ()
   TAO_RAISE(*this);
 }
 
-void CORBA_Bounds::_tao_encode (TAO_OutputCDR &cdr,
-                                CORBA::Environment &ACE_TRY_ENV) const
+void CORBA_Bounds::_tao_encode (TAO_OutputCDR &cdr
+                                TAO_ENV_ARG_DECL) const
 {
   if (cdr << *this)
     return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void CORBA_Bounds::_tao_decode (TAO_InputCDR &cdr,
-                                CORBA::Environment &ACE_TRY_ENV)
+void CORBA_Bounds::_tao_decode (TAO_InputCDR &cdr
+                                TAO_ENV_ARG_DECL)
 {
   if (cdr >> *this)
     return;
@@ -123,7 +123,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_ele
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Bounds, ACE_TRY_ENV)) return 0; // not equal
+    if (!type->equal (CORBA::_tc_Bounds TAO_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index a3f04327beb..ee1e47f53a3 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -53,10 +53,9 @@
 
     virtual void _raise (void);
 
-    virtual void _tao_encode (TAO_OutputCDR &cdr,
-                              CORBA::Environment &) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr,
-                              CORBA::Environment &);
+    virtual void _tao_encode (TAO_OutputCDR &cdr
+                              TAO_ENV_ARG_DECL_NOT_USED) const;
+    virtual void _tao_decode (TAO_InputCDR &cdr TAO_ENV_ARG_DECL_NOT_USED);
 
     static CORBA_Bounds *_downcast (CORBA::Exception *);
     static void _tao_any_destructor (void*);
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index e4dc7a42448..f659a1cbbe8 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -24,15 +24,15 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff
 }
 
 CORBA::PolicyType
-TAO_Buffering_Constraint_Policy::policy_type (CORBA_Environment &)
+TAO_Buffering_Constraint_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val,
-                                         CORBA::Environment &ACE_TRY_ENV)
+TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val
+                                         TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint *buffering_constraint;
   if ((val >>= buffering_constraint) == 0)
@@ -59,14 +59,14 @@ TAO_Buffering_Constraint_Policy::clone (void) const
 }
 
 TAO::BufferingConstraint
-TAO_Buffering_Constraint_Policy::buffering_constraint (CORBA::Environment &)
+TAO_Buffering_Constraint_Policy::buffering_constraint (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->buffering_constraint_;
 }
 
 CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
+TAO_Buffering_Constraint_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Buffering_Constraint_Policy* servant = 0;
@@ -79,7 +79,7 @@ TAO_Buffering_Constraint_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Buffering_Constraint_Policy::destroy (CORBA_Environment &)
+TAO_Buffering_Constraint_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index ef6590731c0..08a9b59bc26 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -52,25 +52,25 @@ public:
   TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs);
 
   /// Helper method for the implementation of CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  static CORBA::Policy_ptr create (const CORBA::Any& val
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns a copy of <this>.
   virtual TAO_Buffering_Constraint_Policy *clone (void) const;
 
   // = The TAO::Buffering_Constraint_Policy methods
 
-  virtual TAO::BufferingConstraint buffering_constraint (CORBA::Environment &ACE_TRY_ENV)
+  virtual TAO::BufferingConstraint buffering_constraint (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void get_buffering_constraint (TAO::BufferingConstraint &) const;
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index 211a9cb1d7c..760922e4928 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -16,7 +16,7 @@ ACE_RCSID (TAO_CodecFactory,
 
 
 TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major,
-					    CORBA::Octet minor)
+                                            CORBA::Octet minor)
   : major_ (major),
     minor_ (minor)
 {
@@ -27,13 +27,13 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
 }
 
 CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data,
-			      CORBA::Environment &ACE_TRY_ENV)
+TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::InvalidTypeForEncoding))
+                   IOP::Codec::InvalidTypeForEncoding))
 {
-  this->check_type_for_encoding (data,
-				 ACE_TRY_ENV);
+  this->check_type_for_encoding (data
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ----------------------------------------------------------------
@@ -74,10 +74,10 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data,
 }
 
 CORBA::Any *
-TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data,
-			      CORBA::Environment &ACE_TRY_ENV)
+TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::FormatMismatch))
+                   IOP::Codec::FormatMismatch))
 {
   // @todo How do we check for a format mismatch so that we can throw
   //       a IOP::Codec::FormatMismatch exception?
@@ -116,13 +116,13 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data,
 }
 
 CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data,
-				    CORBA::Environment &ACE_TRY_ENV)
+TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::InvalidTypeForEncoding))
+                   IOP::Codec::InvalidTypeForEncoding))
 {
-  this->check_type_for_encoding (data,
-				 ACE_TRY_ENV);
+  this->check_type_for_encoding (data
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ----------------------------------------------------------------
@@ -137,8 +137,8 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data,
 
       TAO_Marshal_Object::perform_append (tc.in (),
                                           &input,
-                                          &cdr,
-                                          ACE_TRY_ENV);
+                                          &cdr
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // TAO extension: replace the contents of the octet sequence with
@@ -171,16 +171,16 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data,
       return safe_octet_seq._retn ();
     }
 
-  ACE_THROW_RETURN (CORBA::MARSHAL (), 0);  
+  ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
 }
 
 CORBA::Any *
 TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
-				    CORBA::TypeCode_ptr tc,
-				    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::TypeCode_ptr tc
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::FormatMismatch,
-		   IOP::Codec::TypeMismatch))
+                   IOP::Codec::FormatMismatch,
+                   IOP::Codec::TypeMismatch))
 {
   // @todo How do we check for a type mismatch so that we can
   //       throw a IOP::Codec::TypeMismatch exception?
@@ -215,7 +215,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
 
       // Skip over the next argument.
       CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc, &cdr, ACE_TRY_ENV);
+        TAO_Marshal_Object::perform_skip (tc, &cdr TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);  // @@ Should we throw a
                              //    IOP::Codec::TypeMismatch exception
                              //    here if this fails?
@@ -279,8 +279,8 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
 
 void
 TAO_CDR_Encaps_Codec::check_type_for_encoding (
-  const CORBA::Any & data,
-  CORBA::Environment &ACE_TRY_ENV)
+  const CORBA::Any & data
+  TAO_ENV_ARG_DECL)
 {
   // @@ TODO: Are there any other conditions we need to check?
 
diff --git a/TAO/tao/CDR_Encaps_Codec.h b/TAO/tao/CDR_Encaps_Codec.h
index 41fee8fffc6..71ba100bce8 100644
--- a/TAO/tao/CDR_Encaps_Codec.h
+++ b/TAO/tao/CDR_Encaps_Codec.h
@@ -61,37 +61,33 @@ public:
 
   /// Encode the given data, including the TypeCode, into an octet
   /// sequence.
-  virtual CORBA::OctetSeq * encode (const CORBA::Any & data,
-				    CORBA::Environment &ACE_TRY_ENV =
-				      TAO_default_environment ())
+  virtual CORBA::OctetSeq * encode (const CORBA::Any & data
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::Codec::InvalidTypeForEncoding));
+                     IOP::Codec::InvalidTypeForEncoding));
 
   /// Extract the TypeCode and the value from the octet sequence and
   /// place them into an Any.
-  virtual CORBA::Any * decode (const CORBA::OctetSeq & data,
-			       CORBA::Environment &ACE_TRY_ENV =
-			         TAO_default_environment ())
+  virtual CORBA::Any * decode (const CORBA::OctetSeq & data
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::Codec::FormatMismatch));
+                     IOP::Codec::FormatMismatch));
 
   /// Encode the given data, excluding the TypeCode, into an octet
   /// sequence.
-  virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data,
-					  CORBA::Environment &ACE_TRY_ENV =
-					    TAO_default_environment ())
+  virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::Codec::InvalidTypeForEncoding));
+                     IOP::Codec::InvalidTypeForEncoding));
 
   /// Extract the value from the octet sequence, based on the given
   /// TypeCode,  and place it into an Any.
   virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data,
-				     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,
-		     IOP::Codec::FormatMismatch,
-		     IOP::Codec::TypeMismatch));
+                     IOP::Codec::FormatMismatch,
+                     IOP::Codec::TypeMismatch));
 
 protected:
 
@@ -109,8 +105,8 @@ protected:
    * that isn't supported for the version of GIOP associated with this
    * Codec.
    */
-  void check_type_for_encoding (const CORBA::Any & data,
-				CORBA::Environment &ACE_TRY_ENV);
+  void check_type_for_encoding (const CORBA::Any & data
+                                TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 073d6610f0c..4852a839128 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -320,8 +320,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponent,
-                        ACE_TRY_ENV);
+      type->equivalent (CONV_FRAME::_tc_CodeSetComponent
+                         TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -375,8 +375,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponent,
-                        ACE_TRY_ENV);
+      type->equivalent (CONV_FRAME::_tc_CodeSetComponent
+                         TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -455,8 +455,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo,
-                        ACE_TRY_ENV);
+      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
+                         TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -510,8 +510,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo,
-                        ACE_TRY_ENV);
+      type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
+                         TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -590,7 +590,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetConte
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext, ACE_TRY_ENV);
+      type->equivalent (CONV_FRAME::_tc_CodeSetContext TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -644,7 +644,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext, ACE_TRY_ENV);
+      type->equivalent (CONV_FRAME::_tc_CodeSetContext TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index 6786b867f9d..f6893fa1acf 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -37,8 +37,8 @@ void
 TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name,
                                                 CORBA::ULong &addr_list_length,
                                                 CORBA::ULong
-                                                &count_addr,
-                                                CORBA::Environment &ACE_TRY_ENV)
+                                                &count_addr
+                                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -88,9 +88,8 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
                                         CORBA::ULong
                                         &addr_list_length,
                                         CORBA::ORB_ptr orb,
-                                        TAO_MProfile &mprofile,
-                                        CORBA::Environment
-                                        &ACE_TRY_ENV)
+                                        TAO_MProfile &mprofile
+                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -215,8 +214,8 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
   // endpoint and adds it to the big mprofile.
   this->parse_string_mprofile_helper (end_point.in (),
                                       orb,
-                                      mprofile,
-                                      ACE_TRY_ENV);
+                                      mprofile
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -226,9 +225,8 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (CORBA::ULong
                                                  ACE_CString &key_string,
                                                  ACE_CString &cloc_name,
                                                  CORBA::ORB_ptr orb,
-                                                 TAO_MProfile &mprofile,
-                                                 CORBA::Environment
-                                                 &ACE_TRY_ENV)
+                                                 TAO_MProfile &mprofile
+                                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *cloc_name_ptr = 0;
@@ -248,8 +246,8 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (CORBA::ULong
                                key_string,
                                addr_list_length,
                                orb,
-                               mprofile,
-                               ACE_TRY_ENV);
+                               mprofile
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Get the next token.
@@ -264,16 +262,16 @@ void
 TAO_CORBALOC_Parser::parse_string_mprofile_helper (
     const char * end_point,
     CORBA::ORB_ptr orb,
-    TAO_MProfile &mprofile,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_MProfile &mprofile
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_MProfile jth_mprofile;
 
   int retv =
     orb->orb_core ()->connector_registry ()->make_mprofile (end_point,
-                                                            jth_mprofile,
-                                                            ACE_TRY_ENV);
+                                                            jth_mprofile
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (retv != 0)
@@ -299,14 +297,14 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
 
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
-                                              TAO_MProfile &mprofile,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              TAO_MProfile &mprofile
+                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a TAO_Stub.
   TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0,
-                                                  mprofile,
-                                                  ACE_TRY_ENV);
+                                                  mprofile
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   TAO_Stub_Auto_Ptr safe_data (data);
@@ -330,8 +328,8 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string_rir_helper (const char *
                                               &corbaloc_name,
-                                              CORBA::ORB_ptr orb,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              CORBA::ORB_ptr orb
+                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -348,16 +346,16 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char *
     }
 
   CORBA::Object_var rir_obj =
-    orb->resolve_initial_references (key_string,
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references (key_string
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return rir_obj._retn ();
 }
 
 int
-TAO_CORBALOC_Parser::check_prefix (const char *end_point,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_CORBALOC_Parser::check_prefix (const char *end_point
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -411,8 +409,8 @@ TAO_CORBALOC_Parser::check_prefix (const char *end_point,
 
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string (const char *ior,
-                                   CORBA::ORB_ptr orb,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::ORB_ptr orb
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// MProfile which consists of the profiles for each endpoint.
@@ -432,8 +430,8 @@ TAO_CORBALOC_Parser::parse_string (const char *ior,
   CORBA::ULong addr_list_length = 0;
 
   // If the protocol is not "rir:" and also is a valid protocol
-  int check_prefix_result = this->check_prefix (corbaloc_name,
-                                                ACE_TRY_ENV);
+  int check_prefix_result = this->check_prefix (corbaloc_name
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (check_prefix_result != 0)
@@ -442,8 +440,8 @@ TAO_CORBALOC_Parser::parse_string (const char *ior,
       // endpoints in the obj_addr_list
       this->parse_string_count_helper (corbaloc_name,
                                        addr_list_length,
-                                       count_addr,
-                                       ACE_TRY_ENV);
+                                       count_addr
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       // Convert corbaloc_name to an ACE_CString
@@ -466,23 +464,23 @@ TAO_CORBALOC_Parser::parse_string (const char *ior,
                                         key_string,
                                         cloc_name,
                                         orb,
-                                        mprofile,
-                                        ACE_TRY_ENV);
+                                        mprofile
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       // Create the stub for the mprofile and get the object reference
       // to it which is to be returned to the client application.
       object = this->make_stub_from_mprofile (orb,
-                                              mprofile,
-                                              ACE_TRY_ENV);
+                                              mprofile
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   else
     {
       // RIR case:
       object = this->parse_string_rir_helper (corbaloc_name,
-                                              orb,
-                                              ACE_TRY_ENV);
+                                              orb
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return object;
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index 0e7ae1a911b..5a834488436 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -51,23 +51,23 @@ public:
 
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb,
-                                          CORBA::Environment &)
+                                          CORBA::ORB_ptr orb
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Checks the prefix to see if it is RIR.
-  virtual int check_prefix (const char *endpoint,
-                            CORBA::Environment &ACE_TRY_ENV)
+  virtual int check_prefix (const char *endpoint
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Helps count the length of the <obj_addr_list> and the number of
   /// individual <obj_addr> in the <obj_addr_list>.
   virtual void parse_string_count_helper (const char * &corbaloc_name,
                                           CORBA::ULong &addr_list_length,
-                                          CORBA::ULong &count_addr,
-                                          CORBA::Environment &)
+                                          CORBA::ULong &count_addr
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -78,8 +78,8 @@ private:
    */
   virtual void parse_string_mprofile_helper (const char * end_point,
                                              CORBA::ORB_ptr orb,
-                                             TAO_MProfile &mprofile,
-                                             CORBA::Environment &)
+                                             TAO_MProfile &mprofile
+                                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -89,15 +89,15 @@ private:
    */
   virtual CORBA::Object_ptr
     make_stub_from_mprofile (CORBA::ORB_ptr orb,
-                             TAO_MProfile &mprofile,
-                             CORBA::Environment &)
+                             TAO_MProfile &mprofile
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Gets the pointer to the key_string when the protocol used is RIR
   virtual CORBA::Object_ptr
     parse_string_rir_helper (const char * &corbaloc_name,
-                             CORBA::ORB_ptr orb,
-                             CORBA::Environment &)
+                             CORBA::ORB_ptr orb
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Tokenizes the <obj_addr_list> using "," as the seperator. Assigns
@@ -106,8 +106,8 @@ private:
                                            ACE_CString &key_string,
                                            ACE_CString &cloc_name,
                                            CORBA::ORB_ptr orb,
-                                           TAO_MProfile &mprofile,
-                                           CORBA::Environment &)
+                                           TAO_MProfile &mprofile
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -120,8 +120,8 @@ private:
                       ACE_CString &key_string,
                       CORBA::ULong &addr_list_length,
                       CORBA::ORB_ptr orb,
-                      TAO_MProfile &mprofile,
-                      CORBA::Environment &)
+                      TAO_MProfile &mprofile
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index ce4e6002b95..980eedd38e8 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -21,18 +21,18 @@ int
 TAO_CORBANAME_Parser::match_prefix (const char *ior_string) const
 {
   return (ACE_OS::strncmp (ior_string,
-			   corbaname_prefix,
-			   sizeof corbaname_prefix - 1)	== 0);
+                           corbaname_prefix,
+                           sizeof corbaname_prefix - 1) == 0);
 }
 
 CORBA::Object_ptr
 TAO_CORBANAME_Parser::
 parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
-				     ACE_CString &key_string,
-				     CORBA::Environment	&ACE_TRY_ENV)
+                                     ACE_CString &key_string
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Object_ptr _tao_retval	= CORBA::Object::_nil ();
+  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
 
   CORBA::Object_var _tao_safe_retval (_tao_retval);
 
@@ -50,160 +50,160 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
 
   for (;;)
     {
-      _tao_call.start (ACE_TRY_ENV);
+      _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-      CORBA::Short _tao_response_flag =	TAO_TWOWAY_RESPONSE_FLAG;
+      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
 
       _tao_call.prepare_header (
-	  ACE_static_cast (CORBA::Octet, _tao_response_flag),
-	  ACE_TRY_ENV
-	);
+          ACE_static_cast (CORBA::Octet, _tao_response_flag)
+           TAO_ENV_ARG_PARAMETER
+        );
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-      TAO_OutputCDR &_tao_out =	_tao_call.out_stream ();
+      TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
       if (!(
-	    (_tao_out << key_string.c_str ())
-	  ))
-	ACE_THROW_RETURN (
-	    CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO),
-	    CORBA::Object::_nil	()
-	  );
+            (_tao_out << key_string.c_str ())
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO),
+            CORBA::Object::_nil ()
+          );
 
       int _invoke_status = 0;
       ACE_TRY
-	{
-	  _invoke_status = _tao_call.invoke (0,	0, ACE_TRY_ENV);
-	  ACE_TRY_CHECK	(CORBA::Object::_nil ());
-	}
-      ACE_CATCH	(CORBA::UNKNOWN, ex)
-	{
-	  ACE_UNUSED_ARG (ex);
-
-	  ACE_THROW_RETURN (
-	      CORBA::BAD_PARAM (TAO_OMG_VMCID |	10,
-				CORBA::COMPLETED_YES),
-	      CORBA::Object::_nil ()
-	    );
-	}
+        {
+          _invoke_status = _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK (CORBA::Object::_nil ());
+        }
+      ACE_CATCH (CORBA::UNKNOWN, ex)
+        {
+          ACE_UNUSED_ARG (ex);
+
+          ACE_THROW_RETURN (
+              CORBA::BAD_PARAM (TAO_OMG_VMCID | 10,
+                                CORBA::COMPLETED_YES),
+              CORBA::Object::_nil ()
+            );
+        }
       ACE_ENDTRY;
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       if (_invoke_status == TAO_INVOKE_RESTART)
-	{
-	  _tao_call.restart_flag (1);
-	  continue;
-	}
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
       if (_invoke_status != TAO_INVOKE_OK)
-	{
-	  // @@	Is there any way we can	reach this point?  Any
-	  //	USER_EXCEPTION response	will be	caught by the UNKNOWN
-	  //	catch block above.  Any	SYSTEM_EXCEPTION response will
-	  //	be simply raised, and any RESTART is handled
-	  //	already...  leave this here "just in case".
-	  ACE_THROW_RETURN (
-	      CORBA::BAD_PARAM (TAO_OMG_VMCID |	10,
-				CORBA::COMPLETED_YES),
-	      CORBA::Object::_nil ()
-	    );
-	}
+        {
+          // @@ Is there any way we can reach this point?  Any
+          //    USER_EXCEPTION response will be caught by the UNKNOWN
+          //    catch block above.  Any SYSTEM_EXCEPTION response will
+          //    be simply raised, and any RESTART is handled
+          //    already...  leave this here "just in case".
+          ACE_THROW_RETURN (
+              CORBA::BAD_PARAM (TAO_OMG_VMCID | 10,
+                                CORBA::COMPLETED_YES),
+              CORBA::Object::_nil ()
+            );
+        }
       TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
       if (!(
-	    (_tao_in >>	_tao_safe_retval.inout ())
-	  ))
-	{
-	  ACE_THROW_RETURN (
-	      CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-	      CORBA::Object::_nil ()
-	    );
-	}
+            (_tao_in >> _tao_safe_retval.inout ())
+          ))
+        {
+          ACE_THROW_RETURN (
+              CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              CORBA::Object::_nil ()
+            );
+        }
       break;
     }
 
-  return _tao_safe_retval._retn	();
+  return _tao_safe_retval._retn ();
 }
 
 CORBA::Object_ptr
 TAO_CORBANAME_Parser::parse_string (const char *ior,
-				    CORBA::ORB_ptr orb,
-				    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::ORB_ptr orb
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // Skip the prefix, we know it is there because this method in only
   // called if <match_prefix> returns 1.
-  const	char *corbaname	=
-    ior	+ sizeof corbaname_prefix - 1;
+  const char *corbaname =
+    ior + sizeof corbaname_prefix - 1;
 
-  CORBA::Object_ptr obj	= CORBA::Object::_nil ();
+  CORBA::Object_ptr obj = CORBA::Object::_nil ();
 
   ACE_TRY
     {
       char rir_prot [] = "rir:";
 
-      // The position of the seperator between the obj_addr and	key
+      // The position of the seperator between the obj_addr and key
       // string
       CORBA::ULong pos_seperator = 0;
 
-      ACE_CString corbaname_str	(corbaname, 0, 1);
+      ACE_CString corbaname_str (corbaname, 0, 1);
 
       pos_seperator = corbaname_str.find ("#", 0);
 
       // Get the Key String
       ACE_CString key_string =
-	corbaname_str.substring	(pos_seperator + 1,
-				 -1);
+        corbaname_str.substring (pos_seperator + 1,
+                                 -1);
 
-      // Make it in a form understandable by <corbaloc>	scheme
-      ACE_CString corbaloc_addr	("corbaloc:", 0, 1);
+      // Make it in a form understandable by <corbaloc> scheme
+      ACE_CString corbaloc_addr ("corbaloc:", 0, 1);
 
       if (ACE_OS::strncmp (corbaname,
-			   rir_prot,
-			   sizeof (rir_prot)) != 0)
-	{
-	  // Implies that <iiop:> protocol is to be used.
-	  // So	.. we need to get the host address where an object of
-	  // type NamingContext	can be found.
-	  // Get the obj_addr
-	  ACE_CString obj_addr = corbaname_str.substring (0,
-							  pos_seperator);
+                           rir_prot,
+                           sizeof (rir_prot)) != 0)
+        {
+          // Implies that <iiop:> protocol is to be used.
+          // So .. we need to get the host address where an object of
+          // type NamingContext can be found.
+          // Get the obj_addr
+          ACE_CString obj_addr = corbaname_str.substring (0,
+                                                          pos_seperator);
 
-	  corbaloc_addr	+= obj_addr;
+          corbaloc_addr += obj_addr;
 
-	}
+        }
 
-      ACE_CString name_service ("/NameService",	0, 1);
+      ACE_CString name_service ("/NameService", 0, 1);
       corbaloc_addr += name_service;
 
-      // Obtain	a reference to the naming context
-      CORBA::Object_var	name_context =
-	orb->string_to_object (corbaloc_addr.c_str (),
-			       ACE_TRY_ENV);
+      // Obtain a reference to the naming context
+      CORBA::Object_var name_context =
+        orb->string_to_object (corbaloc_addr.c_str ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check if the Object reference is nil.
-      if (CORBA::is_nil	(name_context.in ()))
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Cannot resolve Naming Service: CORBANAME_Parser\n"),
-			  0);
+      if (CORBA::is_nil (name_context.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot resolve Naming Service: CORBANAME_Parser\n"),
+                          0);
 
       CORBA::Boolean is_a =
-	name_context->_is_a ("IDL:omg.org/CosNaming/NamingContextExt:1.0",
-			     ACE_TRY_ENV);
+        name_context->_is_a ("IDL:omg.org/CosNaming/NamingContextExt:1.0"
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!is_a)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "Cannot narrow Naming Service: "
-			     "CORBANAME_Parser\n"),
-			    0);
-	}
-
-      // Make a	dynamic	request	for resolve_str	in this	naming context
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Cannot narrow Naming Service: "
+                             "CORBANAME_Parser\n"),
+                            0);
+        }
+
+      // Make a dynamic request for resolve_str in this naming context
       obj = this->parse_string_dynamic_request_helper (name_context.in (),
-						       key_string,
-						       ACE_TRY_ENV);
+                                                       key_string
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, ex)
@@ -214,18 +214,18 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
         }
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (CORBA::Object::_nil	());
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return obj;
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser,
-		       ACE_TEXT	("CORBANAME_Parser"),
-		       ACE_SVC_OBJ_T,
-		       &ACE_SVC_NAME (TAO_CORBANAME_Parser),
-		       ACE_Service_Type::DELETE_THIS |
-				  ACE_Service_Type::DELETE_OBJ,
-		       0)
+                       ACE_TEXT ("CORBANAME_Parser"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_CORBANAME_Parser),
+                       ACE_Service_Type::DELETE_THIS |
+                                  ACE_Service_Type::DELETE_OBJ,
+                       0)
 
 ACE_FACTORY_DEFINE (TAO, TAO_CORBANAME_Parser)
 
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index aa51485b9a4..816419ee07b 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -45,15 +45,15 @@ public:
   //   IOR_Parser.h
   virtual int match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb,
-                                          CORBA::Environment &)
+                                          CORBA::ORB_ptr orb
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
   virtual CORBA::Object_ptr
     parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
-                                         ACE_CString &key_string,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                         ACE_CString &key_string
+                                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/ClientInterceptorAdapter.cpp b/TAO/tao/ClientInterceptorAdapter.cpp
index 58401947578..6d0dd33163b 100644
--- a/TAO/tao/ClientInterceptorAdapter.cpp
+++ b/TAO/tao/ClientInterceptorAdapter.cpp
@@ -22,8 +22,8 @@ TAO_ClientRequestInterceptor_Adapter::
 
 void
 TAO_ClientRequestInterceptor_Adapter::
-send_request (TAO_ClientRequestInfo *ri,
-              CORBA::Environment &ACE_TRY_ENV)
+send_request (TAO_ClientRequestInfo *ri
+              TAO_ENV_ARG_DECL)
 {
   // This method implements one of the "starting" client side
   // interception point.
@@ -44,7 +44,7 @@ send_request (TAO_ClientRequestInfo *ri,
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      this->process_forward_request (ri, exc, ACE_TRY_ENV);
+      this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -53,8 +53,8 @@ send_request (TAO_ClientRequestInfo *ri,
 
 void
 TAO_ClientRequestInterceptor_Adapter::
-receive_reply (TAO_ClientRequestInfo *ri,
-               CORBA::Environment &ACE_TRY_ENV)
+receive_reply (TAO_ClientRequestInfo *ri
+               TAO_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -79,8 +79,6 @@ receive_reply (TAO_ClientRequestInfo *ri,
       ACE_CHECK;
     }
 
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   // The receive_reply() interception point does not raise a
   // PortableInterceptor::ForwardRequest exception so there is no need
   // to attempt to catch it here.
@@ -88,8 +86,8 @@ receive_reply (TAO_ClientRequestInfo *ri,
 
 void
 TAO_ClientRequestInterceptor_Adapter::
-receive_exception (TAO_ClientRequestInfo *ri,
-                   CORBA::Environment &ACE_TRY_ENV)
+receive_exception (TAO_ClientRequestInfo *ri
+                   TAO_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -118,7 +116,7 @@ receive_exception (TAO_ClientRequestInfo *ri,
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      this->process_forward_request (ri, exc, ACE_TRY_ENV);
+      this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -135,11 +133,11 @@ receive_exception (TAO_ClientRequestInfo *ri,
 
       ri->exception (&ACE_ANY_EXCEPTION);
 
-      this->receive_exception (ri, ACE_TRY_ENV);
+      this->receive_exception (ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus status =
-        ri->reply_status (ACE_TRY_ENV);
+        ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only re-throw the exception if it hasn't been transformed by
@@ -155,8 +153,8 @@ receive_exception (TAO_ClientRequestInfo *ri,
 
 void
 TAO_ClientRequestInterceptor_Adapter::
-receive_other (TAO_ClientRequestInfo *ri,
-               CORBA::Environment &ACE_TRY_ENV)
+receive_other (TAO_ClientRequestInfo *ri
+               TAO_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -185,7 +183,7 @@ receive_other (TAO_ClientRequestInfo *ri,
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      this->process_forward_request (ri, exc, ACE_TRY_ENV);
+      this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -195,18 +193,18 @@ receive_other (TAO_ClientRequestInfo *ri,
 void
 TAO_ClientRequestInterceptor_Adapter::process_forward_request (
   TAO_ClientRequestInfo *ri,
-  PortableInterceptor::ForwardRequest &exc,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ForwardRequest &exc
+  TAO_ENV_ARG_DECL)
 {
   ri->forward_reference (exc);
 
   this->invoke_status_ =
-    this->invocation_->location_forward (exc.forward.in (), ACE_TRY_ENV);
+    this->invocation_->location_forward (exc.forward.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // receive_other() is potentially invoked recursively.
-  this->receive_other (ri,
-                       ACE_TRY_ENV);
+  this->receive_other (ri
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/ClientInterceptorAdapter.h b/TAO/tao/ClientInterceptorAdapter.h
index ae48fc9bb8e..828438a8316 100644
--- a/TAO/tao/ClientInterceptorAdapter.h
+++ b/TAO/tao/ClientInterceptorAdapter.h
@@ -70,23 +70,23 @@ public:
   //@{
   /// This method implements one of the "starting" client side
   /// interception points.
-  void send_request (TAO_ClientRequestInfo *ri,
-                     CORBA::Environment &);
+  void send_request (TAO_ClientRequestInfo *ri
+                     TAO_ENV_ARG_DECL_NOT_USED);
 
   /// This method implements one of the "ending" client side
   /// interception point.
-  void receive_reply (TAO_ClientRequestInfo *ri,
-                      CORBA::Environment &);
+  void receive_reply (TAO_ClientRequestInfo *ri
+                      TAO_ENV_ARG_DECL_NOT_USED);
 
   /// This method implements one of the "ending" client side
   /// interception point.
-  void receive_exception (TAO_ClientRequestInfo *ri,
-                          CORBA::Environment &);
+  void receive_exception (TAO_ClientRequestInfo *ri
+                          TAO_ENV_ARG_DECL_NOT_USED);
 
   /// This method implements one of the "ending" client side
   /// interception point.
-  void receive_other (TAO_ClientRequestInfo *ri,
-                      CORBA::Environment &);
+  void receive_other (TAO_ClientRequestInfo *ri
+                      TAO_ENV_ARG_DECL_NOT_USED);
   //@}
 
 protected:
@@ -95,8 +95,8 @@ protected:
   /// i.e. invoke the receive_other() interception point, in addition
   /// to notifying the Invocation object of the LOCATION_FORWARD.
   void process_forward_request (TAO_ClientRequestInfo *ri,
-                                PortableInterceptor::ForwardRequest &exc,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                PortableInterceptor::ForwardRequest &exc
+                                TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index da2cbcd1412..72692b0040a 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -30,14 +30,14 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO_GIOP_Invocation *inv,
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::target (CORBA::Environment &)
+TAO_ClientRequestInfo::target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->target_);
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (CORBA::Environment &)
+TAO_ClientRequestInfo::effective_target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
@@ -52,7 +52,7 @@ TAO_ClientRequestInfo::effective_target (CORBA::Environment &)
 }
 
 IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::effective_profile (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::TaggedProfile *tagged_profile = 0;
@@ -80,7 +80,7 @@ TAO_ClientRequestInfo::effective_profile (CORBA::Environment &ACE_TRY_ENV)
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ClientRequestInfo::received_exception (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::received_exception (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -116,7 +116,7 @@ TAO_ClientRequestInfo::received_exception (CORBA::Environment &ACE_TRY_ENV)
 // = TAO specific method done since there currently is no simple way
 //   to extract exceptions from an Any
 CORBA::Exception *
-TAO_ClientRequestInfo::_received_exception (CORBA::Environment &)
+TAO_ClientRequestInfo::_received_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->caught_exception_;
@@ -124,7 +124,7 @@ TAO_ClientRequestInfo::_received_exception (CORBA::Environment &)
 
 char *
 TAO_ClientRequestInfo::received_exception_id (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -140,8 +140,8 @@ TAO_ClientRequestInfo::received_exception_id (
 
 IOP::TaggedComponent *
 TAO_ClientRequestInfo::get_effective_component (
-    IOP::ComponentId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ComponentId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Tagged_Components &ecs =
@@ -185,8 +185,8 @@ TAO_ClientRequestInfo::get_effective_component (
 
 IOP::TaggedComponentSeq *
 TAO_ClientRequestInfo::get_effective_components (
-    IOP::ComponentId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ComponentId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Tagged_Components &ecs =
@@ -239,15 +239,15 @@ TAO_ClientRequestInfo::get_effective_components (
 }
 
 CORBA::Policy_ptr
-TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Do we need to look anywhere else for the request policies?
 
 #if TAO_HAS_CORBA_MESSAGING == 1
-  return this->target_->_get_policy (type,
-                                     ACE_TRY_ENV);
+  return this->target_->_get_policy (type
+                                      TAO_ENV_ARG_PARAMETER);
 #else
   ACE_UNUSED_ARG (type);
 
@@ -263,8 +263,8 @@ TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type,
 void
 TAO_ClientRequestInfo::add_request_service_context (
     const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Boolean replace
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -279,7 +279,7 @@ TAO_ClientRequestInfo::add_request_service_context (
 }
 
 CORBA::ULong
-TAO_ClientRequestInfo::request_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @todo We may have to worry about AMI once we support interceptors
@@ -359,14 +359,14 @@ TAO_ClientRequestInfo::request_id (CORBA::Environment &ACE_TRY_ENV)
 }
 
 char *
-TAO_ClientRequestInfo::operation (CORBA::Environment &)
+TAO_ClientRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->invocation_->operation ());
 }
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -375,7 +375,7 @@ TAO_ClientRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -384,7 +384,7 @@ TAO_ClientRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -393,7 +393,7 @@ TAO_ClientRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -402,7 +402,7 @@ TAO_ClientRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -411,7 +411,7 @@ TAO_ClientRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (CORBA::Environment &)
+TAO_ClientRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->response_expected_;
@@ -419,7 +419,7 @@ TAO_ClientRequestInfo::response_expected (CORBA::Environment &)
 
 # if TAO_HAS_CORBA_MESSAGING == 1
 CORBA::Short
-TAO_ClientRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Oneway_Invocation *inv =
@@ -442,7 +442,7 @@ TAO_ClientRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ == -1)
@@ -455,7 +455,7 @@ TAO_ClientRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
@@ -470,8 +470,8 @@ TAO_ClientRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -493,14 +493,14 @@ TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id,
   // PICurrent is read-only during a request invocation on the client
   // side.  No copying is necessary.
   return
-    pi_current->get_slot (id,
-                          ACE_TRY_ENV);
+    pi_current->get_slot (id
+                           TAO_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_request_service_context (
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -508,15 +508,15 @@ TAO_ClientRequestInfo::get_request_service_context (
     this->invocation_->request_service_context ();
 
   return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
+                                      id
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_reply_service_context (
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -524,15 +524,15 @@ TAO_ClientRequestInfo::get_reply_service_context (
     this->invocation_->reply_service_context ();
 
   return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
+                                      id
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_service_context_i (
     TAO_Service_Context &service_context_list,
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a new service context to be returned.  Assume
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index a5c78d180d4..be0c5220b21 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -60,43 +60,43 @@ public:
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
   virtual CORBA::ULong request_id (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the operation name for the current request.
   virtual char * operation (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of arguments passed to the current operation.
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
   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 Dynamic::ContextList * contexts (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::RequestContext * operation_context (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns true for a two-way operation, and false otherwise.
   virtual CORBA::Boolean response_expected (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 #if TAO_HAS_CORBA_MESSAGING == 1
@@ -104,7 +104,7 @@ public:
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
   virtual CORBA::Short sync_scope (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -113,50 +113,50 @@ public:
   /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT,
   /// TRANSPORT_RETRY.
   virtual PortableInterceptor::ReplyStatus reply_status (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
   /// object reference to which the request was forwarded.
   virtual CORBA::Object_ptr forward_reference (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   virtual CORBA::Any * get_slot (
-      PortableInterceptor::SlotId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      PortableInterceptor::SlotId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
-      IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      IOP::ServiceId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
   virtual IOP::ServiceContext * get_reply_service_context (
-      IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      IOP::ServiceId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
   virtual CORBA::Object_ptr target (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
   virtual CORBA::Object_ptr effective_target (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IOP::TaggedProfile * effective_profile (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return an Any containing the received exception, if any.
@@ -165,7 +165,7 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   virtual CORBA::Any * received_exception (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -174,43 +174,43 @@ public:
    *       possible.
    */
   virtual CORBA::Exception * _received_exception (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the repository ID for the received exception.
   virtual char * received_exception_id (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the first IOP::TaggedComponent that matches the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
   virtual IOP::TaggedComponent * get_effective_component (
-      IOP::ComponentId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      IOP::ComponentId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return all IOP::TaggedComponent(s) that match the given
   /// IOP::ComponentId in the object reference for the current
   /// target.
   virtual IOP::TaggedComponentSeq * get_effective_components (
-      IOP::ComponentId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      IOP::ComponentId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the policy of the given type in effect for the current
   /// request.
   virtual CORBA::Policy_ptr get_request_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      CORBA::PolicyType type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the IOP::ServiceContext to the request (outgoing)
   /// IOP::ServiceContextList.
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
-      CORBA::Boolean replace,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      CORBA::Boolean replace
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -243,8 +243,8 @@ protected:
   /// Helper method to get the request and response service contexts.
   IOP::ServiceContext *get_service_context_i (
       TAO_Service_Context &service_context_list,
-      IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV)
+      IOP::ServiceId id
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp
index 9a4b57e4dfa..29e51369bf3 100644
--- a/TAO/tao/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory.cpp
@@ -14,10 +14,10 @@ TAO_CodecFactory::TAO_CodecFactory (void)
 }
 
 IOP::Codec_ptr
-TAO_CodecFactory::create_codec (const IOP::Encoding & enc,
-				CORBA::Environment &ACE_TRY_ENV)
+TAO_CodecFactory::create_codec (const IOP::Encoding & enc
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::CodecFactory::UnknownEncoding))
+                   IOP::CodecFactory::UnknownEncoding))
 {
   // @todo: Ideally we should have some sort of CodecFactory
   //        registry to make it possible to add factories
@@ -36,30 +36,30 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc,
       //    value (0) is used instead.
     case 0 /* IOP::ENCODING_CDR_ENCAPS */:
       if (enc.major_version < 1)
-	{
-	  // There is no such thing as a "0.x" CDR encapsulation.
-	  ACE_THROW_RETURN (CORBA::BAD_PARAM (
+        {
+          // There is no such thing as a "0.x" CDR encapsulation.
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (
                               CORBA_SystemException::_tao_minor_code (
-				TAO_DEFAULT_MINOR_CODE,
-				EINVAL),
-			      CORBA::COMPLETED_NO),
-			    IOP::Codec::_nil ());
-	}
+                                TAO_DEFAULT_MINOR_CODE,
+                                EINVAL),
+                              CORBA::COMPLETED_NO),
+                            IOP::Codec::_nil ());
+        }
 
       ACE_NEW_THROW_EX (codec,
-			TAO_CDR_Encaps_Codec (enc.major_version,
-					      enc.minor_version),
-			CORBA::NO_MEMORY (
+                        TAO_CDR_Encaps_Codec (enc.major_version,
+                                              enc.minor_version),
+                        CORBA::NO_MEMORY (
                           CORBA_SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
-			    ENOMEM),
-			  CORBA::COMPLETED_MAYBE));
+                            ENOMEM),
+                          CORBA::COMPLETED_MAYBE));
       ACE_CHECK_RETURN (IOP::Codec::_nil ());
       break;
 
     default:
       ACE_THROW_RETURN (IOP::CodecFactory::UnknownEncoding (),
-			IOP::Codec::_nil ());
+                        IOP::Codec::_nil ());
 
     }
 
diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h
index 3e0c9f03508..bd2b28fc4cb 100644
--- a/TAO/tao/CodecFactory.h
+++ b/TAO/tao/CodecFactory.h
@@ -52,11 +52,10 @@ public:
   TAO_CodecFactory (void);
 
   /// Create a Coder/Decoder for the given type of encoding.
-  virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc,
-				       CORBA::Environment &ACE_TRY_ENV =
-				         TAO_default_environment ())
+  virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::CodecFactory::UnknownEncoding));
+                     IOP::CodecFactory::UnknownEncoding));
 
 private:
 
diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp
index 236c04f8eb4..fe134990c9e 100644
--- a/TAO/tao/CodecFactory_ORBInitializer.cpp
+++ b/TAO/tao/CodecFactory_ORBInitializer.cpp
@@ -15,8 +15,6 @@ TAO_CodecFactory_ORBInitializer::pre_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   // The CodecFactory is stateless and reentrant, so share a single
   // instance between all ORBs.
   if (CORBA::is_nil (this->codec_factory_.in ()))
@@ -35,8 +33,8 @@ TAO_CodecFactory_ORBInitializer::pre_init (
     }
 
   info->register_initial_reference ("CodecFactory",
-                                    this->codec_factory_.in (),
-                                    ACE_TRY_ENV);
+                                    this->codec_factory_.in ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
index 1388d4c9238..b17b58fd185 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -38,8 +38,8 @@ public:
   virtual ~TAO_Collocation_Resolver (void);
 
   /// Is <object> collocated?
-  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object,
-                                        CORBA::Environment &ACE_TRY_ENV) const = 0;
+  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
+                                        TAO_ENV_ARG_DECL) const = 0;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 20b0985707f..62fb33b84ff 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -265,8 +265,8 @@ TAO_Connector_Registry::preprocess_preconnects (TAO_ORB_Core *orb_core,
 
 int
 TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation,
-                                 TAO_Transport_Descriptor_Interface *desc,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 TAO_Transport_Descriptor_Interface *desc
+                                 TAO_ENV_ARG_DECL)
 {
   TAO_Endpoint *endpoint = desc->endpoint ();
   if (endpoint == 0)
@@ -280,14 +280,14 @@ TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation,
       return -1;
 
   return connector->connect (invocation,
-                             desc,
-                             ACE_TRY_ENV);
+                             desc
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_Connector_Registry::make_mprofile (const char *ior,
-                                       TAO_MProfile &mprofile,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       TAO_MProfile &mprofile
+                                       TAO_ENV_ARG_DECL)
 {
   if (!ior)
     // Failure: Null IOR string pointer
@@ -308,8 +308,8 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
       if (*connector)
         {
           int mp_result = (*connector)->make_mprofile (ior,
-                                                       mprofile,
-                                                       ACE_TRY_ENV);
+                                                       mprofile
+                                                        TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (mp_result);
 
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index d9ffdc92fee..28710b174be 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -83,14 +83,14 @@ public:
    * connector.
    */
   int connect (TAO_GIOP_Invocation *invocation,
-               TAO_Transport_Descriptor_Interface *desc,
-               CORBA::Environment &ACE_TRY_ENV);
+               TAO_Transport_Descriptor_Interface *desc
+               TAO_ENV_ARG_DECL);
 
   /// Parse a string containing a URL style IOR and return an
   /// MProfile.
   int make_mprofile (const char *ior,
-                     TAO_MProfile &mprofile,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     TAO_MProfile &mprofile
+                     TAO_ENV_ARG_DECL);
 
   /// Create a profile based on the contents of <cdr>
   TAO_Profile* create_profile (TAO_InputCDR& cdr);
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 1fa88e21545..a59e33592bc 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -58,11 +58,11 @@ tao_CORBA_Current_nil (
 
 CORBA_Current_ptr
 tao_CORBA_Current_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_Current::_narrow (p, ACE_TRY_ENV);
+  return CORBA_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -123,7 +123,7 @@ CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast 
+CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -183,11 +183,11 @@ CORBA_Current_var::tao_nil (void)
 
 ::CORBA_Current_ptr
 CORBA_Current_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Current::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -265,18 +265,18 @@ CORBA_Current::CORBA_Current (void)
   // destructor
   CORBA_Current::~CORBA_Current (void)
   {}
-  
+
   CORBA_Current_ptr CORBA_Current::_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL
     )
   {
-    return CORBA_Current::_unchecked_narrow (obj, ACE_TRY_ENV);
+    return CORBA_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
   }
-  
+
   CORBA_Current_ptr CORBA_Current::_unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -314,7 +314,7 @@ void *CORBA_Current::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 4c7587730ed..7ddc4f055e2 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -71,31 +71,31 @@ class TAO_Export CORBA_Current_var : public TAO_Base_var
 {
 public:
   CORBA_Current_var (void); // default constructor
-  CORBA_Current_var (CORBA_Current_ptr p) : ptr_ (p) {} 
+  CORBA_Current_var (CORBA_Current_ptr p) : ptr_ (p) {}
   CORBA_Current_var (const CORBA_Current_var &); // copy constructor
   ~CORBA_Current_var (void); // destructor
-  
+
   CORBA_Current_var &operator= (CORBA_Current_ptr);
   CORBA_Current_var &operator= (const CORBA_Current_var &);
   CORBA_Current_ptr operator-> (void) const;
-  
+
   operator const CORBA_Current_ptr &() const;
   operator CORBA_Current_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_Current_ptr in (void) const;
   CORBA_Current_ptr &inout (void);
   CORBA_Current_ptr &out (void);
   CORBA_Current_ptr _retn (void);
   CORBA_Current_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_Current_ptr tao_duplicate (CORBA_Current_ptr);
   static void tao_release (CORBA_Current_ptr);
   static CORBA_Current_ptr tao_nil (void);
   static CORBA_Current_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -147,34 +147,32 @@ public:
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   static int _tao_class_id;
-  
+
   // The static operations.
   static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj);
-  
+
   static CORBA_Current_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
   static CORBA_Current_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-  
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
   static CORBA_Current_ptr _nil (void)
     {
       return (CORBA_Current_ptr)0;
     }
-  
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   CORBA_Current (void);
-  
+
   virtual ~CORBA_Current (void);
 
 private:
diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp
index cca757f2fe6..4c95981bc45 100644
--- a/TAO/tao/DLL_ORB.cpp
+++ b/TAO/tao/DLL_ORB.cpp
@@ -60,8 +60,8 @@ TAO_DLL_ORB::init (int /*argc*/, ACE_TCHAR *argv[])
       // Initialize the ORB.
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.argv (),
-                                    "",
-                                    ACE_TRY_ENV);
+                                    ""
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->orb_.in ()))
@@ -91,7 +91,7 @@ TAO_DLL_ORB::fini (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->orb_->destroy (ACE_TRY_ENV);
+      this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_Singleton_Manager::instance ()->fini () == -1)
@@ -115,7 +115,7 @@ TAO_DLL_ORB::svc (void)
   ACE_TRY_NEW_ENV
     {
       // Run the ORB event loop in its own thread.
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index f03dce6a0d4..231cc09084c 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -29,8 +29,8 @@ TAO_DLL_Parser::match_prefix (const char *ior_string) const
 
 CORBA::Object_ptr
 TAO_DLL_Parser::parse_string (const char *ior,
-                              CORBA::ORB_ptr orb,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::ORB_ptr orb
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
@@ -52,7 +52,7 @@ TAO_DLL_Parser::parse_string (const char *ior,
          CORBA::Object::_nil ());
     }
 
-  return loader->create_object (orb, 0, 0, ACE_TRY_ENV);
+  return loader->create_object (orb, 0, 0 TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser,
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 15b3dfa6376..188528c222b 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -42,7 +42,7 @@
  * object while other times they may use a remote implementation.
  * For example, the application could be configured to use a remote
  * Event Service or to dynamically load an Event Service
- * implementation and use the local copy instead.  The local Event 
+ * implementation and use the local copy instead.  The local Event
  * Service would federate to its remote peers to work as-if a single
  * Event Service was in place.
  *
@@ -83,8 +83,8 @@ public:
   //   IOR_Parser.h
   virtual int match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb,
-                                          CORBA::Environment &)
+                                          CORBA::ORB_ptr orb
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index f754ee649b4..ef9c8569db2 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -11,8 +11,8 @@ ACE_RCSID(tao, Default_Collocation_Resolver, "$Id$")
 #endif /* ! __ACE_INLINE__ */
 
 CORBA::Boolean
-TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object,
-                                                 CORBA::Environment &) const
+TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
+                                                 TAO_ENV_ARG_DECL_NOT_USED) const
 {
   return object->_is_collocated ();
 }
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
index 352a06a8d06..8b35dfbf21e 100644
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -36,8 +36,8 @@ class TAO_Export TAO_Default_Collocation_Resolver :
 public:
 
   /// Is <object> collocated?
-  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object,
-                                        CORBA::Environment &ACE_TRY_ENV) const;
+  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
+                                        TAO_ENV_ARG_DECL) const;
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver)
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index 1d84abb1a04..a4a9967d201 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -19,8 +19,8 @@ TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (v
 
 
 TAO_Invocation_Endpoint_Selector *
-TAO_Default_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *,
-                                             CORBA::Environment &)
+TAO_Default_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *
+                                             TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Trivial endpoint selector.  Just return the default selector.
   return this->default_endpoint_selector_;
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index 6876c1bb317..2f878a7660f 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -60,8 +60,8 @@ public:
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
-                             TAO_GIOP_Invocation *invocation,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             TAO_GIOP_Invocation *invocation
+                             TAO_ENV_ARG_DECL);
 
 protected:
   /// The possible endpoint selector strategies that can be
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index 6e356be1282..cf6bb5600b8 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -18,8 +18,8 @@ TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void)
 }
 
 void
-TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *,
-                                         CORBA::Environment &)
+TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -44,8 +44,8 @@ TAO_Default_Protocols_Hooks::call_server_protocols_hook (int &,
 void
 TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &,
                                                           CORBA::Policy *,
-                                                          CORBA::Short &,
-                                                          CORBA::Environment &)
+                                                          CORBA::Short &
+                                                          TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -66,50 +66,50 @@ TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook (CORBA::Policy *,
 }
 
 int
-TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &,
-                                                        CORBA::Environment &)
+TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &
+                                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &,
-                                                         CORBA::Environment &)
+TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &
+                                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
 TAO_Default_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                                   CORBA::Short &,
-                                                                   CORBA::Environment &)
+                                                                   CORBA::Short &
+                                                                   TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short,
-                                                        CORBA::Environment &)
+TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short
+                                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short,
-                                                         CORBA::Environment &)
+TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short
+                                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::set_default_policies (CORBA::Environment &)
+TAO_Default_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &,
-                                                                 CORBA::Environment &)
+TAO_Default_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &
+                                                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
@@ -117,8 +117,8 @@ TAO_Default_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Re
 void
 TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
                                                  TAO_Service_Context &,
-                                                 CORBA::Boolean ,
-                                                 CORBA::Environment &)
+                                                 CORBA::Boolean
+                                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index 5069bc8caf1..86f06e61585 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -29,8 +29,8 @@ public:
   /// destructor
   virtual ~TAO_Default_Protocols_Hooks (void);
 
-  virtual void init_hooks (TAO_ORB_Core *orb_core,
-                           CORBA::Environment &ACE_TRY_ENV);
+  virtual void init_hooks (TAO_ORB_Core *orb_core
+                           TAO_ENV_ARG_DECL);
 
   virtual int call_client_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
@@ -44,13 +44,13 @@ public:
 
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
-                                   CORBA::Boolean restart,
-                                   CORBA::Environment &ACE_TRY_ENV);
+                                   CORBA::Boolean restart
+                                   TAO_ENV_ARG_DECL);
 
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
-                                            CORBA::Short &client_priority,
-                                            CORBA::Environment &ACE_TRY_ENV);
+                                            CORBA::Short &client_priority
+                                            TAO_ENV_ARG_DECL);
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
@@ -63,26 +63,26 @@ public:
                                                CORBA::Short &p,
                                                int &in_range);
 
-  virtual int get_thread_CORBA_priority (CORBA::Short &,
-                                         CORBA::Environment &);
+  virtual int get_thread_CORBA_priority (CORBA::Short &
+                                         TAO_ENV_ARG_DECL_NOT_USED);
 
-  virtual int get_thread_native_priority (CORBA::Short &,
-                                          CORBA::Environment &);
+  virtual int get_thread_native_priority (CORBA::Short &
+                                          TAO_ENV_ARG_DECL_NOT_USED);
 
   virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                    CORBA::Short &,
-                                                    CORBA::Environment &);
+                                                    CORBA::Short &
+                                                    TAO_ENV_ARG_DECL_NOT_USED);
 
-  virtual int set_thread_CORBA_priority (CORBA::Short,
-                                         CORBA::Environment &);
+  virtual int set_thread_CORBA_priority (CORBA::Short
+                                         TAO_ENV_ARG_DECL_NOT_USED);
 
-  virtual int set_thread_native_priority (CORBA::Short,
-                                          CORBA::Environment &);
+  virtual int set_thread_native_priority (CORBA::Short
+                                          TAO_ENV_ARG_DECL_NOT_USED);
 
-  virtual int set_default_policies (CORBA::Environment &ACE_TRY_ENV);
+  virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL);
 
-  virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
-                                                  CORBA::Environment &ACE_TRY_ENV);
+  virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
+                                                  TAO_ENV_ARG_DECL);
 
 };
 
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index 71d06b4f938..369ef406ade 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -12,8 +12,8 @@ TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
 TAO_Stub *
 TAO_Default_Stub_Factory::create_stub (const char *repository_id,
                                const TAO_MProfile &profiles,
-                               TAO_ORB_Core *orb_core,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               TAO_ORB_Core *orb_core
+                               TAO_ENV_ARG_DECL)
 {
   TAO_Stub *retval = 0;
 
diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h
index 75d3ddc1445..ddad28d8717 100644
--- a/TAO/tao/Default_Stub_Factory.h
+++ b/TAO/tao/Default_Stub_Factory.h
@@ -45,8 +45,8 @@ public:
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core,
-                                 CORBA::Environment &ACE_TRY_ENV);
+                                 TAO_ORB_Core *orb_core
+                                 TAO_ENV_ARG_DECL);
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory)
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index 719d8e852a9..1c7052e675c 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -29,11 +29,11 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma
 }
 
 int
-TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (CORBA_Environment &ACE_TRY_ENV)
+TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (TAO_ENV_SINGLE_ARG_DECL)
 {
   int result =
-    this->lane_resources_->open_acceptor_registry (0,
-                                                   ACE_TRY_ENV);
+    this->lane_resources_->open_acceptor_registry (0
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 35d8ddc685f..3464929b539 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -161,36 +161,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_DomainManager *tao_impl
     ,
-    const CORBA::PolicyType & policy_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::PolicyType & policy_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::Policy_ptr result);
@@ -209,8 +205,8 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_DomainManager *tao_impl,
-    const CORBA::PolicyType & policy_type,
-    CORBA::Environment &
+    const CORBA::PolicyType & policy_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -218,12 +214,12 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::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;
@@ -239,25 +235,25 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::E
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::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_DomainManager_get_domain_policy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::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;
@@ -269,7 +265,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Envi
 
 char *
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -278,11 +274,11 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::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
@@ -321,18 +317,18 @@ _TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Pro
 
 _TAO_CORBA_DomainManager_Proxy_Impl&
 _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::DomainManager *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA::DomainManager *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];
@@ -341,8 +337,8 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_DomainManager_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_);
@@ -412,8 +408,8 @@ _TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (vo
 
 CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
     CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PolicyType policy_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -428,8 +424,8 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "get_domain_policy",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -438,8 +434,8 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
           "IDL:omg.org/CORBA/DomainManager:1.0"
         )
     )->get_domain_policy (
-        policy_type,
-        ACE_TRY_ENV
+        policy_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -466,8 +462,8 @@ POA_CORBA_DomainManager::~POA_CORBA_DomainManager (void)
 void POA_CORBA_DomainManager::get_domain_policy_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 ();
@@ -496,20 +492,20 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      policy_type,
-      ACE_TRY_ENV
+      policy_type
+      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_domain_policy (
-          policy_type,
-          ACE_TRY_ENV
+          policy_type
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -518,20 +514,20 @@ void POA_CORBA_DomainManager::get_domain_policy_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
@@ -552,16 +548,13 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
     ACE_THROW (CORBA::MARSHAL());
 
   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_DomainManager::_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 ();
@@ -571,7 +564,7 @@ void POA_CORBA_DomainManager::_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 ();
@@ -583,12 +576,12 @@ void POA_CORBA_DomainManager::_is_a_skel (
 void POA_CORBA_DomainManager::_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_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _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 ();
@@ -600,8 +593,8 @@ void POA_CORBA_DomainManager::_non_existent_skel (
 void POA_CORBA_DomainManager::_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_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference;
@@ -620,7 +613,7 @@ void POA_CORBA_DomainManager::_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 ();
@@ -646,11 +639,11 @@ void POA_CORBA_DomainManager::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_DomainManager::_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 (
@@ -672,12 +665,12 @@ void* POA_CORBA_DomainManager::_downcast (
   return 0;
 }
 
-void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_DomainManager::_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);
 }
 
 const char* POA_CORBA_DomainManager::_interface_repository_id (void) const
@@ -686,9 +679,9 @@ const char* POA_CORBA_DomainManager::_interface_repository_id (void) const
 }
 
 CORBA::DomainManager*
-POA_CORBA_DomainManager::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_DomainManager::_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);
@@ -826,36 +819,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstructionPolicy *tao_impl
     ,
     CORBA::InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & constr_policy
+    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));
 
 
@@ -875,8 +864,8 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstructionPolicy *tao_impl,
     CORBA::InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy,
-    CORBA::Environment &
+    const CORBA::Boolean & constr_policy
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -885,12 +874,12 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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;
@@ -909,25 +898,25 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (C
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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_ConstructionPolicy_make_domain_manager::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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;
@@ -935,7 +924,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (CORB
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -944,11 +933,11 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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 */
@@ -980,18 +969,18 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strat
 
 _TAO_CORBA_ConstructionPolicy_Proxy_Impl&
 _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ConstructionPolicy *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ConstructionPolicy *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];
@@ -1000,8 +989,8 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_ConstructionPolicy_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_);
@@ -1072,8 +1061,8 @@ _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_TAO_ConstructionPolicy_ThruPOA_Prox
 void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean constr_policy
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1086,8 +1075,8 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "make_domain_manager",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -1097,8 +1086,8 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
         )
     )->make_domain_manager (
         object_type,
-        constr_policy,
-        ACE_TRY_ENV
+        constr_policy
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -1127,8 +1116,8 @@ POA_CORBA_ConstructionPolicy::~POA_CORBA_ConstructionPolicy (void)
 void POA_CORBA_ConstructionPolicy::make_domain_manager_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 ();
@@ -1160,40 +1149,40 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
       _tao_upcall,
       _tao_impl,
       object_type.in (),
-      constr_policy,
-      ACE_TRY_ENV
+      constr_policy
+      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->make_domain_manager (
           object_type.in (),
-          constr_policy,
-          ACE_TRY_ENV
+          constr_policy
+          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
@@ -1207,16 +1196,13 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
   _tao_server_request.init_reply ();
 
   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_ConstructionPolicy::_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 ();
@@ -1226,7 +1212,7 @@ void POA_CORBA_ConstructionPolicy::_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 ();
@@ -1238,12 +1224,12 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel (
 void POA_CORBA_ConstructionPolicy::_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_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _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 ();
@@ -1255,8 +1241,8 @@ void POA_CORBA_ConstructionPolicy::_non_existent_skel (
 void POA_CORBA_ConstructionPolicy::_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_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference;
@@ -1275,7 +1261,7 @@ void POA_CORBA_ConstructionPolicy::_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 ();
@@ -1301,11 +1287,11 @@ void POA_CORBA_ConstructionPolicy::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ConstructionPolicy::_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 (
@@ -1330,12 +1316,12 @@ void* POA_CORBA_ConstructionPolicy::_downcast (
   return 0;
 }
 
-void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ConstructionPolicy::_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);
 }
 
 const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const
@@ -1344,9 +1330,9 @@ const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const
 }
 
 CORBA_ConstructionPolicy*
-POA_CORBA_ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ConstructionPolicy::_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/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 74f8504bc6f..6ac9df55722 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -66,10 +66,9 @@
 
 
     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,42 +77,40 @@
     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::DomainManager *_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::Policy_ptr get_domain_policy (
-        CORBA::PolicyType policy_type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::PolicyType policy_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -121,8 +118,8 @@
     static void get_domain_policy_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,16 +138,16 @@
     virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void);
 
     virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
-      ::CORBA::DomainManager *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::CORBA::DomainManager *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
     );
 
     // Caches the proxy implementations. The proxy implementation
@@ -189,8 +186,8 @@
 
     virtual CORBA::Policy_ptr get_domain_policy (
         CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::PolicyType policy_type,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::PolicyType policy_type
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -221,10 +218,9 @@
 
 
     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
@@ -233,43 +229,41 @@
     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_ConstructionPolicy *_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 void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean constr_policy
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -277,33 +271,30 @@
     static void make_domain_manager_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_policy_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 copy_skel (
         TAO_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,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
@@ -321,16 +312,16 @@
     virtual ~_TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
 
     virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
-      CORBA_ConstructionPolicy *object,
-      CORBA_Environment &ACE_TRY_ENV
+      CORBA_ConstructionPolicy *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
     );
 
     // Caches the proxy implementations. The proxy implementation
@@ -372,8 +363,8 @@
     virtual void make_domain_manager (
         CORBA::Object_ptr _collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Boolean constr_policy
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/Domain/DomainS.i b/TAO/tao/Domain/DomainS.i
index a5a7e8686dd..e02dec11a7e 100644
--- a/TAO/tao/Domain/DomainS.i
+++ b/TAO/tao/Domain/DomainS.i
@@ -22,45 +22,45 @@
 ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
   POA_CORBA_Policy::_get_policy_type_skel (
       req,
       (POA_CORBA_Policy_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstructionPolicy::copy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
   POA_CORBA_Policy::copy_skel (
       req,
       (POA_CORBA_Policy_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
   POA_CORBA_Policy::destroy_skel (
       req,
       (POA_CORBA_Policy_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 512ecdf2eb9..08cacb8d638 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -62,14 +62,12 @@
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Policy_ptr get_domain_policy (
-        CORBA::PolicyType policy_type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::PolicyType policy_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
@@ -114,39 +112,34 @@
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean constr_policy
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     CORBA::Policy_ptr copy (
-        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
       ));
diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.i
index ccb44497ec0..a31fb10cbd6 100644
--- a/TAO/tao/Domain/DomainS_T.i
+++ b/TAO/tao/Domain/DomainS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_DomainManager_tie<T>::POA_CORBA_DomainManager_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_DomainManager_tie<T>::POA_CORBA_DomainManager_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_DomainManager_tie<T>::POA_CORBA_DomainManager_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_DomainManager_tie<T>::POA_CORBA_DomainManager_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,55 +90,55 @@ POA_CORBA_DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_DomainManager_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_DomainManager_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_DomainManager::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_DomainManager::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy  (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PolicyType policy_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_domain_policy (
-policy_type,
-    ACE_TRY_ENV
+policy_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_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_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_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_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_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_ConstructionPolicy_tie<T>::POA_CORBA_ConstructionPolicy_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
@@ -182,19 +182,19 @@ POA_CORBA_ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ConstructionPolicy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ConstructionPolicy_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_ConstructionPolicy::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ConstructionPolicy::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager  (
     CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean constr_policy
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -202,47 +202,47 @@ void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager  (
 {
   this->ptr_->make_domain_manager (
 object_type,
-    constr_policy,
-    ACE_TRY_ENV
+    constr_policy
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA_ConstructionPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->policy_type (
-ACE_TRY_ENV
+TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->copy (
-ACE_TRY_ENV
+TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstructionPolicy_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/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index deb5d88c21e..bff89a772a5 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -70,11 +70,11 @@ tao_CORBA_DomainManager_nil (
 
 CORBA_DomainManager_ptr
 tao_CORBA_DomainManager_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_DomainManager::_narrow (p, ACE_TRY_ENV);
+  return CORBA_DomainManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -195,11 +195,11 @@ CORBA_DomainManager_var::tao_nil (void)
 
 ::CORBA_DomainManager_ptr
 CORBA_DomainManager_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_DomainManager::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_DomainManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -277,27 +277,23 @@ public:
   TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::PolicyType & policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::PolicyType & policy_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));
 
   void result (CORBA::Policy_ptr result);
@@ -313,20 +309,20 @@ private:
 TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::PolicyType & policy_type,
-    CORBA::Environment &
+    const CORBA::PolicyType & policy_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     policy_type_ (policy_type)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::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;
@@ -342,12 +338,12 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (CORBA::E
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::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;
@@ -355,13 +351,13 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (CORBA::
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::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;
@@ -393,8 +389,8 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Impl::_TAO_CORBA_DomainManager_Remote_Prox
 
 CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy (
     CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PolicyType policy_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -437,8 +433,8 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
       TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy ri (
         &_tao_call,
         _collocated_tao_target_,
-        policy_type,
-        ACE_TRY_ENV
+        policy_type
+         TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -453,8 +449,8 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -466,12 +462,12 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -485,7 +481,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -501,8 +497,8 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                   TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -529,8 +525,8 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -539,13 +535,13 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -556,7 +552,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -610,8 +606,8 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Broker::~_TAO_CORBA_DomainManager_Remote_P
 
 _TAO_CORBA_DomainManager_Proxy_Impl&
 _TAO_CORBA_DomainManager_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_DomainManager *,
-  CORBA::Environment &
+  ::CORBA_DomainManager *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -651,25 +647,25 @@ void CORBA_DomainManager::_tao_any_destructor (void *x)
 }
 
 CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_DomainManager::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_DomainManager::_nil ());
       if (is_a == 0)
         return CORBA_DomainManager::_nil ();
     }
-  return CORBA_DomainManager::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_DomainManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -711,7 +707,7 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
               CORBA_DomainManager::_nil ()
             );
         }
-      
+
       return default_proxy;
       }
     else
@@ -738,14 +734,14 @@ CORBA_DomainManager::_duplicate (CORBA_DomainManager_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type)
@@ -770,21 +766,21 @@ const char* CORBA_DomainManager::_interface_repository_id (void) const
 }
 
 CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PolicyType policy_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_DomainManager_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_DomainManager_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_DomainManager_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.get_domain_policy (
       this,
-      policy_type,
-      ACE_TRY_ENV
+      policy_type
+       TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -852,11 +848,11 @@ tao_CORBA_ConstructionPolicy_nil (
 
 CORBA_ConstructionPolicy_ptr
 tao_CORBA_ConstructionPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ConstructionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -977,11 +973,11 @@ CORBA_ConstructionPolicy_var::tao_nil (void)
 
 ::CORBA_ConstructionPolicy_ptr
 CORBA_ConstructionPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ConstructionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1060,27 +1056,23 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_InterfaceDef_ptr object_type,
-      const CORBA::Boolean & constr_policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::Boolean & constr_policy
+      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));
 
 private:
@@ -1096,8 +1088,8 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRe
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy,
-    CORBA::Environment &
+    const CORBA::Boolean & constr_policy
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     object_type_ (object_type),
@@ -1105,12 +1097,12 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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;
@@ -1137,12 +1129,12 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (C
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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;
@@ -1150,13 +1142,13 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::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;
@@ -1179,8 +1171,8 @@ _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::_TAO_CORBA_ConstructionPolicy_R
 void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA_InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean constr_policy
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1228,8 +1220,8 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
         &_tao_call,
         _collocated_tao_target_,
         object_type,
-        constr_policy,
-        ACE_TRY_ENV
+        constr_policy
+         TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -1244,8 +1236,8 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1257,12 +1249,12 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -1276,7 +1268,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1291,8 +1283,8 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                   TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1305,8 +1297,8 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1315,13 +1307,13 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1332,7 +1324,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1386,8 +1378,8 @@ _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_CORBA_ConstructionPolic
 
 _TAO_CORBA_ConstructionPolicy_Proxy_Impl&
 _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ConstructionPolicy *,
-  CORBA::Environment &
+  ::CORBA_ConstructionPolicy *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -1429,25 +1421,25 @@ void CORBA_ConstructionPolicy::_tao_any_destructor (void *x)
 }
 
 CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ConstructionPolicy::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ConstructionPolicy::_nil ());
       if (is_a == 0)
         return CORBA_ConstructionPolicy::_nil ();
     }
-  return CORBA_ConstructionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ConstructionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1489,7 +1481,7 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
               CORBA_ConstructionPolicy::_nil ()
             );
         }
-      
+
       return default_proxy;
       }
     else
@@ -1516,7 +1508,7 @@ CORBA_ConstructionPolicy::_duplicate (CORBA_ConstructionPolicy_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
@@ -1524,7 +1516,7 @@ CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA:
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
@@ -1562,22 +1554,22 @@ const char* CORBA_ConstructionPolicy::_interface_repository_id (void) const
 
 void CORBA_ConstructionPolicy::make_domain_manager (
     CORBA_InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean constr_policy
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstructionPolicy_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.make_domain_manager (
       this,
       object_type,
-      constr_policy,
-      ACE_TRY_ENV
+      constr_policy
+       TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -1688,12 +1680,12 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
   void
   _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
       void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
+      CORBA_Object *src
+      TAO_ENV_ARG_DECL
     )
   {
     CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, target);
-    *tmp = CORBA_DomainManager::_narrow (src, ACE_TRY_ENV);
+    *tmp = CORBA_DomainManager::_narrow (src TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -1836,7 +1828,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr
     _tao_elem = CORBA_DomainManager::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManager, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManager TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1897,7 +1889,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy
     _tao_elem = CORBA_ConstructionPolicy::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstructionPolicy, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstructionPolicy TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1980,7 +1972,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManagerList, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManagerList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2048,8 +2040,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_DomainManager::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+           TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -2084,8 +2076,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ConstructionPolicy::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+           TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index d59dd062800..52f2ee42d37 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -95,8 +95,8 @@ public:
   static void tao_release (CORBA_DomainManager_ptr);
   static CORBA_DomainManager_ptr tao_nil (void);
   static CORBA_DomainManager_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -158,15 +158,13 @@ public:
   static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
 
   static CORBA_DomainManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_DomainManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_DomainManager_ptr _nil (void)
     {
@@ -176,19 +174,17 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::PolicyType policy_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::Char *type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   virtual const char* _interface_repository_id (void) const;
@@ -236,8 +232,8 @@ private:
 
         virtual CORBA::Policy_ptr get_domain_policy (
         CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::PolicyType policy_type,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::PolicyType policy_type
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -268,8 +264,8 @@ public:
 
   virtual CORBA::Policy_ptr get_domain_policy (
       CORBA::Object_ptr _collocated_tao_target_,
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::PolicyType policy_type
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -296,8 +292,8 @@ class TAO_Export _TAO_CORBA_DomainManager_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_DomainManager_Proxy_Broker (void);
   virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
-    CORBA_DomainManager *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_DomainManager *object
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS
   ) = 0;
 
 protected:
@@ -314,7 +310,7 @@ protected:
 //                 Remote Proxy Broker Declaration
 //
 
-class TAO_Export _TAO_CORBA_DomainManager_Remote_Proxy_Broker 
+class TAO_Export _TAO_CORBA_DomainManager_Remote_Proxy_Broker
   : public virtual _TAO_CORBA_DomainManager_Proxy_Broker
 {
 public:
@@ -323,8 +319,8 @@ public:
   virtual ~_TAO_CORBA_DomainManager_Remote_Proxy_Broker (void);
 
   virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
-    CORBA_DomainManager *object,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_DomainManager *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -386,8 +382,8 @@ public:
   static void tao_release (CORBA_ConstructionPolicy_ptr);
   static CORBA_ConstructionPolicy_ptr tao_nil (void);
   static CORBA_ConstructionPolicy_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -444,21 +440,19 @@ public:
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   static int _tao_class_id;
-  
+
   // The static operations.
   static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj);
 
   static CORBA_ConstructionPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_ConstructionPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_ConstructionPolicy_ptr _nil (void)
     {
@@ -469,19 +463,17 @@ public:
 
   virtual void make_domain_manager (
       CORBA_InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Boolean constr_policy
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::Char *type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -523,7 +515,7 @@ private:
 //                    Base Proxy Impl. Declaration
 //
 
-class TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Impl 
+class TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Impl
   : public virtual CORBA_TAO_Policy_Proxy_Impl
 {
 public:
@@ -531,8 +523,8 @@ public:
   virtual void make_domain_manager (
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA_InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean constr_policy
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -564,8 +556,8 @@ public:
   virtual void make_domain_manager (
       CORBA::Object_ptr _collocated_tao_target_,
       CORBA_InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean constr_policy
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -593,8 +585,8 @@ class TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_ConstructionPolicy_Proxy_Broker (void);
   virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
-    CORBA_ConstructionPolicy *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    CORBA_ConstructionPolicy *object
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS
   ) = 0;
 
 protected:
@@ -619,8 +611,8 @@ public:
   virtual ~_TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker (void);
 
   virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
-    CORBA_ConstructionPolicy *object,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_ConstructionPolicy *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -669,14 +661,14 @@ public:
       const _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList &rhs
     );
   virtual ~_TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList (void);
-  
+
   // = Accessors.
   TAO_Object_Manager<CORBA_DomainManager,CORBA_DomainManager_var> operator[] (CORBA::ULong index) const;
-  
+
   // = Static operations.
   static CORBA_DomainManager **allocbuf (CORBA::ULong nelems);
   static void freebuf (CORBA_DomainManager **buffer);
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
@@ -686,13 +678,12 @@ public:
       CORBA::ULong nl,
       CORBA::ULong ol
     );
-  
+
   virtual void _downcast (
       void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA_Object *src
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual CORBA_Object* _upcast (void *src) const;
 };
 
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 20774fd8da3..1c99f5619a4 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -34,19 +34,19 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 // Utility function called by all the DynAny classes
 // to extract the TCKind of possibly aliased types.
 CORBA::TCKind
-TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
+                            TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind tck = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind tck = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   while (tck == CORBA::tk_alias)
     {
-      CORBA_TypeCode_var temp = tc->content_type (ACE_TRY_ENV);
+      CORBA_TypeCode_var temp = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::tk_null);
 
-      tck = TAO_DynAnyFactory::unalias (temp.in (),
-                                        ACE_TRY_ENV);
+      tck = TAO_DynAnyFactory::unalias (temp.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::tk_null);
     }
 
@@ -55,19 +55,19 @@ TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc,
 
 // Same as above, but returns the type code.
 CORBA::TypeCode_ptr
-TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc
+                                TAO_ENV_ARG_DECL)
 {
   CORBA_TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind tck = retval->kind (ACE_TRY_ENV);
+  CORBA::TCKind tck = retval->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   while (tck == CORBA::tk_alias)
     {
-      retval = retval->content_type (ACE_TRY_ENV);
+      retval = retval->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      tck = retval->kind (ACE_TRY_ENV);
+      tck = retval->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
     }
 
@@ -76,37 +76,37 @@ TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc,
 
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAnyFactory::InconsistentTypeCode
     ))
 {
-  return TAO_DynAnyFactory::make_dyn_any (value, ACE_TRY_ENV);
+  return TAO_DynAnyFactory::make_dyn_any (value TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any_from_type_code (
-      CORBA::TypeCode_ptr type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::TypeCode_ptr type
+      TAO_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAnyFactory::InconsistentTypeCode
     ))
 {
-  return TAO_DynAnyFactory::make_dyn_any (type, ACE_TRY_ENV);
+  return TAO_DynAnyFactory::make_dyn_any (type TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
+                                 TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   switch (kind)
@@ -139,7 +139,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
-          p->init (any, ACE_TRY_ENV);
+          p->init (any TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -155,7 +155,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
-          p->init (any, ACE_TRY_ENV);
+          p->init (any TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -170,7 +170,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
-          p->init (any, ACE_TRY_ENV);
+          p->init (any TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -185,7 +185,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
-          p->init (any, ACE_TRY_ENV);
+          p->init (any TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -200,7 +200,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
-          p->init (any, ACE_TRY_ENV);
+          p->init (any TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -215,7 +215,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
-          p->init (any, ACE_TRY_ENV);
+          p->init (any TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -240,11 +240,11 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any,
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
+                                 TAO_ENV_ARG_DECL)
 {
   CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc, ACE_TRY_ENV);
+    TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   switch (kind)
@@ -277,7 +277,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
-          p->init (tc, ACE_TRY_ENV);
+          p->init (tc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -293,7 +293,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
-          p->init (tc, ACE_TRY_ENV);
+          p->init (tc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -308,7 +308,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
-          p->init (tc, ACE_TRY_ENV);
+          p->init (tc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -323,7 +323,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
-          p->init (tc, ACE_TRY_ENV);
+          p->init (tc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -338,7 +338,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
-          p->init (tc, ACE_TRY_ENV);
+          p->init (tc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -353,7 +353,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc,
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
-          p->init (tc, ACE_TRY_ENV);
+          p->init (tc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index ac30eccb6dc..147550d503e 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -32,8 +32,8 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynAnyFactory 
-  : public virtual DynamicAny::DynAnyFactory, 
+class TAO_DynamicAny_Export TAO_DynAnyFactory
+  : public virtual DynamicAny::DynAnyFactory,
     public virtual TAO_Local_RefCounted_Object
 {
   // = DESCRIPTION
@@ -44,41 +44,39 @@ public:
   TAO_DynAnyFactory (void);
   // Constructor.
 
-  static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment &ACE_TRY_ENV);
+  static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc
+                                TAO_ENV_ARG_DECL);
   // Obtain the kind of object, after all aliasing has been removed.
 
-  static CORBA_TypeCode_ptr strip_alias (CORBA_TypeCode_ptr tc,
-                                         CORBA::Environment &ACE_TRY_ENV);
+  static CORBA_TypeCode_ptr strip_alias (CORBA_TypeCode_ptr tc
+                                         TAO_ENV_ARG_DECL);
   // Same as above, but returns type code instead of TCKind. Caller
   // must release the return value.
 
   static DynamicAny::DynAny_ptr
-     make_dyn_any (const CORBA_Any &any,
-                   CORBA::Environment &ACE_TRY_ENV);
+     make_dyn_any (const CORBA_Any &any
+                   TAO_ENV_ARG_DECL);
   // Create the correct type of DynAny object for <any>.
 
   static DynamicAny::DynAny_ptr
-     make_dyn_any (CORBA::TypeCode_ptr tc,
-                   CORBA::Environment &ACE_TRY_ENV);
+     make_dyn_any (CORBA::TypeCode_ptr tc
+                   TAO_ENV_ARG_DECL);
   // Create the correct type of DynAny object for <tc>
 
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (
-      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,
         DynamicAny::DynAnyFactory::InconsistentTypeCode
       ));
 
   virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
-      CORBA::TypeCode_ptr type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAnyFactory::InconsistentTypeCode
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index 7b5650c6878..a6226764fb7 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -17,11 +17,11 @@ TAO_DynAny_i::~TAO_DynAny_i (void)
 }
 
 void
-TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc
+                              TAO_ENV_ARG_DECL)
 {
   // Check to see if it's a simple type.
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc, ACE_TRY_ENV);
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   switch (tk)
   {
@@ -51,10 +51,10 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc,
 }
 
 void
-TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
+                                    TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc, ACE_TRY_ENV);
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   switch (tk)
   {
@@ -148,15 +148,15 @@ TAO_DynAny_i::init_common (void)
 }
 
 void
-TAO_DynAny_i::init (CORBA_TypeCode_ptr tc,
-                    CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::init (CORBA_TypeCode_ptr tc
+                    TAO_ENV_ARG_DECL)
 {
-  this->check_typecode (tc, 
-                        ACE_TRY_ENV);
+  this->check_typecode (tc
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->set_to_default_value (tc,
-                              ACE_TRY_ENV);
+  this->set_to_default_value (tc
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->init_common ();
@@ -165,12 +165,12 @@ TAO_DynAny_i::init (CORBA_TypeCode_ptr tc,
 }
 
 void
-TAO_DynAny_i::init (const CORBA_Any& any,
-                    CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::init (const CORBA_Any& any
+                    TAO_ENV_ARG_DECL)
 {
   this->type_ = any.type ();
-  this->check_typecode (this->type_.in (), 
-                        ACE_TRY_ENV);
+  this->check_typecode (this->type_.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->init_common ();
@@ -181,8 +181,8 @@ TAO_DynAny_i::init (const CORBA_Any& any,
 // ****************************************************************
 
 TAO_DynAny_i *
-TAO_DynAny_i::_narrow (CORBA::Object_ptr obj,
-                       CORBA::Environment &)
+TAO_DynAny_i::_narrow (CORBA::Object_ptr obj
+                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -212,15 +212,15 @@ TAO_DynAny_i::_tao_QueryInterface (ptr_arith_t type)
       return this;
     }
 
-  return 
+  return
     this->ACE_NESTED_CLASS (DynamicAny, DynAny::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
 
 void
-TAO_DynAny_i::from_any (const CORBA_Any &any,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::from_any (const CORBA_Any &any
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -235,8 +235,8 @@ TAO_DynAny_i::from_any (const CORBA_Any &any,
   CORBA::TypeCode_var any_tc = any.type ();
 
   CORBA::Boolean equiv =
-    this->type_->equivalent (any_tc.in (), 
-                             ACE_TRY_ENV);
+    this->type_->equivalent (any_tc.in ()
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!equiv)
@@ -245,14 +245,14 @@ TAO_DynAny_i::from_any (const CORBA_Any &any,
     }
 
 // @@@ (JP) Spec also says we should check for illegal Any
-// value here, and throw InvalidValue if we find one. 
+// value here, and throw InvalidValue if we find one.
 // Something like a null string will be caught in the constructor.
 
   this->any_ = any;
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::to_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -274,8 +274,8 @@ TAO_DynAny_i::to_any (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
-                     CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -286,8 +286,8 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
                         0);
     }
 
-  TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs,
-                                               ACE_TRY_ENV);
+  TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (rhs_n == 0)
@@ -295,8 +295,8 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
       return 0;
     }
 
-  CORBA::Boolean equiv = this->type_->equivalent (rhs_n->type_.in (), 
-                                                  ACE_TRY_ENV);
+  CORBA::Boolean equiv = this->type_->equivalent (rhs_n->type_.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equiv)
@@ -416,23 +416,23 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
         this->any_ >>= lhs_v;
 
         DynamicAny::DynAny_var rhs_dyn =
-          TAO_DynAnyFactory::make_dyn_any (rhs_v, 
-                                           ACE_TRY_ENV);
+          TAO_DynAnyFactory::make_dyn_any (rhs_v
+                                           TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         DynamicAny::DynAny_var lhs_dyn =
-          TAO_DynAnyFactory::make_dyn_any (lhs_v, 
-                                           ACE_TRY_ENV);
+          TAO_DynAnyFactory::make_dyn_any (lhs_v
+                                           TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in (), 
-                                           ACE_TRY_ENV);
+        CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in ()
+                                           TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        rhs_dyn->destroy (ACE_TRY_ENV);
+        rhs_dyn->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        lhs_dyn->destroy (ACE_TRY_ENV);
+        lhs_dyn->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         return b;
@@ -444,8 +444,8 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
         CORBA::TypeCode_ptr lhs_v;
         this->any_ >>= lhs_v;
         // See CORBA 2.4.2 - must use equal() here.
-        return lhs_v->equal (lhs_v, 
-                             ACE_TRY_ENV);
+        return lhs_v->equal (lhs_v
+                             TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_objref:
       {
@@ -453,17 +453,17 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
         rhs_n->any_ >>= CORBA::Any::to_object (rhs_v);
         CORBA::Object_ptr lhs_v;
         this->any_ >>= CORBA::Any::to_object (lhs_v);
-        return lhs_v->_is_equivalent (lhs_v, 
-                                      ACE_TRY_ENV);
+        return lhs_v->_is_equivalent (lhs_v
+                                      TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_string:
       {
         CORBA::TypeCode_var unaliased_tc =
-          TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                          ACE_TRY_ENV);
+          TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        CORBA::ULong bound = unaliased_tc->length (ACE_TRY_ENV);
+        CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         const char* rhs_v;
@@ -483,11 +483,11 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
     case CORBA::tk_wstring:
       {
         CORBA::TypeCode_var unaliased_tc =
-          TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                          ACE_TRY_ENV);
+          TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        CORBA::ULong bound = unaliased_tc->length (ACE_TRY_ENV);
+        CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         CORBA::WChar * rhs_v;
@@ -506,7 +506,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs,
 }
 
 void
-TAO_DynAny_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -524,7 +524,7 @@ TAO_DynAny_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 
 
 DynamicAny::DynAny_ptr
-TAO_DynAny_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynAny_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index 97cdaf4809e..f11e447f0b6 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -34,7 +34,7 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynAny_i 
+class TAO_DynamicAny_Export TAO_DynAny_i
   : public virtual DynamicAny::DynAny,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
@@ -51,29 +51,27 @@ public:
   ~TAO_DynAny_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (CORBA_TypeCode_ptr tc
+             TAO_ENV_ARG_DECL);
   // Initialize using just a TypeCode
 
-  void init (const CORBA_Any& any,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (const CORBA_Any& any
+             TAO_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynAny_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
-      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,
         DynamicAny::DynAny::TypeMismatch,
@@ -81,34 +79,30 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
@@ -116,12 +110,12 @@ public:
 
 private:
   // Check if the typecode is acceptable.
-  void check_typecode (CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void check_typecode (CORBA::TypeCode_ptr tc
+                       TAO_ENV_ARG_DECL);
 
   // Used when we are created from a typecode.
-  void set_to_default_value (CORBA::TypeCode_ptr tc,
-                             CORBA::Environment &ACE_TRY_ENV);
+  void set_to_default_value (CORBA::TypeCode_ptr tc
+                             TAO_ENV_ARG_DECL);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index f48d4b50dfc..721ee0d64a6 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -29,13 +29,13 @@ TAO_DynArray_i::init_common (void)
 }
 
 void
-TAO_DynArray_i::init (const CORBA_Any & any,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::init (const CORBA_Any & any
+                      TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_array)
@@ -45,8 +45,8 @@ TAO_DynArray_i::init (const CORBA_Any & any,
 
   this->type_ = tc;
 
-  CORBA::ULong numfields = this->get_tc_length (tc.in (),
-                                                ACE_TRY_ENV);
+  CORBA::ULong numfields = this->get_tc_length (tc.in ()
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   // Resize the array.
   this->da_members_.size (numfields);
@@ -60,7 +60,7 @@ TAO_DynArray_i::init (const CORBA_Any & any,
                     any._tao_byte_order ());
 
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_TRY_ENV);
+    this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < numfields; i++)
@@ -74,24 +74,24 @@ TAO_DynArray_i::init (const CORBA_Any & any,
       // This recursive step will call the correct constructor
       // based on the type of field_any.
       this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (field_any,
-                                         ACE_TRY_ENV);
+        TAO_DynAnyFactory::make_dyn_any (field_any
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr,
-                                               ACE_TRY_ENV);
+                                               &cdr
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_DynArray_i::init (CORBA_TypeCode_ptr tc,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::init (CORBA_TypeCode_ptr tc
+                      TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc,
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_array)
@@ -101,8 +101,8 @@ TAO_DynArray_i::init (CORBA_TypeCode_ptr tc,
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
-  CORBA::ULong numfields = this->get_tc_length (tc,
-                                                ACE_TRY_ENV);
+  CORBA::ULong numfields = this->get_tc_length (tc
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resize the array.
@@ -110,39 +110,39 @@ TAO_DynArray_i::init (CORBA_TypeCode_ptr tc,
 
   this->init_common ();
 
-  CORBA::TypeCode_var elemtype = this->get_element_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var elemtype = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < numfields; ++i)
     {
       // Recursively initialize each element.
-      this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (elemtype.in (),
-                                                              ACE_TRY_ENV);
+      this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
+                                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynArray_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::TypeCode_var element_type =
     CORBA_TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   while (kind != CORBA::tk_array)
     {
-      element_type = element_type->content_type (ACE_TRY_ENV);
+      element_type = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
-      kind = element_type->kind (ACE_TRY_ENV);
+      kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
     }
 
   // Return the content type.
-  CORBA_TypeCode_ptr retval = element_type->content_type (ACE_TRY_ENV);
+  CORBA_TypeCode_ptr retval = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   return retval;
@@ -150,22 +150,22 @@ TAO_DynArray_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
 
 // Get the length from the (possibly aliased) typecode.
 CORBA::ULong
-TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
+                               TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tctmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind kind = tctmp->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tctmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   while (kind == CORBA::tk_alias)
     {
-      tctmp = tctmp->content_type (ACE_TRY_ENV);
+      tctmp = tctmp->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      kind = tctmp->kind (ACE_TRY_ENV);
+      kind = tctmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  CORBA::ULong retval = tctmp->length (ACE_TRY_ENV);
+  CORBA::ULong retval = tctmp->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval;
@@ -174,8 +174,8 @@ TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc,
 // ****************************************************************
 
 TAO_DynArray_i *
-TAO_DynArray_i::_narrow (CORBA::Object_ptr obj,
-                         CORBA::Environment &)
+TAO_DynArray_i::_narrow (CORBA::Object_ptr obj
+                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -205,14 +205,14 @@ TAO_DynArray_i::_tao_QueryInterface (ptr_arith_t type)
       return this;
     }
 
-  return 
+  return
     this->ACE_NESTED_CLASS (DynamicAny, DynArray::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
 
 DynamicAny::AnySeq *
-TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynArray_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -239,7 +239,7 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
   // Initialize each Any.
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      tmp = this->da_members_[i]->to_any (ACE_TRY_ENV);
+      tmp = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       safe_retval[i] = tmp.in ();
@@ -249,8 +249,8 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value,
-                              CORBA::Environment& ACE_TRY_ENV)
+TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -270,25 +270,25 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value,
     }
 
   CORBA::TypeCode_var value_tc;
-  CORBA::TypeCode_var element_type = this->get_element_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
       // Check each arg element for type match.
       value_tc = value[i].type ();
-      CORBA::Boolean equivalent = value_tc->equivalent (element_type.in (),
-                                                        ACE_TRY_ENV);
+      CORBA::Boolean equivalent = value_tc->equivalent (element_type.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (equivalent)
         {
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
+          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (value[i],
-                                             ACE_TRY_ENV);
+            TAO_DynAnyFactory::make_dyn_any (value[i]
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -299,7 +299,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value,
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynArray_i::get_elements_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -324,11 +324,11 @@ TAO_DynArray_i::get_elements_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
       // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
-                      0,
-                      ACE_TRY_ENV);
+                      0
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      safe_retval[i] = 
+      safe_retval[i] =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
       ACE_CHECK_RETURN (0);
     }
@@ -338,8 +338,8 @@ TAO_DynArray_i::get_elements_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynArray_i::set_elements_as_dyn_any (
-    const DynamicAny::DynAnySeq & values,
-    CORBA::Environment &ACE_TRY_ENV
+    const DynamicAny::DynAnySeq & values
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -359,7 +359,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
       ACE_THROW (DynamicAny::DynAny::InvalidValue ());
     }
 
-  CORBA::TypeCode_var element_type = this->get_element_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var val_type;
@@ -367,17 +367,17 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      val_type = values[i]->type (ACE_TRY_ENV);
+      val_type = values[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      equivalent = val_type->equivalent (element_type.in (),
-                                         ACE_TRY_ENV);
-      
+      equivalent = val_type->equivalent (element_type.in ()
+                                         TAO_ENV_ARG_PARAMETER);
+
       ACE_CHECK;
 
       if (equivalent)
         {
-          this->da_members_[i] = values[i]->copy (ACE_TRY_ENV);
+          this->da_members_[i] = values[i]->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -390,8 +390,8 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynArray_i::from_any (const CORBA_Any& any,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::from_any (const CORBA_Any& any
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -404,8 +404,8 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in (),
-                                                             ACE_TRY_ENV);
+  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -416,8 +416,8 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
                         any._tao_byte_order ());
 
       CORBA::ULong length = this->da_members_.size ();
-      CORBA::ULong arg_length = this->get_tc_length (tc.in (),
-                                                     ACE_TRY_ENV);
+      CORBA::ULong arg_length = this->get_tc_length (tc.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (length != arg_length)
@@ -425,7 +425,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      CORBA::TypeCode_var field_tc = this->get_element_type (ACE_TRY_ENV);
+      CORBA::TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
@@ -436,18 +436,18 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
                                cdr.byte_order (),
                                cdr.start ());
 
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
+          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (field_any,
-                                          ACE_TRY_ENV);
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
+                                                   &cdr
+                                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -460,7 +460,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -471,7 +471,7 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
                         0);
     }
 
-  CORBA_TypeCode_var field_tc = this->get_element_type (ACE_TRY_ENV);
+  CORBA_TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_OutputCDR out_cdr;
@@ -481,7 +481,7 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Recursive step.
-      field_any = this->da_members_[i]->to_any (ACE_TRY_ENV);
+      field_any = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
@@ -491,8 +491,8 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
-                                                 &out_cdr,
-                                                 ACE_TRY_ENV);
+                                                 &out_cdr
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -511,8 +511,8 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -523,11 +523,11 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs,
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in (),
-                                              ACE_TRY_ENV);
+  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -540,17 +540,17 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs,
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      rhs->seek (ACE_static_cast (CORBA::Long, 
-                                  i),
-                 ACE_TRY_ENV);
+      rhs->seek (ACE_static_cast (CORBA::Long,
+                                  i)
+                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      tmp = rhs->current_component (ACE_TRY_ENV);
+      tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in (),
-                                 ACE_TRY_ENV);
+      member_equal = tmp->equal (this->da_members_[i].in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!member_equal)
@@ -563,7 +563,7 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs,
 }
 
 void
-TAO_DynArray_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -579,11 +579,11 @@ TAO_DynArray_i::destroy (CORBA::Environment &ACE_TRY_ENV)
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
           this->set_flag (da_members_[i].in (),
-                          1,
-                          ACE_TRY_ENV);
+                          1
+                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
+          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -592,7 +592,7 @@ TAO_DynArray_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynArray_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynArray_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -609,12 +609,12 @@ TAO_DynArray_i::current_component (CORBA::Environment &ACE_TRY_ENV)
       return DynamicAny::DynAny::_nil ();
     }
 
-  CORBA::ULong index = ACE_static_cast (CORBA::ULong, 
+  CORBA::ULong index = ACE_static_cast (CORBA::ULong,
                                         this->current_position_);
 
   this->set_flag (this->da_members_[index].in (),
-                  0,
-                  ACE_TRY_ENV);
+                  0
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index f5a1a8fc15d..3f872d7aa00 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -34,7 +34,7 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynArray_i 
+class TAO_DynamicAny_Export TAO_DynArray_i
   : public virtual DynamicAny::DynArray,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
@@ -52,37 +52,34 @@ public:
   ~TAO_DynArray_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (CORBA_TypeCode_ptr tc
+             TAO_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (const CORBA_Any& any
+             TAO_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods
   static TAO_DynArray_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynArray.
 
   virtual DynamicAny::AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_elements (
-      const DynamicAny::AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::AnySeq & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -90,18 +87,16 @@ public:
       ));
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_elements_as_dyn_any (
-      const DynamicAny::DynAnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::DynAnySeq & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -111,10 +106,9 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
-      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,
         DynamicAny::DynAny::TypeMismatch,
@@ -122,34 +116,30 @@ public:
     ));
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
@@ -157,13 +147,11 @@ public:
 
 private:
   // Returns the type of elements contained in the array.
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::TypeCode_ptr get_element_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // Gets the length of the array from the typecode.
-  CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc,
-                              CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 9251a53e45a..b0e8b34b566 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -25,7 +25,7 @@ TAO_DynCommon::~TAO_DynCommon (void)
 // *****************************************************************
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::type (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::type (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -40,8 +40,8 @@ TAO_DynCommon::type (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -52,20 +52,20 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any,
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA_TypeCode_var tc = dyn_any->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = dyn_any->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in (),
-                                                             ACE_TRY_ENV);
+  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
     {
-      CORBA_Any_ptr any = dyn_any->to_any (ACE_TRY_ENV);
+      CORBA_Any_ptr any = dyn_any->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->from_any (*any,
-                      ACE_TRY_ENV);
+      this->from_any (*any
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -75,8 +75,8 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any,
 }
 
 void
-TAO_DynCommon::insert_boolean (CORBA::Boolean value,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_boolean (CORBA::Boolean value
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -90,26 +90,26 @@ TAO_DynCommon::insert_boolean (CORBA::Boolean value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_boolean (value,
-                          ACE_TRY_ENV);
+      cc->insert_boolean (value
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_boolean,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_boolean
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= CORBA::Any::from_boolean (value);
     }
 }
 
 void
-TAO_DynCommon::insert_octet (CORBA::Octet value,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_octet (CORBA::Octet value
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -123,26 +123,26 @@ TAO_DynCommon::insert_octet (CORBA::Octet value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_octet (value,
-                        ACE_TRY_ENV);
+      cc->insert_octet (value
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_octet,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_octet
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= CORBA::Any::from_octet (value);
     }
 }
 
 void
-TAO_DynCommon::insert_char (CORBA::Char value,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_char (CORBA::Char value
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -156,26 +156,26 @@ TAO_DynCommon::insert_char (CORBA::Char value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_char (value,
-                       ACE_TRY_ENV);
+      cc->insert_char (value
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_char,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_char
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= CORBA::Any::from_char (value);
     }
 }
 
 void
-TAO_DynCommon::insert_short (CORBA::Short value,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_short (CORBA::Short value
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -189,26 +189,26 @@ TAO_DynCommon::insert_short (CORBA::Short value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_short (value,
-                        ACE_TRY_ENV);
+      cc->insert_short (value
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_short,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_short
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_ushort (CORBA::UShort value,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_ushort (CORBA::UShort value
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -222,26 +222,26 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_ushort (value,
-                         ACE_TRY_ENV);
+      cc->insert_ushort (value
+                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_ushort,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_ushort
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_long (CORBA::Long value,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_long (CORBA::Long value
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -255,26 +255,26 @@ TAO_DynCommon::insert_long (CORBA::Long value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_long (value,
-                       ACE_TRY_ENV);
+      cc->insert_long (value
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_long,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_long
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_ulong (CORBA::ULong value,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_ulong (CORBA::ULong value
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -288,26 +288,26 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_ulong (value,
-                        ACE_TRY_ENV);
+      cc->insert_ulong (value
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_ulong,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_ulong
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_float (CORBA::Float value,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_float (CORBA::Float value
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -321,26 +321,26 @@ TAO_DynCommon::insert_float (CORBA::Float value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_float (value,
-                        ACE_TRY_ENV);
+      cc->insert_float (value
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_float,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_float
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_double (CORBA::Double value,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_double (CORBA::Double value
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -354,26 +354,26 @@ TAO_DynCommon::insert_double (CORBA::Double value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_double (value,
-                         ACE_TRY_ENV);
+      cc->insert_double (value
+                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_double,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_double
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_string (const char * value,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_string (const char * value
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -387,21 +387,21 @@ TAO_DynCommon::insert_string (const char * value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_string (value,
-                         ACE_TRY_ENV);
+      cc->insert_string (value
+                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      CORBA::TypeCode_var unaliased_tc = 
-        TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                        ACE_TRY_ENV);
+      CORBA::TypeCode_var unaliased_tc =
+        TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::TCKind kind = unaliased_tc->kind (ACE_TRY_ENV);
+      CORBA::TCKind kind = unaliased_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind != CORBA::tk_string)
@@ -409,14 +409,14 @@ TAO_DynCommon::insert_string (const char * value,
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      CORBA::ULong bound = unaliased_tc->length (ACE_TRY_ENV);
+      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (bound > 0 && bound < ACE_OS::strlen (value))
         {
           ACE_THROW (DynamicAny::DynAny::InvalidValue ());
         }
-      
+
       this->any_ <<= CORBA::Any::from_string (ACE_const_cast (char *,
                                                               value),
                                               bound);
@@ -424,8 +424,8 @@ TAO_DynCommon::insert_string (const char * value,
 }
 
 void
-TAO_DynCommon::insert_reference (CORBA::Object_ptr value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_reference (CORBA::Object_ptr value
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -439,18 +439,18 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_reference (value,
-                            ACE_TRY_ENV);
+      cc->insert_reference (value
+                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       CORBA::Boolean good_type = 1;
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in (),
-                                                       ACE_TRY_ENV);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind != CORBA::tk_objref)
@@ -463,18 +463,18 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value,
 
           if (ACE_OS::strcmp (value_id, "IDL:omg.org/CORBA/Object:1.0") != 0)
             {
-              const char *my_id = this->type_->id (ACE_TRY_ENV);
+              const char *my_id = this->type_->id (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               if (ACE_OS::strcmp (value_id, my_id) != 0)
                 {
-                  good_type = value->_is_a (my_id,
-                                            ACE_TRY_ENV);
+                  good_type = value->_is_a (my_id
+                                            TAO_ENV_ARG_PARAMETER);
                   ACE_CHECK;
                 }
             }
         }
-      
+
       if (good_type)
         {
           this->any_ <<= value;
@@ -487,8 +487,8 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value,
 }
 
 void
-TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -502,26 +502,26 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_typecode (value,
-                           ACE_TRY_ENV);
+      cc->insert_typecode (value
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_TypeCode,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_TypeCode
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_longlong (CORBA::LongLong value,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_longlong (CORBA::LongLong value
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -535,26 +535,26 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_longlong (value,
-                           ACE_TRY_ENV);
+      cc->insert_longlong (value
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_longlong,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_longlong
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -568,27 +568,27 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_ulonglong (value,
-                            ACE_TRY_ENV);
+      cc->insert_ulonglong (value
+                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_ulonglong,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_ulonglong
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_longdouble (CORBA::LongDouble value,
-                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC (( 
+TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
+                                  TAO_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
       DynamicAny::DynAny::InvalidValue
@@ -601,26 +601,26 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_longdouble (value,
-                             ACE_TRY_ENV);
+      cc->insert_longdouble (value
+                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_longdouble,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_longdouble
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
 
 void
-TAO_DynCommon::insert_wchar (CORBA::WChar value,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_wchar (CORBA::WChar value
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -634,26 +634,26 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_wchar (value,
-                        ACE_TRY_ENV);
+      cc->insert_wchar (value
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_wchar,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_wchar
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= CORBA::Any::from_wchar (value);
     }
 }
 
 void
-TAO_DynCommon::insert_wstring (const CORBA::WChar * value,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_wstring (const CORBA::WChar * value
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -667,28 +667,28 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_wstring (value,
-                          ACE_TRY_ENV);
+      cc->insert_wstring (value
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
-        this->check_type_and_unalias (CORBA::_tc_wstring,
-                                      ACE_TRY_ENV);
+        this->check_type_and_unalias (CORBA::_tc_wstring
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::ULong bound = unaliased_tc->length (ACE_TRY_ENV);
+      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (bound > 0 && bound < ACE_OS::wslen (value))
         {
           ACE_THROW (DynamicAny::DynAny::InvalidValue ());
         }
-      
+
       this->any_ <<= CORBA::Any::from_wstring (ACE_const_cast (CORBA::WChar *,
                                                                value),
                                                bound);
@@ -696,8 +696,8 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value,
 }
 
 void
-TAO_DynCommon::insert_any (const CORBA::Any &value,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_any (const CORBA::Any &value
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -711,19 +711,19 @@ TAO_DynCommon::insert_any (const CORBA::Any &value,
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      cc->insert_any (value,
-                      ACE_TRY_ENV);
+      cc->insert_any (value
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->check_type (CORBA::_tc_any,
-                        ACE_TRY_ENV);
+      this->check_type (CORBA::_tc_any
+                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       this->any_ <<= value;
     }
 }
@@ -731,8 +731,8 @@ TAO_DynCommon::insert_any (const CORBA::Any &value,
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
 // have fewer Any/DynAny conversions than insert_any, not more.
 void
-TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -744,18 +744,18 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value,
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA_Any_var any = value->to_any (ACE_TRY_ENV);
+  CORBA_Any_var any = value->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->insert_any (any.in (),
-                    ACE_TRY_ENV);
+  this->insert_any (any.in ()
+                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 #ifdef TAO_HAS_VALUETYPE
 void
-TAO_DynCommon::insert_val (CORBA::ValueBase_ptr,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::insert_val (CORBA::ValueBase_ptr
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -769,7 +769,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase_ptr,
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynCommon::get_boolean (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_boolean (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -784,27 +784,27 @@ TAO_DynCommon::get_boolean (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_boolean (ACE_TRY_ENV);
+      return cc->get_boolean (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Boolean retval;
-      
+
       if ((this->any_ >>= CORBA::Any::to_boolean (retval)) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::Octet
-TAO_DynCommon::get_octet (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_octet (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -819,27 +819,27 @@ TAO_DynCommon::get_octet (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_octet (ACE_TRY_ENV);
+      return cc->get_octet (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Octet retval;
-      
+
       if ((this->any_ >>= CORBA::Any::to_octet (retval)) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::Char
-TAO_DynCommon::get_char (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_char (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -854,27 +854,27 @@ TAO_DynCommon::get_char (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_char (ACE_TRY_ENV);
+      return cc->get_char (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Char retval;
-      
+
       if ((this->any_ >>= CORBA::Any::to_char (retval)) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::Short
-TAO_DynCommon::get_short (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_short (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -889,27 +889,27 @@ TAO_DynCommon::get_short (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_short (ACE_TRY_ENV);
+      return cc->get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Short retval;
-      
+
       if ((this->any_ >>= retval) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::UShort
-TAO_DynCommon::get_ushort (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_ushort (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -924,27 +924,27 @@ TAO_DynCommon::get_ushort (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_ushort (ACE_TRY_ENV);
+      return cc->get_ushort (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::UShort retval;
-      
+
       if ((this->any_ >>= retval) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::Long
-TAO_DynCommon::get_long (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_long (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -959,27 +959,27 @@ TAO_DynCommon::get_long (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_long (ACE_TRY_ENV);
+      return cc->get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Long retval;
-      
+
       if ((this->any_ >>= retval) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::ULong
-TAO_DynCommon::get_ulong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_ulong (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -994,27 +994,27 @@ TAO_DynCommon::get_ulong (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_ulong (ACE_TRY_ENV);
+      return cc->get_ulong (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::ULong retval;
-      
+
       if ((this->any_ >>= retval) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::Float
-TAO_DynCommon::get_float (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_float (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1029,27 +1029,27 @@ TAO_DynCommon::get_float (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_float (ACE_TRY_ENV);
+      return cc->get_float (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Float retval;
-      
+
       if ((this->any_ >>= retval) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::Double
-TAO_DynCommon::get_double (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_double (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1064,27 +1064,27 @@ TAO_DynCommon::get_double (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_double (ACE_TRY_ENV);
+      return cc->get_double (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Double retval;
-      
+
       if ((this->any_ >>= retval) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 char *
-TAO_DynCommon::get_string (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1099,19 +1099,19 @@ TAO_DynCommon::get_string (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_string (ACE_TRY_ENV);
+      return cc->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
-      CORBA::TypeCode_var unaliased_tc = 
-        TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                        ACE_TRY_ENV);
+      CORBA::TypeCode_var unaliased_tc =
+        TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = unaliased_tc->kind (ACE_TRY_ENV);
+      CORBA::TCKind kind = unaliased_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (kind != CORBA::tk_string)
@@ -1122,9 +1122,9 @@ TAO_DynCommon::get_string (CORBA::Environment &ACE_TRY_ENV)
 
       char *retval = 0;
 
-      CORBA::ULong bound = unaliased_tc->length (ACE_TRY_ENV);
+      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      
+
       // We will have caught a type mismatch above, so if this fails,
       // it must be for some other reason.
       if ((this->any_ >>= CORBA::Any::to_string (retval, bound)) == 0)
@@ -1132,13 +1132,13 @@ TAO_DynCommon::get_string (CORBA::Environment &ACE_TRY_ENV)
           ACE_THROW_RETURN (DynamicAny::DynAny::InvalidValue (),
                             0);
         }
-          
+
       return CORBA::string_dup (retval);
     }
 }
 
 CORBA::Object_ptr
-TAO_DynCommon::get_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_reference (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1153,27 +1153,27 @@ TAO_DynCommon::get_reference (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_reference (ACE_TRY_ENV);
+      return cc->get_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::Object_ptr retval;
-      
+
       if ((this->any_ >>= CORBA::Any::to_object (retval)) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             CORBA::Object::_nil ());
         }
-          
+
       return CORBA::Object::_duplicate (retval);
     }
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::get_typecode (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_typecode (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1188,27 +1188,27 @@ TAO_DynCommon::get_typecode (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_typecode (ACE_TRY_ENV);
+      return cc->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::TypeCode_ptr retval;
-      
+
       if ((this->any_ >>= retval) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             CORBA::TypeCode::_nil ());
         }
-          
+
       return CORBA::TypeCode::_duplicate (retval);
     }
 }
 
 CORBA::LongLong
-TAO_DynCommon::get_longlong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_longlong (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1216,7 +1216,7 @@ TAO_DynCommon::get_longlong (CORBA::Environment &ACE_TRY_ENV)
     ))
 {
   CORBA::LongLong retval = ACE_CDR_LONGLONG_INITIALIZER;
-      
+
   if (this->destroyed_)
     {
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
@@ -1225,10 +1225,10 @@ TAO_DynCommon::get_longlong (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (retval);
 
-      return cc->get_longlong (ACE_TRY_ENV);
+      return cc->get_longlong (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1237,13 +1237,13 @@ TAO_DynCommon::get_longlong (CORBA::Environment &ACE_TRY_ENV)
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             retval);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::ULongLong
-TAO_DynCommon::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_ulonglong (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1251,7 +1251,7 @@ TAO_DynCommon::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
     ))
 {
   CORBA::ULongLong retval;
-      
+
   if (this->destroyed_)
     {
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
@@ -1260,10 +1260,10 @@ TAO_DynCommon::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (retval);
 
-      return cc->get_ulonglong (ACE_TRY_ENV);
+      return cc->get_ulonglong (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1272,13 +1272,13 @@ TAO_DynCommon::get_ulonglong (CORBA::Environment &ACE_TRY_ENV)
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             retval);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::LongDouble
-TAO_DynCommon::get_longdouble (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_longdouble (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1286,7 +1286,7 @@ TAO_DynCommon::get_longdouble (CORBA::Environment &ACE_TRY_ENV)
     ))
 {
   CORBA::LongDouble retval = ACE_CDR_LONG_DOUBLE_INITIALIZER;
-      
+
   if (this->destroyed_)
     {
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
@@ -1295,10 +1295,10 @@ TAO_DynCommon::get_longdouble (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (retval);
 
-      return cc->get_longdouble (ACE_TRY_ENV);
+      return cc->get_longdouble (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1307,13 +1307,13 @@ TAO_DynCommon::get_longdouble (CORBA::Environment &ACE_TRY_ENV)
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             retval);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::WChar
-TAO_DynCommon::get_wchar (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_wchar (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1328,27 +1328,27 @@ TAO_DynCommon::get_wchar (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_wchar (ACE_TRY_ENV);
+      return cc->get_wchar (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::WChar retval;
-      
+
       if ((this->any_ >>= CORBA::Any::to_wchar (retval)) == 0)
         {
           ACE_THROW_RETURN (DynamicAny::DynAny::TypeMismatch (),
                             0);
         }
-          
+
       return retval;
     }
 }
 
 CORBA::WChar *
-TAO_DynCommon::get_wstring (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1363,10 +1363,10 @@ TAO_DynCommon::get_wstring (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_wstring (ACE_TRY_ENV);
+      return cc->get_wstring (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1374,24 +1374,24 @@ TAO_DynCommon::get_wstring (CORBA::Environment &ACE_TRY_ENV)
       // type code equivalence twice without risking a throw of
       // BadKind.
       CORBA::TypeCode_var unaliased_tc =
-        this->check_type_and_unalias (CORBA::_tc_wstring,
-                                      ACE_TRY_ENV);
+        this->check_type_and_unalias (CORBA::_tc_wstring
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA::WChar *retval = 0;
 
-      CORBA::ULong bound = unaliased_tc->length (ACE_TRY_ENV);
+      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      
+
       (void) (this->any_ >>= CORBA::Any::to_wstring (retval,
                                                      bound));
-          
+
       return CORBA::wstring_dup (retval);
     }
 }
 
 CORBA::Any_ptr
-TAO_DynCommon::get_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynCommon::get_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1406,10 +1406,10 @@ TAO_DynCommon::get_any (CORBA::Environment& ACE_TRY_ENV)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_any (ACE_TRY_ENV);
+      return cc->get_any (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1435,7 +1435,7 @@ TAO_DynCommon::get_any (CORBA::Environment& ACE_TRY_ENV)
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
 // have fewer Any/DynAny conversions than get_any, not more.
 DynamicAny::DynAny_ptr
-TAO_DynCommon::get_dyn_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1448,23 +1448,23 @@ TAO_DynCommon::get_dyn_any (CORBA::Environment &ACE_TRY_ENV)
                         0);
     }
 
-  CORBA_Any_var any = this->get_any (ACE_TRY_ENV);
+  CORBA_Any_var any = this->get_any (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return TAO_DynAnyFactory::make_dyn_any (any.in (),
-                                          ACE_TRY_ENV);
+  return TAO_DynAnyFactory::make_dyn_any (any.in ()
+                                          TAO_ENV_ARG_PARAMETER);
 }
 
 #ifdef TAO_HAS_VALUETYPE
 CORBA::ValueBase_ptr
-TAO_DynCommon::get_val (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::get_val (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     0);
 }
 #endif /* TAO_HAS_VALUETYPE */
@@ -1472,8 +1472,8 @@ TAO_DynCommon::get_val (CORBA::Environment &ACE_TRY_ENV)
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynCommon::seek (CORBA::Long slot,
-                     CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::seek (CORBA::Long slot
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1490,7 +1490,7 @@ TAO_DynCommon::seek (CORBA::Long slot,
       this->current_position_ = -1;
       return 0;
     }
-  else if (slot < 0 || slot >= ACE_static_cast (CORBA::Long, 
+  else if (slot < 0 || slot >= ACE_static_cast (CORBA::Long,
                                                 this->component_count_))
     {
       this->current_position_ = -1;
@@ -1504,7 +1504,7 @@ TAO_DynCommon::seek (CORBA::Long slot,
 }
 
 void
-TAO_DynCommon::rewind (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::rewind (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1514,13 +1514,13 @@ TAO_DynCommon::rewind (CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  (void) this->seek (0,
-                     ACE_TRY_ENV);
+  (void) this->seek (0
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Boolean
-TAO_DynCommon::next (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::next (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1533,7 +1533,7 @@ TAO_DynCommon::next (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->has_components_ == 0
       || this->current_position_ + 1 >= ACE_static_cast (
-                                            CORBA::Long, 
+                                            CORBA::Long,
                                             this->component_count_
                                           ))
     {
@@ -1548,7 +1548,7 @@ TAO_DynCommon::next (CORBA::Environment &ACE_TRY_ENV)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1559,19 +1559,19 @@ TAO_DynCommon::copy (CORBA::Environment &ACE_TRY_ENV)
                         DynamicAny::DynAny::_nil ());
     }
 
-  CORBA_Any_var any = this->to_any (ACE_TRY_ENV);
+  CORBA_Any_var any = this->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
-  DynamicAny::DynAny_ptr retval = 
-    TAO_DynAnyFactory::make_dyn_any (any.in (),
-                                     ACE_TRY_ENV);
+  DynamicAny::DynAny_ptr retval =
+    TAO_DynAnyFactory::make_dyn_any (any.in ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return retval;
 }
 
 CORBA::ULong
-TAO_DynCommon::component_count (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::component_count (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1585,27 +1585,27 @@ TAO_DynCommon::component_count (CORBA::Environment &ACE_TRY_ENV)
   return this->component_count_;
 }
 
-void 
+void
 TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
-                         CORBA::Boolean destroying,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Boolean destroying
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  CORBA::TypeCode_var tc = component->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = component->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in (),
-                                                 ACE_TRY_ENV);
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   switch (tk)
   {
     case CORBA::tk_array:
       {
-        TAO_DynArray_i *tmp = TAO_DynArray_i::_narrow (component,
-                                                       ACE_TRY_ENV);
+        TAO_DynArray_i *tmp = TAO_DynArray_i::_narrow (component
+                                                       TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1622,8 +1622,8 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
       }
     case CORBA::tk_enum:
       {
-        TAO_DynEnum_i *tmp = TAO_DynEnum_i::_narrow (component,
-                                                     ACE_TRY_ENV);
+        TAO_DynEnum_i *tmp = TAO_DynEnum_i::_narrow (component
+                                                     TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1640,8 +1640,8 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
       }
     case CORBA::tk_sequence:
       {
-        TAO_DynSequence_i *tmp = TAO_DynSequence_i::_narrow (component,
-                                                             ACE_TRY_ENV);
+        TAO_DynSequence_i *tmp = TAO_DynSequence_i::_narrow (component
+                                                             TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1658,8 +1658,8 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
       }
     case CORBA::tk_struct:
       {
-        TAO_DynStruct_i *tmp = TAO_DynStruct_i::_narrow (component,
-                                                         ACE_TRY_ENV);
+        TAO_DynStruct_i *tmp = TAO_DynStruct_i::_narrow (component
+                                                         TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1676,8 +1676,8 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
       }
     case CORBA::tk_union:
       {
-        TAO_DynUnion_i *tmp = TAO_DynUnion_i::_narrow (component,
-                                                       ACE_TRY_ENV);
+        TAO_DynUnion_i *tmp = TAO_DynUnion_i::_narrow (component
+                                                       TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1698,8 +1698,8 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
       ACE_THROW (CORBA::NO_IMPLEMENT ());
     default:
       {
-        TAO_DynAny_i *tmp = TAO_DynAny_i::_narrow (component,
-                                                   ACE_TRY_ENV);
+        TAO_DynAny_i *tmp = TAO_DynAny_i::_narrow (component
+                                                   TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1718,7 +1718,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::check_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::check_component (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1731,14 +1731,14 @@ TAO_DynCommon::check_component (CORBA::Environment &ACE_TRY_ENV)
                         DynamicAny::DynAny::_nil ());
     }
 
-  DynamicAny::DynAny_var cc = this->current_component (ACE_TRY_ENV);
+  DynamicAny::DynAny_var cc = this->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
-  CORBA::TypeCode_var tc = cc->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = cc->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   // We are here because we are a component that is the target of
@@ -1760,15 +1760,15 @@ TAO_DynCommon::check_component (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
     ))
 {
-  CORBA::Boolean equivalent = this->type_->equivalent (tc,
-                                                       ACE_TRY_ENV);
+  CORBA::Boolean equivalent = this->type_->equivalent (tc
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!equivalent)
@@ -1778,18 +1778,18 @@ TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc,
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
     ))
 {
-  this->check_type (tc,
-                    ACE_TRY_ENV);
+  this->check_type (tc
+                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  return TAO_DynAnyFactory::strip_alias (tc,
-                                         ACE_TRY_ENV);
+  return TAO_DynAnyFactory::strip_alias (tc
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index e66164bfb3b..a5dd26af845 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -50,28 +50,25 @@ public:
   // = Some functions common to all Dynamic Any types.
 
   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 void assign (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       ));
 
   virtual void insert_boolean (
-      CORBA::Boolean value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Boolean value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -79,10 +76,9 @@ public:
       ));
 
   virtual void insert_octet (
-      CORBA::Octet value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Octet value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -90,10 +86,9 @@ public:
       ));
 
   virtual void insert_char (
-      CORBA::Char value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Char value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -101,10 +96,9 @@ public:
       ));
 
   virtual void insert_short (
-      CORBA::Short value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Short value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -112,10 +106,9 @@ public:
       ));
 
   virtual void insert_ushort (
-      CORBA::UShort value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::UShort value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -123,10 +116,9 @@ public:
       ));
 
   virtual void insert_long (
-      CORBA::Long value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Long value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -134,10 +126,9 @@ public:
       ));
 
   virtual void insert_ulong (
-      CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -145,10 +136,9 @@ public:
       ));
 
   virtual void insert_float (
-      CORBA::Float value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Float value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -156,10 +146,9 @@ public:
       ));
 
   virtual void insert_double (
-      CORBA::Double value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Double value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -167,10 +156,9 @@ public:
       ));
 
   virtual void insert_string (
-      const char * value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const char * value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -178,10 +166,9 @@ public:
       ));
 
   virtual void insert_reference (
-      CORBA::Object_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -189,10 +176,9 @@ public:
       ));
 
   virtual void insert_typecode (
-      CORBA::TypeCode_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -200,10 +186,9 @@ public:
       ));
 
   virtual void insert_longlong (
-      CORBA::LongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::LongLong value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -211,10 +196,9 @@ public:
       ));
 
   virtual void insert_ulonglong (
-      CORBA::ULongLong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULongLong value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -222,10 +206,9 @@ public:
       ));
 
   virtual void insert_longdouble (
-      CORBA::LongDouble value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::LongDouble value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -233,10 +216,9 @@ public:
       ));
 
   virtual void insert_wchar (
-      CORBA::WChar value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::WChar value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -244,10 +226,9 @@ public:
       ));
 
   virtual void insert_wstring (
-      const CORBA::WChar * value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const CORBA::WChar * value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -255,10 +236,9 @@ public:
       ));
 
   virtual void insert_any (
-      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,
         DynamicAny::DynAny::TypeMismatch,
@@ -266,10 +246,9 @@ public:
       ));
 
   virtual void insert_dyn_any (
-      DynamicAny::DynAny_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -278,10 +257,9 @@ public:
 
 #ifdef TAO_HAS_VALUETYPE
   virtual void insert_val (
-      CORBA::ValueBase_ptr value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ValueBase_ptr value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -290,9 +268,8 @@ public:
 #endif /* TAO_HAS_VALUETYPE */
 
   virtual CORBA::Boolean get_boolean (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -300,9 +277,8 @@ public:
       ));
 
   virtual CORBA::Octet get_octet (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -310,9 +286,8 @@ public:
       ));
 
   virtual CORBA::Char get_char (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -320,9 +295,8 @@ public:
       ));
 
   virtual CORBA::Short get_short (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -330,9 +304,8 @@ public:
       ));
 
   virtual CORBA::UShort get_ushort (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -340,9 +313,8 @@ public:
       ));
 
   virtual CORBA::Long get_long (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -350,9 +322,8 @@ public:
       ));
 
   virtual CORBA::ULong get_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -360,9 +331,8 @@ public:
       ));
 
   virtual CORBA::Float get_float (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -370,9 +340,8 @@ public:
       ));
 
   virtual CORBA::Double get_double (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -380,9 +349,8 @@ public:
       ));
 
   virtual char * get_string (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -390,9 +358,8 @@ public:
       ));
 
   virtual CORBA::Object_ptr get_reference (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -400,9 +367,8 @@ public:
       ));
 
   virtual CORBA::TypeCode_ptr get_typecode (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -410,9 +376,8 @@ public:
       ));
 
   virtual CORBA::LongLong get_longlong (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -420,9 +385,8 @@ public:
       ));
 
   virtual CORBA::ULongLong get_ulonglong (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -430,9 +394,8 @@ public:
       ));
 
   virtual CORBA::LongDouble get_longdouble (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -440,9 +403,8 @@ public:
       ));
 
   virtual CORBA::WChar get_wchar (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -450,9 +412,8 @@ public:
       ));
 
   virtual CORBA::WChar * get_wstring (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -460,9 +421,8 @@ public:
       ));
 
   virtual CORBA::Any * get_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -470,9 +430,8 @@ public:
       ));
 
   virtual DynamicAny::DynAny_ptr get_dyn_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -481,9 +440,8 @@ public:
 
 #ifdef TAO_HAS_VALUETYPE
   virtual CORBA::ValueBase_ptr get_val (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -492,42 +450,37 @@ public:
 #endif /* TAO_HAS_VALUETYPE */
 
   virtual CORBA::Boolean seek (
-      CORBA::Long index,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Long index
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void rewind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean next (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr copy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::ULong component_count (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
@@ -544,8 +497,8 @@ protected:
   // destroy() method.
   void set_flag (
       DynamicAny::DynAny_ptr component,
-      CORBA::Boolean destroying,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean destroying
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -580,22 +533,22 @@ protected:
 private:
   // Utility functions used by insert_* and get_*.
 
-  DynamicAny::DynAny_ptr check_component (CORBA::Environment &ACE_TRY_ENV)
+  DynamicAny::DynAny_ptr check_component (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
         DynamicAny::DynAny::InvalidValue
       ));
 
-  void check_type (CORBA::TypeCode_ptr tc,
-                   CORBA::Environment &ACE_TRY_ENV)
+  void check_type (CORBA::TypeCode_ptr tc
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       ));
 
-  CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc,
-                                              CORBA::Environment &ACE_TRY_ENV)
+  CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc
+                                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 5e8c6a35767..04f4a8f8255 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -28,14 +28,14 @@ TAO_DynEnum_i::init_common (void)
 }
 
 void
-TAO_DynEnum_i::init (const CORBA_Any &any,
-                     CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::init (const CORBA_Any &any
+                     TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in (),
-                                ACE_TRY_ENV);
+    TAO_DynAnyFactory::unalias (tc.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_enum)
@@ -56,11 +56,11 @@ TAO_DynEnum_i::init (const CORBA_Any &any,
 }
 
 void
-TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc,
-                     CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc
+                     TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc,
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_enum)
@@ -78,8 +78,8 @@ TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc,
 // ****************************************************************
 
 TAO_DynEnum_i *
-TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj,
-                        CORBA::Environment &)
+TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj
+                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -109,34 +109,34 @@ TAO_DynEnum_i::_tao_QueryInterface (ptr_arith_t type)
       return this;
     }
 
-  return 
+  return
     this->ACE_NESTED_CLASS (DynamicAny, DynEnum::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
 
 char *
-TAO_DynEnum_i::get_as_string (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynEnum_i::get_as_string (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  const char *retval = this->type_.in ()->member_name (this->value_,
-                                                       ACE_TRY_ENV);
+  const char *retval = this->type_.in ()->member_name (this->value_
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CORBA::string_dup (retval);
 }
 
 void
-TAO_DynEnum_i::set_as_string (const char *value_as_string,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::set_as_string (const char *value_as_string
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::ULong count = this->type_.in ()->member_count (ACE_TRY_ENV);
+  CORBA::ULong count = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong i;
@@ -144,8 +144,8 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string,
 
   for (i = 0; i < count; ++i)
     {
-      temp = this->type_.in ()->member_name (i,
-                                             ACE_TRY_ENV);
+      temp = this->type_.in ()->member_name (i
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!ACE_OS::strcmp (value_as_string,
@@ -166,7 +166,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string,
 }
 
 CORBA::ULong
-TAO_DynEnum_i::get_as_ulong (CORBA::Environment &)
+TAO_DynEnum_i::get_as_ulong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -175,14 +175,14 @@ TAO_DynEnum_i::get_as_ulong (CORBA::Environment &)
 }
 
 void
-TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong,
-                             CORBA::Environment& ACE_TRY_ENV)
+TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::ULong max = this->type_.in ()->member_count (ACE_TRY_ENV);
+  CORBA::ULong max = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (value_as_ulong < max)
@@ -198,8 +198,8 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong,
 // ****************************************************************
 
 void
-TAO_DynEnum_i::from_any (const CORBA_Any& any,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::from_any (const CORBA_Any& any
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -207,8 +207,8 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any,
     ))
 {
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::tk_enum)
@@ -228,7 +228,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynEnum_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -249,17 +249,17 @@ TAO_DynEnum_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  CORBA::TypeCode_var tc = rhs->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in (),
-                                              ACE_TRY_ENV);
+  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -267,7 +267,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs,
       return 0;
     }
 
-  CORBA_Any_ptr any = rhs->to_any (ACE_TRY_ENV);
+  CORBA_Any_ptr any = rhs->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *mb = any->_tao_get_cdr ();
@@ -282,7 +282,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs,
 }
 
 void
-TAO_DynEnum_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -299,7 +299,7 @@ TAO_DynEnum_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynEnum_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynEnum_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index a7341b2f642..44532527608 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -34,7 +34,7 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynEnum_i 
+class TAO_DynamicAny_Export TAO_DynEnum_i
   : public virtual DynamicAny::DynEnum,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
@@ -52,55 +52,50 @@ public:
   ~TAO_DynEnum_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (CORBA_TypeCode_ptr tc
+             TAO_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (const CORBA_Any& any
+             TAO_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynEnum_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynEnum.
 
   virtual char * get_as_string (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_as_string (
-      const char * value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const char * value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       ));
 
   virtual CORBA::ULong get_as_ulong (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_as_ulong (
-      CORBA::ULong value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
@@ -109,10 +104,9 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
-      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,
         DynamicAny::DynAny::TypeMismatch,
@@ -120,34 +114,30 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 88bd1232108..0e29f33f55f 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -29,14 +29,14 @@ TAO_DynSequence_i::init_common (void)
 }
 
 void
-TAO_DynSequence_i::init (const CORBA::Any& any,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::init (const CORBA::Any& any
+                         TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc.in (),
-                                ACE_TRY_ENV);
+    TAO_DynAnyFactory::unalias (tc.in ()
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_sequence)
@@ -65,7 +65,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any,
 
   // Get the type of the sequence elments.
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (ACE_TRY_ENV);
+    this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; ++i)
@@ -79,24 +79,24 @@ TAO_DynSequence_i::init (const CORBA::Any& any,
       // This recursive step will call the correct constructor
       // based on the type of field_any.
       this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (field_any,
-                                         ACE_TRY_ENV);
+        TAO_DynAnyFactory::make_dyn_any (field_any
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr,
-                                               ACE_TRY_ENV);
+                                               &cdr
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc
+                         TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc,
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_sequence)
@@ -115,8 +115,8 @@ TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc,
 // ****************************************************************
 
 TAO_DynSequence_i *
-TAO_DynSequence_i::_narrow (CORBA::Object_ptr obj,
-                            CORBA::Environment &)
+TAO_DynSequence_i::_narrow (CORBA::Object_ptr obj
+                            TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -146,33 +146,33 @@ TAO_DynSequence_i::_tao_QueryInterface (ptr_arith_t type)
       return this;
     }
 
-  return 
+  return
     this->ACE_NESTED_CLASS (DynamicAny, DynSequence::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
 
 CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynSequence_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type.
-  CORBA::TCKind kind = element_type->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   while (kind != CORBA::tk_sequence)
     {
-      element_type = element_type->content_type (ACE_TRY_ENV);
+      element_type = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
-      kind = element_type->kind (ACE_TRY_ENV);
+      kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
     }
 
   // Return the content type.
-  CORBA::TypeCode_ptr retval = element_type->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_ptr retval = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   return retval;
@@ -181,7 +181,7 @@ TAO_DynSequence_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
 // = Functions specific to DynSequence.
 
 CORBA::ULong
-TAO_DynSequence_i::get_length (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_length (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -196,8 +196,8 @@ TAO_DynSequence_i::get_length (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_DynSequence_i::set_length (CORBA::ULong length,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::set_length (CORBA::ULong length
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -210,11 +210,11 @@ TAO_DynSequence_i::set_length (CORBA::ULong length,
 
   // CORBA::TypeCode::length() does not accept aliased type codes.
   CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong bound = stripped_tc->length (ACE_TRY_ENV);
+  CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (bound > 0 && length > bound)
@@ -241,7 +241,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length,
   else if (length < this->component_count_)
     {
       // If the current position will no longer exist..
-      if (this->current_position_ >= ACE_static_cast (CORBA::Long, 
+      if (this->current_position_ >= ACE_static_cast (CORBA::Long,
                                                       length))
         {
           this->current_position_ = -1;
@@ -253,15 +253,15 @@ TAO_DynSequence_i::set_length (CORBA::ULong length,
       // Grow array first, then initialize new members.
       this->da_members_.size (length);
 
-      CORBA::TypeCode_var elemtype = 
-        stripped_tc->content_type (ACE_TRY_ENV);
+      CORBA::TypeCode_var elemtype =
+        stripped_tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (CORBA::ULong i = this->component_count_; i < length; ++i)
         {
-          this->da_members_[i] = 
-            TAO_DynAnyFactory::make_dyn_any (elemtype.in (),
-                                             ACE_TRY_ENV);
+          this->da_members_[i] =
+            TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -270,7 +270,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length,
       // Destroy any dangling members first, then shrink array.
       for (CORBA::ULong j = length; j < this->component_count_; ++j)
         {
-          this->da_members_[j]->destroy (ACE_TRY_ENV);
+          this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -282,7 +282,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length,
 }
 
 DynamicAny::AnySeq *
-TAO_DynSequence_i::get_elements (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -308,7 +308,7 @@ TAO_DynSequence_i::get_elements (CORBA::Environment &ACE_TRY_ENV)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Any_var tmp =
-        this->da_members_[i]->to_any (ACE_TRY_ENV);
+        this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_CHECK_RETURN (0);
 
@@ -319,8 +319,8 @@ TAO_DynSequence_i::get_elements (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value,
-                                 CORBA::Environment& ACE_TRY_ENV)
+TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -333,12 +333,12 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value,
     }
 
   CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = value.length ();
-  CORBA::ULong bound = stripped_tc->length (ACE_TRY_ENV);
+  CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (bound > 0 && length > bound)
@@ -363,7 +363,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value,
     }
 
   CORBA::TypeCode_var element_type =
-    this->get_element_type (ACE_TRY_ENV);
+    this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var value_tc;
@@ -372,9 +372,9 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value,
     {
       // Check each arg element for type match.
       value_tc = value[i].type ();
-      CORBA::Boolean equivalent = 
-        value_tc->equivalent (element_type.in (),
-                              ACE_TRY_ENV);
+      CORBA::Boolean equivalent =
+        value_tc->equivalent (element_type.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (equivalent)
@@ -382,13 +382,13 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value,
           // Destroy any existing members.
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
+              this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (value[i],
-                                          ACE_TRY_ENV);
+            TAO_DynAnyFactory::make_dyn_any (value[i]
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -400,7 +400,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value,
   // Destroy any dangling members.
   for (CORBA::ULong j = length; j < this->component_count_; ++j)
     {
-      this->da_members_[j]->destroy (ACE_TRY_ENV);
+      this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -415,7 +415,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value,
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynSequence_i::get_elements_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -440,11 +440,11 @@ TAO_DynSequence_i::get_elements_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
       // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
-                      0,
-                      ACE_TRY_ENV);
+                      0
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      safe_retval[i] = 
+      safe_retval[i] =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
       ACE_CHECK_RETURN (0);
     }
@@ -454,8 +454,8 @@ TAO_DynSequence_i::get_elements_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynSequence_i::set_elements_as_dyn_any (
-    const DynamicAny::DynAnySeq & values,
-    CORBA::Environment &ACE_TRY_ENV
+    const DynamicAny::DynAnySeq & values
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -469,12 +469,12 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
     }
 
   CORBA::TypeCode_var stripped_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = values.length ();
-  CORBA::ULong bound = stripped_tc->length (ACE_TRY_ENV);
+  CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (bound > 0 && length > bound)
@@ -488,7 +488,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
       this->da_members_.size (length);
     }
 
-  CORBA::TypeCode_var element_type = this->get_element_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var val_type;
@@ -496,12 +496,12 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      val_type = values[i]->type (ACE_TRY_ENV);
+      val_type = values[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      equivalent = val_type->equivalent (element_type.in (),
-                                         ACE_TRY_ENV);
-      
+      equivalent = val_type->equivalent (element_type.in ()
+                                         TAO_ENV_ARG_PARAMETER);
+
       ACE_CHECK;
 
       if (equivalent)
@@ -509,11 +509,11 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
           // Destroy any existing members.
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
+              this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
 
-          this->da_members_[i] = values[i]->copy (ACE_TRY_ENV);
+          this->da_members_[i] = values[i]->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -525,7 +525,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
   // Destroy any dangling members.
   for (CORBA::ULong j = length; j < this->component_count_; ++j)
     {
-      this->da_members_[j]->destroy (ACE_TRY_ENV);
+      this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -542,8 +542,8 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynSequence_i::from_any (const CORBA::Any & any,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::from_any (const CORBA::Any & any
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -556,8 +556,8 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any,
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in (),
-                                                             ACE_TRY_ENV);
+  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -581,7 +581,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any,
         }
 
       CORBA::TypeCode_var field_tc =
-        this->get_element_type (ACE_TRY_ENV);
+        this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
@@ -594,26 +594,26 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any,
 
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (ACE_TRY_ENV);
+              this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (field_any,
-                                          ACE_TRY_ENV);
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
+                                                   &cdr
+                                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       // Destroy any dangling members.
       for (CORBA::ULong j = arg_length; j < this->component_count_; ++j)
         {
-          this->da_members_[j]->destroy (ACE_TRY_ENV);
+          this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -635,7 +635,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any,
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -650,14 +650,14 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   out_cdr.write_ulong (this->component_count_);
 
-  CORBA_TypeCode_var field_tc = this->get_element_type (ACE_TRY_ENV);
+  CORBA_TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       // Recursive step
       CORBA::Any_var field_any =
-        this->da_members_[i]->to_any (ACE_TRY_ENV);
+        this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
@@ -667,8 +667,8 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
-                                                 &out_cdr,
-                                                 ACE_TRY_ENV);
+                                                 &out_cdr
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -687,8 +687,8 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -699,11 +699,11 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs,
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in (),
-                                              ACE_TRY_ENV);
+  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -716,17 +716,17 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs,
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      rhs->seek (ACE_static_cast (CORBA::Long, 
-                                  i),
-                 ACE_TRY_ENV);
+      rhs->seek (ACE_static_cast (CORBA::Long,
+                                  i)
+                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      tmp = rhs->current_component (ACE_TRY_ENV);
+      tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in (),
-                                 ACE_TRY_ENV);
+      member_equal = tmp->equal (this->da_members_[i].in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!member_equal)
@@ -739,7 +739,7 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs,
 }
 
 void
-TAO_DynSequence_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -755,11 +755,11 @@ TAO_DynSequence_i::destroy (CORBA::Environment &ACE_TRY_ENV)
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
           this->set_flag (da_members_[i].in (),
-                          1,
-                          ACE_TRY_ENV);
+                          1
+                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
+          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -768,7 +768,7 @@ TAO_DynSequence_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynSequence_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynSequence_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -785,12 +785,12 @@ TAO_DynSequence_i::current_component (CORBA::Environment &ACE_TRY_ENV)
       return DynamicAny::DynAny::_nil ();
     }
 
-  CORBA::ULong index = ACE_static_cast (CORBA::ULong, 
+  CORBA::ULong index = ACE_static_cast (CORBA::ULong,
                                         this->current_position_);
 
   this->set_flag (this->da_members_[index].in (),
-                  0,
-                  ACE_TRY_ENV);
+                  0
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index ff56074067f..6e11f692347 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -34,7 +34,7 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynSequence_i 
+class TAO_DynamicAny_Export TAO_DynSequence_i
   : public virtual DynamicAny::DynSequence,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
@@ -52,55 +52,50 @@ public:
   ~TAO_DynSequence_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (CORBA_TypeCode_ptr tc
+             TAO_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (const CORBA_Any& any
+             TAO_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynSequence_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynSequence.
 
   virtual CORBA::ULong get_length (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_length (
-      CORBA::ULong len,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong len
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       ));
 
   virtual DynamicAny::AnySeq * get_elements (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_elements (
-      const DynamicAny::AnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::AnySeq & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -108,18 +103,16 @@ public:
       ));
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_elements_as_dyn_any (
-      const DynamicAny::DynAnySeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::DynAnySeq & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -130,10 +123,9 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
-      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,
         DynamicAny::DynAny::TypeMismatch,
@@ -141,34 +133,30 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
@@ -176,8 +164,7 @@ public:
 
 private:
   // Utility, turns the type of elements contained in the sequence.
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::TypeCode_ptr get_element_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index db81622dcbe..bef8529f9f1 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -18,11 +18,11 @@ TAO_DynStruct_i::~TAO_DynStruct_i (void)
 }
 
 void
-TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc
+                                 TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc, 
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::tk_struct || kind == CORBA::tk_except)
@@ -45,18 +45,18 @@ TAO_DynStruct_i::init_common (void)
 }
 
 void
-TAO_DynStruct_i::init (const CORBA_Any& any,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::init (const CORBA_Any& any
+                       TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
-  this->check_typecode (tc.in (), 
-                        ACE_TRY_ENV);
+  this->check_typecode (tc.in ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->type_ = tc;
 
   // Member_count works with aliased type codes.
-  CORBA::ULong numfields = this->type_->member_count (ACE_TRY_ENV);
+  CORBA::ULong numfields = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resize the array.
@@ -71,8 +71,8 @@ TAO_DynStruct_i::init (const CORBA_Any& any,
                     any._tao_byte_order ());
 
   // If we have an exception type, unmarshal the repository ID.
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::tk_except)
@@ -83,15 +83,15 @@ TAO_DynStruct_i::init (const CORBA_Any& any,
 
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < numfields; i++)
     {
       CORBA::TypeCode_var field_tc =
-        unaliased_tc->member_type (i,
-                                   ACE_TRY_ENV);
+        unaliased_tc->member_type (i
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // This Any constructor is a TAO extension.
@@ -103,29 +103,29 @@ TAO_DynStruct_i::init (const CORBA_Any& any,
       // This recursive step will call the correct constructor
       // based on the type of field_any.
       this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (field_any,
-                                         ACE_TRY_ENV);
+        TAO_DynAnyFactory::make_dyn_any (field_any
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                               &cdr,
-                                               ACE_TRY_ENV);
+                                               &cdr
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc
+                       TAO_ENV_ARG_DECL)
 {
-  this->check_typecode (tc, 
-                        ACE_TRY_ENV);
+  this->check_typecode (tc
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
-  CORBA::ULong numfields = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong numfields = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resize the array.
@@ -137,13 +137,13 @@ TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc,
 
   for (CORBA::ULong i = 0; i < numfields; i++)
     {
-      mtype = tc->member_type (i,
-                               ACE_TRY_ENV);
+      mtype = tc->member_type (i
+                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Recursively initialize each member.
-      this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (mtype.in (),
-                                                              ACE_TRY_ENV);
+      this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (mtype.in ()
+                                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -151,8 +151,8 @@ TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc,
 // ****************************************************************
 
 TAO_DynStruct_i *
-TAO_DynStruct_i::_narrow (CORBA::Object_ptr obj,
-                          CORBA::Environment &)
+TAO_DynStruct_i::_narrow (CORBA::Object_ptr obj
+                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -182,14 +182,14 @@ TAO_DynStruct_i::_tao_QueryInterface (ptr_arith_t type)
       return this;
     }
 
-  return 
+  return
     this->ACE_NESTED_CLASS (DynamicAny, DynStruct::_tao_QueryInterface) (type);
 }
 
 // ****************************************************************
 
 DynamicAny::FieldName
-TAO_DynStruct_i::current_member_name (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::current_member_name (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -217,8 +217,8 @@ TAO_DynStruct_i::current_member_name (CORBA::Environment &ACE_TRY_ENV)
 
   // Member_name works with aliased type codes.
   const char *name =
-    this->type_->member_name (this->current_position_, 
-                              ACE_TRY_ENV);
+    this->type_->member_name (this->current_position_
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CORBA::string_dup (name);
@@ -226,7 +226,7 @@ TAO_DynStruct_i::current_member_name (CORBA::Environment &ACE_TRY_ENV)
 
 // Returns the unaliased TCKind.
 CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynStruct_i::current_member_kind (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -252,20 +252,20 @@ TAO_DynStruct_i::current_member_kind (CORBA::Environment& ACE_TRY_ENV)
                         CORBA::tk_null);
     }
 
-  CORBA::TypeCode_var tc = 
-    this->type_.in ()->member_type (this->current_position_,
-                                    ACE_TRY_ENV);
+  CORBA::TypeCode_var tc =
+    this->type_.in ()->member_type (this->current_position_
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
-  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in (),
-                                                     ACE_TRY_ENV);
+  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   return retval;
 }
 
 DynamicAny::NameValuePairSeq *
-TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynStruct_i::get_members (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -294,7 +294,7 @@ TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
       safe_retval[i].id =
         CORBA::string_dup (this->type_.in ()->member_name (i));
 
-      temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
+      temp = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       safe_retval[i].value = temp.in ();
@@ -304,8 +304,8 @@ TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
 }
 
 void
-TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values,
-                              CORBA::Environment& ACE_TRY_ENV)
+TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -331,21 +331,21 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values,
 
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Check for type and name match.
-      my_tc = unaliased_tc->member_type (i, 
-                                         ACE_TRY_ENV);
+      my_tc = unaliased_tc->member_type (i
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       value_tc = values[i].value.type ();
 
-      equivalent = my_tc->equivalent (value_tc.in (),
-                                      ACE_TRY_ENV);
+      equivalent = my_tc->equivalent (value_tc.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!equivalent)
@@ -353,12 +353,12 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values,
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      this->da_members_[i]->destroy (ACE_TRY_ENV);
+      this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->da_members_[i] =
-        TAO_DynAnyFactory::make_dyn_any (values[i].value,
-                                         ACE_TRY_ENV);
+        TAO_DynAnyFactory::make_dyn_any (values[i].value
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -366,7 +366,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values,
 }
 
 DynamicAny::NameDynAnyPairSeq *
-TAO_DynStruct_i::get_members_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::get_members_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -397,11 +397,11 @@ TAO_DynStruct_i::get_members_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
       // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
-                      0,
-                      ACE_TRY_ENV);
+                      0
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      safe_retval[i].value = 
+      safe_retval[i].value =
         DynamicAny::DynAny::_duplicate (this->da_members_[i].in ());
       ACE_CHECK_RETURN (0);
     }
@@ -411,8 +411,8 @@ TAO_DynStruct_i::get_members_as_dyn_any (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_DynStruct_i::set_members_as_dyn_any (
-    const DynamicAny::NameDynAnyPairSeq & values,
-    CORBA::Environment &ACE_TRY_ENV
+    const DynamicAny::NameDynAnyPairSeq & values
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -439,22 +439,22 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Check for type and name match.
-      my_tc = unaliased_tc->member_type (i, 
-                                         ACE_TRY_ENV);
+      my_tc = unaliased_tc->member_type (i
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      value_tc = values[i].value->type (ACE_TRY_ENV);
+      value_tc = values[i].value->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      equivalent = my_tc->equivalent (value_tc.in (),
-                                      ACE_TRY_ENV);
+      equivalent = my_tc->equivalent (value_tc.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!equivalent)
@@ -462,10 +462,10 @@ TAO_DynStruct_i::set_members_as_dyn_any (
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      this->da_members_[i]->destroy (ACE_TRY_ENV);
+      this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->da_members_[i] = values[i].value->copy (ACE_TRY_ENV);
+      this->da_members_[i] = values[i].value->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -475,8 +475,8 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 // ****************************************************************
 
 void
-TAO_DynStruct_i::from_any (const CORBA_Any & any,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::from_any (const CORBA_Any & any
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -489,8 +489,8 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any,
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = this->type_->equivalent (tc.in (),
-                                                       ACE_TRY_ENV);
+  CORBA::Boolean equivalent = this->type_->equivalent (tc.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -501,8 +501,8 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any,
                         any._tao_byte_order ());
 
       // If we have an exception type, unmarshal the repository ID.
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in (),
-                                                       ACE_TRY_ENV);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind == CORBA::tk_except)
@@ -515,8 +515,8 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any,
 
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
-          field_tc = this->type_.in ()->member_type (i,
-                                                     ACE_TRY_ENV);
+          field_tc = this->type_.in ()->member_type (i
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // This Any constructor is a TAO extension.
@@ -525,18 +525,18 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any,
                                cdr.byte_order (),
                                cdr.start ());
 
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
+          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->da_members_[i] =
-            TAO_DynAnyFactory::make_dyn_any (field_any,
-                                                       ACE_TRY_ENV);
+            TAO_DynAnyFactory::make_dyn_any (field_any
+                                                       TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
+                                                   &cdr
+                                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -549,7 +549,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any,
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -563,8 +563,8 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   TAO_OutputCDR out_cdr;
 
   // If we have an exception type, marshal the repository ID.
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (kind == CORBA::tk_except)
@@ -574,11 +574,11 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      CORBA_TypeCode_var field_tc = this->da_members_[i]->type (ACE_TRY_ENV);
+      CORBA_TypeCode_var field_tc = this->da_members_[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
-      CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_TRY_ENV);
+      CORBA_Any_var field_any = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
@@ -588,8 +588,8 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
-                                                 &out_cdr,
-                                                 ACE_TRY_ENV);
+                                                 &out_cdr
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -608,8 +608,8 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -620,11 +620,11 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs,
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Boolean equivalent = tc->equivalent (this->type_.in (),
-                                              ACE_TRY_ENV);
+  CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -637,17 +637,17 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs,
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      rhs->seek (ACE_static_cast (CORBA::Long, 
-                                  i),
-                 ACE_TRY_ENV);
+      rhs->seek (ACE_static_cast (CORBA::Long,
+                                  i)
+                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      tmp = rhs->current_component (ACE_TRY_ENV);
+      tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
-      member_equal = tmp->equal (this->da_members_[i].in (),
-                                 ACE_TRY_ENV);
+      member_equal = tmp->equal (this->da_members_[i].in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!member_equal)
@@ -660,7 +660,7 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs,
 }
 
 void
-TAO_DynStruct_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -676,11 +676,11 @@ TAO_DynStruct_i::destroy (CORBA::Environment &ACE_TRY_ENV)
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
           this->set_flag (da_members_[i].in (),
-                          1,
-                          ACE_TRY_ENV);
+                          1
+                          TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->da_members_[i]->destroy (ACE_TRY_ENV);
+          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -689,7 +689,7 @@ TAO_DynStruct_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynStruct_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynStruct_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -713,12 +713,12 @@ TAO_DynStruct_i::current_component (CORBA::Environment &ACE_TRY_ENV)
       return DynamicAny::DynAny::_nil ();
     }
 
-  CORBA::ULong index = ACE_static_cast (CORBA::ULong, 
+  CORBA::ULong index = ACE_static_cast (CORBA::ULong,
                                         this->current_position_);
 
   this->set_flag (this->da_members_[index].in (),
-                  0,
-                  ACE_TRY_ENV);
+                  0
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 3d47595f445..8eec9567baa 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -34,7 +34,7 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynStruct_i 
+class TAO_DynamicAny_Export TAO_DynStruct_i
   : public virtual DynamicAny::DynStruct,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
@@ -52,28 +52,26 @@ public:
   ~TAO_DynStruct_i (void);
   // Destructor.
 
-  void init (CORBA_TypeCode_ptr tc,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (CORBA_TypeCode_ptr tc
+             TAO_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
-  void init (const CORBA_Any& any,
-             CORBA::Environment &ACE_TRY_ENV);
+  void init (const CORBA_Any& any
+             TAO_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynStruct_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynStruct.
 
   virtual DynamicAny::FieldName current_member_name (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -81,9 +79,8 @@ public:
       ));
 
   virtual CORBA::TCKind current_member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -91,18 +88,16 @@ public:
       ));
 
   virtual DynamicAny::NameValuePairSeq *get_members (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_members (
-      const DynamicAny::NameValuePairSeq& value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::NameValuePairSeq& value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -110,18 +105,16 @@ public:
       ));
 
   virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_members_as_dyn_any (
-      const DynamicAny::NameDynAnyPairSeq & value,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const DynamicAny::NameDynAnyPairSeq & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -131,10 +124,9 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
-      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,
         DynamicAny::DynAny::TypeMismatch,
@@ -142,34 +134,30 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -177,8 +165,8 @@ public:
 
 private:
   // Check if the typecode is acceptable.
-  void check_typecode (CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void check_typecode (CORBA::TypeCode_ptr tc
+                       TAO_ENV_ARG_DECL);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 02042f1ed6b..7a5136e585f 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -30,13 +30,13 @@ TAO_DynUnion_i::init_common (void)
 }
 
 void
-TAO_DynUnion_i::init (const CORBA_Any& any,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::init (const CORBA_Any& any
+                      TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_union)
@@ -52,17 +52,17 @@ TAO_DynUnion_i::init (const CORBA_Any& any,
   // Set the from_factory arg to TRUE, so any problems will throw
   // InconsistentTypeCode.
   this->set_from_any (any,
-                      1,
-                      ACE_TRY_ENV);
+                      1
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc
+                      TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc,
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_union)
@@ -75,31 +75,31 @@ TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc,
 
   this->init_common ();
 
-  CORBA::Any_var first_label = tc->member_label (this->current_position_,
-                                                 ACE_TRY_ENV);
+  CORBA::Any_var first_label = tc->member_label (this->current_position_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Initialize the discriminator to the label value of the first member.
   this->discriminator_ =
-    TAO_DynAnyFactory::make_dyn_any (first_label.in (),
-                                     ACE_TRY_ENV);
+    TAO_DynAnyFactory::make_dyn_any (first_label.in ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var first_type = tc->member_type (this->current_position_,
-                                                    ACE_TRY_ENV);
+  CORBA::TypeCode_var first_type = tc->member_type (this->current_position_
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Recursively initialize the member to its default value.
-  this->member_ = TAO_DynAnyFactory::make_dyn_any (first_type.in (),
-                                                   ACE_TRY_ENV);
+  this->member_ = TAO_DynAnyFactory::make_dyn_any (first_type.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 // ****************************************************************
 
 TAO_DynUnion_i *
-TAO_DynUnion_i::_narrow (CORBA::Object_ptr obj,
-                         CORBA::Environment &)
+TAO_DynUnion_i::_narrow (CORBA::Object_ptr obj
+                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -129,7 +129,7 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
       return this;
     }
 
-  return 
+  return
     this->ACE_NESTED_CLASS (DynamicAny, DynUnion::_tao_QueryInterface) (type);
 }
 
@@ -137,8 +137,8 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
 // an Any argument.
 void
 TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
-                              CORBA::Boolean from_factory,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Boolean from_factory
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -153,7 +153,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA_TypeCode_var disc_tc = tc->discriminator_type (ACE_TRY_ENV);
+  CORBA_TypeCode_var disc_tc = tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA_Any disc_any (disc_tc.in (),
@@ -163,23 +163,23 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->discriminator_.in ()))
-    {  
-      this->discriminator_->destroy (ACE_TRY_ENV);
+    {
+      this->discriminator_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // Set the discriminator.
-  this->discriminator_ = TAO_DynAnyFactory::make_dyn_any (disc_any,
-                                                          ACE_TRY_ENV);
+  this->discriminator_ = TAO_DynAnyFactory::make_dyn_any (disc_any
+                                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Move to the next field in the CDR stream.
   (void) TAO_Marshal_Object::perform_skip (disc_tc.in (),
-                                           &cdr,
-                                           ACE_TRY_ENV);
+                                           &cdr
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong count = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean match = 0;
@@ -188,13 +188,13 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
   // Get the index.
   for (i = 0; i < count; ++i)
     {
-      CORBA_Any_var label_any = tc->member_label (i,
-                                                  ACE_TRY_ENV);
+      CORBA_Any_var label_any = tc->member_label (i
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       match = this->label_match (label_any.in (),
-                                 disc_any,
-                                 ACE_TRY_ENV);
+                                 disc_any
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (match)
@@ -205,15 +205,15 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->member_.in ()))
-    {  
-      this->member_->destroy (ACE_TRY_ENV);
+    {
+      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (match)
     {
-      CORBA::TypeCode_var member_tc = tc->member_type (i,
-                                                       ACE_TRY_ENV);
+      CORBA::TypeCode_var member_tc = tc->member_type (i
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA_Any member_any (member_tc.in (),
@@ -222,8 +222,8 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
                             cdr.start ());
 
       this->member_ =
-        TAO_DynAnyFactory::make_dyn_any (member_any,
-                                         ACE_TRY_ENV);
+        TAO_DynAnyFactory::make_dyn_any (member_any
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->member_slot_ = i;
@@ -235,11 +235,11 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
       // default_index() does not work with aliased type codes.
       CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                        ACE_TRY_ENV);
+        TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Long default_index = unaliased_tc->default_index (ACE_TRY_ENV);
+      CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (default_index == -1)
@@ -258,8 +258,8 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
           CORBA::ULong index = ACE_static_cast (CORBA::ULong,
                                                 default_index);
 
-          CORBA::TypeCode_var default_tc = tc->member_type (index,
-                                                            ACE_TRY_ENV);
+          CORBA::TypeCode_var default_tc = tc->member_type (index
+                                                            TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA_Any default_any (default_tc.in (),
@@ -268,10 +268,10 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
                                  cdr.start ());
 
           this->member_ =
-            TAO_DynAnyFactory::make_dyn_any (default_any,
-                                             ACE_TRY_ENV);
+            TAO_DynAnyFactory::make_dyn_any (default_any
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          
+
           this->member_slot_ = index;
         }
     }
@@ -280,7 +280,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 // ****************************************************************
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::get_discriminator (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::get_discriminator (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -294,15 +294,15 @@ TAO_DynUnion_i::get_discriminator (CORBA::Environment &ACE_TRY_ENV)
   // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
   // Set the flag so the caller can't destroy.
   this->set_flag (this->discriminator_.in (),
-                  0,
-                  ACE_TRY_ENV);
+                  0
+                  TAO_ENV_ARG_PARAMETER);
 
   return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
 }
 
 void
-TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -313,14 +313,14 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA::TypeCode_var tc = value->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = value->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_TRY_ENV);
+  CORBA::TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Boolean equivalent = disc_tc->equivalent (tc.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean equivalent = disc_tc->equivalent (tc.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!equivalent)
@@ -328,10 +328,10 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
       ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
     }
 
-  CORBA_Any_var value_any = value->to_any (ACE_TRY_ENV);
+  CORBA_Any_var value_any = value->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = this->type_->member_count (ACE_TRY_ENV);
+  CORBA::ULong length = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA_Any_var label_any;
@@ -339,21 +339,21 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
 
   // member_label() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean match = 0;
 
   for (i = 0; i < length; ++i)
     {
-      label_any = unaliased_tc->member_label (i,
-                                              ACE_TRY_ENV);
+      label_any = unaliased_tc->member_label (i
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       match = this->label_match (label_any.in (),
-                                 value_any.in (),
-                                 ACE_TRY_ENV);
+                                 value_any.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (match)
@@ -364,7 +364,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
 
   if (match)
     {
-      // If the incoming label value matches the one we already 
+      // If the incoming label value matches the one we already
       // have, we do nothing.
       if (i == this->member_slot_)
         {
@@ -372,22 +372,22 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
         }
 
       // If we got a match, a named member will be active.
-      this->discriminator_->from_any (label_any.in (),
-                                      ACE_TRY_ENV);
+      this->discriminator_->from_any (label_any.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // member_type() does not work with aliased type codes.
-      CORBA::TypeCode_var member_tc = 
-        unaliased_tc->member_type (i,
-                                   ACE_TRY_ENV);
+      CORBA::TypeCode_var member_tc =
+        unaliased_tc->member_type (i
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_->destroy (ACE_TRY_ENV);
+      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Initialize member to default value.
-      this->member_ = TAO_DynAnyFactory::make_dyn_any (member_tc.in (),
-                                                       ACE_TRY_ENV);
+      this->member_ = TAO_DynAnyFactory::make_dyn_any (member_tc.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Named active member (CORBA 2.3.1).
@@ -400,24 +400,24 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
     {
       // default_index() does not work with aliased type codes.
       CORBA::TypeCode_var unaliased_tc =
-        TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                        ACE_TRY_ENV);
+        TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // If no match, either the default member or no member is active.
-      CORBA::Long default_index = unaliased_tc->default_index (ACE_TRY_ENV);
+      CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (default_index == -1)
         {
           // This can't throw InvalidValue - if there's no default case
           // and all possible labels are used, we'd have had a match above.
-          this->set_to_no_active_member (ACE_TRY_ENV);
+          this->set_to_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
-          this->set_to_default_member (ACE_TRY_ENV);
+          this->set_to_default_member (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->member_slot_ = ACE_static_cast (CORBA::ULong,
@@ -427,15 +427,15 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value,
 
   // If we get here, we update the discriminator no matter what.
   // Any value will correspond to one of the three cases above.
-  this->discriminator_->destroy (ACE_TRY_ENV);
+  this->discriminator_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->discriminator_ = value->copy (ACE_TRY_ENV);
+  this->discriminator_ = value->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_DynUnion_i::set_to_default_member (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -448,11 +448,11 @@ TAO_DynUnion_i::set_to_default_member (CORBA::Environment &ACE_TRY_ENV)
 
   // default_index() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = unaliased_tc->default_index (ACE_TRY_ENV);
+  CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (default_index == -1)
@@ -465,18 +465,18 @@ TAO_DynUnion_i::set_to_default_member (CORBA::Environment &ACE_TRY_ENV)
       CORBA::ULong index = ACE_static_cast (CORBA::ULong,
                                             default_index);
 
-      CORBA::TypeCode_var default_tc = 
-        unaliased_tc->member_type (index,
-                                   ACE_TRY_ENV);
+      CORBA::TypeCode_var default_tc =
+        unaliased_tc->member_type (index
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_->destroy (ACE_TRY_ENV);
+      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_ = TAO_DynAnyFactory::make_dyn_any (default_tc.in (),
-                                                       ACE_TRY_ENV);
+      this->member_ = TAO_DynAnyFactory::make_dyn_any (default_tc.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      
+
       // Default member active (CORBA 2.3.1).
       this->current_position_ = 0;
       this->component_count_ = 2;
@@ -486,7 +486,7 @@ TAO_DynUnion_i::set_to_default_member (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_DynUnion_i::set_to_no_active_member (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -499,13 +499,13 @@ TAO_DynUnion_i::set_to_no_active_member (CORBA::Environment& ACE_TRY_ENV)
 
   // default_index() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
-    TAO_DynAnyFactory::strip_alias (this->type_.in (),
-                                    ACE_TRY_ENV);
+    TAO_DynAnyFactory::strip_alias (this->type_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = unaliased_tc->default_index (ACE_TRY_ENV);
+  CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   // Throw an exception is there is an explicit default case or if all
   // possible case label values are used.
   if (default_index != -1)
@@ -514,19 +514,19 @@ TAO_DynUnion_i::set_to_no_active_member (CORBA::Environment& ACE_TRY_ENV)
     }
   else
     {
-      CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_TRY_ENV);
+      CORBA::TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (disc_tc.in (),
-                                                       ACE_TRY_ENV);
+      CORBA::TCKind kind = TAO_DynAnyFactory::unalias (disc_tc.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind == CORBA::tk_enum)
         {
-          CORBA::ULong member_count = this->type_->member_count (ACE_TRY_ENV);
+          CORBA::ULong member_count = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
-          CORBA::ULong label_count = disc_tc->member_count (ACE_TRY_ENV);
+          CORBA::ULong label_count = disc_tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (member_count == label_count)
@@ -542,7 +542,7 @@ TAO_DynUnion_i::set_to_no_active_member (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::has_no_active_member (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::has_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -554,12 +554,12 @@ TAO_DynUnion_i::has_no_active_member (CORBA::Environment &ACE_TRY_ENV)
     }
 
   // No active member (CORBA 2.3.1).
-  return (this->current_position_ == 0 
+  return (this->current_position_ == 0
           && this->component_count_ == 1);
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::discriminator_kind (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -570,18 +570,18 @@ TAO_DynUnion_i::discriminator_kind (CORBA::Environment& ACE_TRY_ENV)
                         CORBA::tk_null);
     }
 
-  CORBA_TypeCode_var tc = this->discriminator_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
-  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in (),
-                                                     ACE_TRY_ENV);
+  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   return retval;
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::member (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::member (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -593,8 +593,8 @@ TAO_DynUnion_i::member (CORBA::Environment &ACE_TRY_ENV)
                         DynamicAny::DynAny::_nil ());
     }
 
-  CORBA::Boolean has_no_active_member = 
-    this->has_no_active_member (ACE_TRY_ENV);
+  CORBA::Boolean has_no_active_member =
+    this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   if (has_no_active_member)
@@ -606,15 +606,15 @@ TAO_DynUnion_i::member (CORBA::Environment &ACE_TRY_ENV)
   // A deep copy is made only by copy() (CORBA 2.4.2 section 9.2.3.6).
   // Set the flag so the caller can't destroy.
   this->set_flag (this->member_.in (),
-                  0,
-                  ACE_TRY_ENV);
+                  0
+                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (this->member_.in ());
 }
 
 char *
-TAO_DynUnion_i::member_name (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::member_name (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -626,8 +626,8 @@ TAO_DynUnion_i::member_name (CORBA::Environment& ACE_TRY_ENV)
                         0);
     }
 
-  CORBA::Boolean has_no_active_member = 
-    this->has_no_active_member (ACE_TRY_ENV);
+  CORBA::Boolean has_no_active_member =
+    this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (has_no_active_member)
@@ -636,15 +636,15 @@ TAO_DynUnion_i::member_name (CORBA::Environment& ACE_TRY_ENV)
                         0);
     }
 
-  const char *retval = this->type_->member_name (this->member_slot_,
-                                                 ACE_TRY_ENV);
+  const char *retval = this->type_->member_name (this->member_slot_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CORBA::string_dup (retval);
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::member_kind (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -656,8 +656,8 @@ TAO_DynUnion_i::member_kind (CORBA::Environment& ACE_TRY_ENV)
                         CORBA::tk_null);
     }
 
-  CORBA::Boolean has_no_active_member = 
-    this->has_no_active_member (ACE_TRY_ENV);
+  CORBA::Boolean has_no_active_member =
+    this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   if (has_no_active_member)
@@ -666,11 +666,11 @@ TAO_DynUnion_i::member_kind (CORBA::Environment& ACE_TRY_ENV)
                         CORBA::tk_null);
     }
 
-  CORBA_TypeCode_var tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var tc = this->member_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
-  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in (),
-                                                     ACE_TRY_ENV);
+  CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   return retval;
@@ -679,8 +679,8 @@ TAO_DynUnion_i::member_kind (CORBA::Environment& ACE_TRY_ENV)
 // ****************************************************************
 
 void
-TAO_DynUnion_i::from_any (const CORBA_Any& any,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::from_any (const CORBA_Any& any
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -693,8 +693,8 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any,
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in (),
-                                                             ACE_TRY_ENV);
+  CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -708,8 +708,8 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any,
       // Set the from_factory arg to FALSE, so any problems will throw
       // TypeMismatch.
       this->set_from_any (any,
-                          0,
-                          ACE_TRY_ENV);
+                          0
+                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -719,7 +719,7 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -734,10 +734,10 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   // Add the discriminator to the CDR stream.
 
-  CORBA_TypeCode_var disc_tc = this->discriminator_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA_Any_var disc_any = this->discriminator_->to_any (ACE_TRY_ENV);
+  CORBA_Any_var disc_any = this->discriminator_->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *disc_mb = disc_any->_tao_get_cdr ();
@@ -747,16 +747,16 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   (void) TAO_Marshal_Object::perform_append (disc_tc.in (),
                                              &disc_cdr,
-                                             &out_cdr,
-                                             ACE_TRY_ENV);
+                                             &out_cdr
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Add the member to the CDR stream.
 
-  CORBA_TypeCode_var member_tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_var member_tc = this->member_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA_Any_var member_any = this->member_->to_any (ACE_TRY_ENV);
+  CORBA_Any_var member_any = this->member_->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *member_mb = member_any->_tao_get_cdr ();
@@ -766,8 +766,8 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   (void) TAO_Marshal_Object::perform_append (member_tc.in (),
                                              &member_cdr,
-                                             &out_cdr,
-                                             ACE_TRY_ENV);
+                                             &out_cdr
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Make the Any.
@@ -786,8 +786,8 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -798,8 +798,8 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs,
                         0);
     }
 
-  TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs,
-                                                  ACE_TRY_ENV);
+  TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (impl == 0)
@@ -807,8 +807,8 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs,
       return 0;
     }
 
-  CORBA::Boolean equivalent = this->type_->equivalent (impl->type_.in (),
-                                                       ACE_TRY_ENV);
+  CORBA::Boolean equivalent = this->type_->equivalent (impl->type_.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -816,13 +816,13 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs,
       return 0;
     }
 
-  CORBA::Boolean member_equal = this->member_->equal (impl->member_.in (),
-                                                      ACE_TRY_ENV);
+  CORBA::Boolean member_equal = this->member_->equal (impl->member_.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Boolean disc_equal = 
-    this->discriminator_->equal (impl->discriminator_.in (),
-                                 ACE_TRY_ENV);
+  CORBA::Boolean disc_equal =
+    this->discriminator_->equal (impl->discriminator_.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   impl->_remove_ref ();
@@ -831,7 +831,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs,
 }
 
 void
-TAO_DynUnion_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -846,19 +846,19 @@ TAO_DynUnion_i::destroy (CORBA::Environment &ACE_TRY_ENV)
       // Free the two components.
 
       this->set_flag (this->member_.in (),
-                      1,
-                      ACE_TRY_ENV);
+                      1
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_->destroy (ACE_TRY_ENV);
+      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->set_flag (this->discriminator_.in (),
-                      1,
-                      ACE_TRY_ENV);
+                      1
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->discriminator_->destroy (ACE_TRY_ENV);
+      this->discriminator_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->destroyed_ = 1;
@@ -866,7 +866,7 @@ TAO_DynUnion_i::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::current_component (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -881,8 +881,8 @@ TAO_DynUnion_i::current_component (CORBA::Environment &ACE_TRY_ENV)
   if (this->current_position_ == 1)
     {
       this->set_flag (this->member_.in (),
-                      0,
-                      ACE_TRY_ENV);
+                      0
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
       return DynamicAny::DynAny::_duplicate (this->member_.in ());
@@ -890,8 +890,8 @@ TAO_DynUnion_i::current_component (CORBA::Environment &ACE_TRY_ENV)
   else
     {
       this->set_flag (this->discriminator_.in (),
-                      0,
-                      ACE_TRY_ENV);
+                      0
+                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
       return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
@@ -900,10 +900,10 @@ TAO_DynUnion_i::current_component (CORBA::Environment &ACE_TRY_ENV)
 
 // ****************************************************************
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_DynUnion_i::label_match (const CORBA_Any &my_any,
-                             const CORBA_Any &other_any,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             const CORBA_Any &other_any
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -913,8 +913,8 @@ TAO_DynUnion_i::label_match (const CORBA_Any &my_any,
   // member_label() calls.
   CORBA::TypeCode_var tc = my_any.type ();
 
-  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in (),
-                                                   ACE_TRY_ENV);
+  CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // No need to do any type checking - it was done before this
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index 6158fe4b649..71824e6ce71 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -33,7 +33,7 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_DynamicAny_Export TAO_DynUnion_i 
+class TAO_DynamicAny_Export TAO_DynUnion_i
   : public virtual DynamicAny::DynUnion,
     public virtual TAO_DynCommon,
     public virtual TAO_Local_RefCounted_Object
@@ -50,96 +50,86 @@ public:
   ~TAO_DynUnion_i (void);
   // Destructor.
 
-  void init (const CORBA_Any& any, CORBA::Environment &ACE_TRY_ENV);
+  void init (const CORBA_Any& any TAO_ENV_ARG_DECL);
   // Constructor taking an Any argument.
 
-  void init (CORBA_TypeCode_ptr tc, CORBA::Environment &ACE_TRY_ENV);
+  void init (CORBA_TypeCode_ptr tc TAO_ENV_ARG_DECL);
   // Constructor taking a typecode argument.
 
   // = LocalObject methods.
   static TAO_DynUnion_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynUnion.
 
   virtual DynamicAny::DynAny_ptr get_discriminator (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void set_discriminator (
-      DynamicAny::DynAny_ptr d,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr d
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       ));
 
   virtual void set_to_default_member (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       ));
 
   virtual void set_to_no_active_member (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       ));
 
   virtual CORBA::Boolean has_no_active_member (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::TCKind discriminator_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr member (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       ));
 
   virtual char * member_name (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       ));
 
   virtual CORBA::TCKind member_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
@@ -148,10 +138,9 @@ public:
   // = DynAny common functions not implemented in class TAO_DynCommon.
 
   virtual void from_any (
-      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,
         DynamicAny::DynAny::TypeMismatch,
@@ -159,34 +148,30 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean equal (
-      DynamicAny::DynAny_ptr dyn_any,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      DynamicAny::DynAny_ptr dyn_any
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
@@ -196,9 +181,8 @@ private:
   // Code common to the constructor from an Any arg and the member
   // function from_any().
   void set_from_any (const CORBA_Any &any,
-                     CORBA::Boolean from_factory,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ())
+                     CORBA::Boolean from_factory
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -210,9 +194,8 @@ private:
 
   // Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA_Any &my_any,
-                              const CORBA_Any &other_any,
-                              CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ())
+                              const CORBA_Any &other_any
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 22f831c5cab..64713cc43a9 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -26,8 +26,8 @@ TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
 CORBA::Object_ptr
 TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
                                       int,
-                                      char *[],
-                                      CORBA::Environment &)
+                                      char *[]
+                                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 4e66924831b..9c6075c1211 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -35,8 +35,8 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv [],
-                                           CORBA::Environment &)
+                                           char *argv []
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Creates a DynamicAny factory and returns it.
 
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 679a4aed976..c30a98feecd 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -79,7 +79,7 @@ DynamicAny::DynAny_var::operator const ::DynamicAny::DynAny_ptr &() const // cas
   return this->ptr_;
 }
 
-DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast 
+DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -139,11 +139,11 @@ DynamicAny::DynAny_var::tao_nil (void)
 
 ::DynamicAny::DynAny_ptr
 DynamicAny::DynAny_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynAny::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynAny::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -224,16 +224,16 @@ DynamicAny::DynAny::~DynAny (void)
 {}
 
 DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynAny::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynAny::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr DynamicAny::DynAny::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -271,7 +271,7 @@ void *DynamicAny::DynAny::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -327,16 +327,16 @@ void DynamicAny::DynAny::InvalidValue::_raise ()
 }
 
 void DynamicAny::DynAny::InvalidValue::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void DynamicAny::DynAny::InvalidValue::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -395,16 +395,16 @@ void DynamicAny::DynAny::TypeMismatch::_raise ()
 }
 
 void DynamicAny::DynAny::TypeMismatch::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void DynamicAny::DynAny::TypeMismatch::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -468,7 +468,7 @@ DynamicAny::DynFixed_var::operator const ::DynamicAny::DynFixed_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast 
+DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -528,11 +528,11 @@ DynamicAny::DynFixed_var::tao_nil (void)
 
 ::DynamicAny::DynFixed_ptr
 DynamicAny::DynFixed_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynFixed::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynFixed::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -613,16 +613,16 @@ DynamicAny::DynFixed::~DynFixed (void)
 {}
 
 DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynFixed::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynFixed::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -672,7 +672,7 @@ void *DynamicAny::DynFixed::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -733,7 +733,7 @@ DynamicAny::DynEnum_var::operator const ::DynamicAny::DynEnum_ptr &() const // c
   return this->ptr_;
 }
 
-DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast 
+DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -793,11 +793,11 @@ DynamicAny::DynEnum_var::tao_nil (void)
 
 ::DynamicAny::DynEnum_ptr
 DynamicAny::DynEnum_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynEnum::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynEnum::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -878,16 +878,16 @@ DynamicAny::DynEnum::~DynEnum (void)
 {}
 
 DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynEnum::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynEnum::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -937,7 +937,7 @@ void *DynamicAny::DynEnum::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -952,19 +952,19 @@ static const CORBA::Long _oc_DynamicAny_FieldName[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d696341), 
-  ACE_NTOHL (0x6e792f46), 
-  ACE_NTOHL (0x69656c64), 
-  ACE_NTOHL (0x4e616d65), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d696341),
+  ACE_NTOHL (0x6e792f46),
+  ACE_NTOHL (0x69656c64),
+  ACE_NTOHL (0x4e616d65),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
   10,
-  ACE_NTOHL (0x4669656c), 
-  ACE_NTOHL (0x644e616d), 
+  ACE_NTOHL (0x4669656c),
+  ACE_NTOHL (0x644e616d),
   ACE_NTOHL (0x65000000),  // name = FieldName
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -985,19 +985,19 @@ static const CORBA::Long _oc_DynamicAny_NameValuePair[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d696341), 
-  ACE_NTOHL (0x6e792f4e), 
-  ACE_NTOHL (0x616d6556), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x50616972), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d696341),
+  ACE_NTOHL (0x6e792f4e),
+  ACE_NTOHL (0x616d6556),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x50616972),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/NameValuePair:1.0
   14,
-  ACE_NTOHL (0x4e616d65), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65506169), 
+  ACE_NTOHL (0x4e616d65),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65506169),
   ACE_NTOHL (0x72000000),  // name = NameValuePair
   2, // member count
   3,
@@ -1006,23 +1006,23 @@ static const CORBA::Long _oc_DynamicAny_NameValuePair[] =
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     29,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x44796e61), 
-    ACE_NTOHL (0x6d696341), 
-    ACE_NTOHL (0x6e792f46), 
-    ACE_NTOHL (0x69656c64), 
-    ACE_NTOHL (0x4e616d65), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x44796e61),
+    ACE_NTOHL (0x6d696341),
+    ACE_NTOHL (0x6e792f46),
+    ACE_NTOHL (0x69656c64),
+    ACE_NTOHL (0x4e616d65),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
     10,
-    ACE_NTOHL (0x4669656c), 
-    ACE_NTOHL (0x644e616d), 
+    ACE_NTOHL (0x4669656c),
+    ACE_NTOHL (0x644e616d),
     ACE_NTOHL (0x65000000),  // name = FieldName
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
   CORBA::tk_any,
 
@@ -1049,7 +1049,7 @@ void DynamicAny::NameValuePair::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
 
@@ -1058,43 +1058,43 @@ void DynamicAny::NameValuePair::_tao_any_destructor (void *x)
   {
     DynamicAny::NameValuePair* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       DynamicAny::NameValuePair *old = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     DynamicAny::NameValuePair *tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CS_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CS_
@@ -1106,30 +1106,30 @@ void DynamicAny::NameValuePair::_tao_any_destructor (void *x)
 DynamicAny::NameValuePairSeq::NameValuePairSeq (void)
 {}
 DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 DynamicAny::NameValuePairSeq::NameValuePairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameValuePair *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 DynamicAny::NameValuePairSeq::NameValuePairSeq (const NameValuePairSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<DynamicAny::NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 DynamicAny::NameValuePairSeq::~NameValuePairSeq (void) // dtor
@@ -1147,20 +1147,20 @@ static const CORBA::Long _oc_DynamicAny_NameValuePairSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d696341), 
-  ACE_NTOHL (0x6e792f4e), 
-  ACE_NTOHL (0x616d6556), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x50616972), 
-  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d696341),
+  ACE_NTOHL (0x6e792f4e),
+  ACE_NTOHL (0x616d6556),
+  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x50616972),
+  ACE_NTOHL (0x5365713a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:DynamicAny/NameValuePairSeq:1.0
   17,
-  ACE_NTOHL (0x4e616d65), 
-  ACE_NTOHL (0x56616c75), 
-  ACE_NTOHL (0x65506169), 
-  ACE_NTOHL (0x72536571), 
+  ACE_NTOHL (0x4e616d65),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65506169),
+  ACE_NTOHL (0x72536571),
   ACE_NTOHL (0x0),  // name = NameValuePairSeq
   CORBA::tk_sequence, // typecode kind
   180, // encapsulation length
@@ -1169,19 +1169,19 @@ static const CORBA::Long _oc_DynamicAny_NameValuePairSeq[] =
     164, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x44796e61), 
-      ACE_NTOHL (0x6d696341), 
-      ACE_NTOHL (0x6e792f4e), 
-      ACE_NTOHL (0x616d6556), 
-      ACE_NTOHL (0x616c7565), 
-      ACE_NTOHL (0x50616972), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x44796e61),
+      ACE_NTOHL (0x6d696341),
+      ACE_NTOHL (0x6e792f4e),
+      ACE_NTOHL (0x616d6556),
+      ACE_NTOHL (0x616c7565),
+      ACE_NTOHL (0x50616972),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/NameValuePair:1.0
       14,
-      ACE_NTOHL (0x4e616d65), 
-      ACE_NTOHL (0x56616c75), 
-      ACE_NTOHL (0x65506169), 
+      ACE_NTOHL (0x4e616d65),
+      ACE_NTOHL (0x56616c75),
+      ACE_NTOHL (0x65506169),
       ACE_NTOHL (0x72000000),  // name = NameValuePair
       2, // member count
       3,
@@ -1190,23 +1190,23 @@ static const CORBA::Long _oc_DynamicAny_NameValuePairSeq[] =
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         29,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x44796e61), 
-        ACE_NTOHL (0x6d696341), 
-        ACE_NTOHL (0x6e792f46), 
-        ACE_NTOHL (0x69656c64), 
-        ACE_NTOHL (0x4e616d65), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x44796e61),
+        ACE_NTOHL (0x6d696341),
+        ACE_NTOHL (0x6e792f46),
+        ACE_NTOHL (0x69656c64),
+        ACE_NTOHL (0x4e616d65),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
         10,
-        ACE_NTOHL (0x4669656c), 
-        ACE_NTOHL (0x644e616d), 
+        ACE_NTOHL (0x4669656c),
+        ACE_NTOHL (0x644e616d),
         ACE_NTOHL (0x65000000),  // name = FieldName
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       6,
-      ACE_NTOHL (0x76616c75), 
+      ACE_NTOHL (0x76616c75),
       ACE_NTOHL (0x65000000),  // name = value
       CORBA::tk_any,
 
@@ -1230,7 +1230,7 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
 
@@ -1239,43 +1239,43 @@ TAO_NAMESPACE_END
   {
     DynamicAny::NameDynAnyPair* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       DynamicAny::NameDynAnyPair *old = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     DynamicAny::NameDynAnyPair *tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::~_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_
@@ -1287,30 +1287,30 @@ TAO_NAMESPACE_END
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (void)
 {}
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::NameDynAnyPair *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 DynamicAny::NameDynAnyPairSeq::NameDynAnyPairSeq (const NameDynAnyPairSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<DynamicAny::NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 DynamicAny::NameDynAnyPairSeq::~NameDynAnyPairSeq (void) // dtor
@@ -1374,7 +1374,7 @@ DynamicAny::DynStruct_var::operator const ::DynamicAny::DynStruct_ptr &() const
   return this->ptr_;
 }
 
-DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast 
+DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1434,11 +1434,11 @@ DynamicAny::DynStruct_var::tao_nil (void)
 
 ::DynamicAny::DynStruct_ptr
 DynamicAny::DynStruct_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynStruct::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynStruct::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1519,16 +1519,16 @@ DynamicAny::DynStruct::~DynStruct (void)
 {}
 
 DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynStruct::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynStruct::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1578,7 +1578,7 @@ void *DynamicAny::DynStruct::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1639,7 +1639,7 @@ DynamicAny::DynUnion_var::operator const ::DynamicAny::DynUnion_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast 
+DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1699,11 +1699,11 @@ DynamicAny::DynUnion_var::tao_nil (void)
 
 ::DynamicAny::DynUnion_ptr
 DynamicAny::DynUnion_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynUnion::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynUnion::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1784,16 +1784,16 @@ DynamicAny::DynUnion::~DynUnion (void)
 {}
 
 DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynUnion::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynUnion::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1843,7 +1843,7 @@ void *DynamicAny::DynUnion::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1856,7 +1856,7 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CS_
 
@@ -1865,43 +1865,43 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const
   {
     CORBA::Any* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       CORBA::Any *old = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     CORBA::Any *tmp = ACE_reinterpret_cast (CORBA::Any *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::~_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_ANYSEQ_CS_)
 #define _DYNAMICANY_ANYSEQ_CS_
@@ -1913,30 +1913,30 @@ const char* DynamicAny::DynUnion::_interface_repository_id (void) const
 DynamicAny::AnySeq::AnySeq (void)
 {}
 DynamicAny::AnySeq::AnySeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 DynamicAny::AnySeq::AnySeq (CORBA::ULong max, CORBA::ULong length, CORBA::Any *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 DynamicAny::AnySeq::AnySeq (const AnySeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 DynamicAny::AnySeq::~AnySeq (void) // dtor
@@ -1954,15 +1954,15 @@ static const CORBA::Long _oc_DynamicAny_AnySeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x44796e61), 
-  ACE_NTOHL (0x6d696341), 
-  ACE_NTOHL (0x6e792f41), 
-  ACE_NTOHL (0x6e795365), 
-  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x44796e61),
+  ACE_NTOHL (0x6d696341),
+  ACE_NTOHL (0x6e792f41),
+  ACE_NTOHL (0x6e795365),
+  ACE_NTOHL (0x713a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:DynamicAny/AnySeq:1.0
   7,
-  ACE_NTOHL (0x416e7953), 
+  ACE_NTOHL (0x416e7953),
   ACE_NTOHL (0x65710000),  // name = AnySeq
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
@@ -1988,7 +1988,7 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CS_
 
@@ -1998,7 +1998,7 @@ TAO_NAMESPACE_END
   {
     DynamicAny::DynAny **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
@@ -2013,7 +2013,7 @@ TAO_NAMESPACE_END
               tmp[i] = old[i];
             }
         }
-      
+
       if (this->release_)
         {
           delete[] old;
@@ -2021,50 +2021,50 @@ TAO_NAMESPACE_END
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
         tmp[i] = DynamicAny::DynAny::_nil ();
       }
-    
+
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
     this->buffer_ = 0;
   }
-  
+
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::~_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void)
   {
     this->_deallocate_buffer ();
   }
-  
+
   void
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
     DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
-    
+
     for (CORBA::ULong i = nl; i < ol; ++i)
       {
         CORBA::release (tmp[i]);
         tmp[i] = DynamicAny::DynAny::_nil ();
       }
   }
-  
-  void 
+
+  void
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
       void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
+      CORBA_Object *src
+      TAO_ENV_ARG_DECL
     )
   {
     DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, target);
-    *tmp = DynamicAny::DynAny::_narrow (src, ACE_TRY_ENV);
+    *tmp = DynamicAny::DynAny::_narrow (src TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -2074,11 +2074,11 @@ TAO_NAMESPACE_END
     DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, src);
     return *tmp;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CS_)
 #define _DYNAMICANY_DYNANYSEQ_CS_
@@ -2090,30 +2090,30 @@ TAO_NAMESPACE_END
 DynamicAny::DynAnySeq::DynAnySeq (void)
 {}
 DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 DynamicAny::DynAnySeq::DynAnySeq (CORBA::ULong max, CORBA::ULong length, DynamicAny::DynAny_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 DynamicAny::DynAnySeq::DynAnySeq (const DynAnySeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<DynamicAny::DynAny,DynamicAny::DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 DynamicAny::DynAnySeq::~DynAnySeq (void) // dtor
@@ -2177,7 +2177,7 @@ DynamicAny::DynSequence_var::operator const ::DynamicAny::DynSequence_ptr &() co
   return this->ptr_;
 }
 
-DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast 
+DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2237,11 +2237,11 @@ DynamicAny::DynSequence_var::tao_nil (void)
 
 ::DynamicAny::DynSequence_ptr
 DynamicAny::DynSequence_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynSequence::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynSequence::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2322,16 +2322,16 @@ DynamicAny::DynSequence::~DynSequence (void)
 {}
 
 DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynSequence::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynSequence::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2381,7 +2381,7 @@ void *DynamicAny::DynSequence::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2442,7 +2442,7 @@ DynamicAny::DynArray_var::operator const ::DynamicAny::DynArray_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast 
+DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2502,11 +2502,11 @@ DynamicAny::DynArray_var::tao_nil (void)
 
 ::DynamicAny::DynArray_ptr
 DynamicAny::DynArray_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynArray::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynArray::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2587,16 +2587,16 @@ DynamicAny::DynArray::~DynArray (void)
 {}
 
 DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynArray::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynArray::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynArray_ptr DynamicAny::DynArray::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2646,7 +2646,7 @@ void *DynamicAny::DynArray::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2707,7 +2707,7 @@ DynamicAny::DynValue_var::operator const ::DynamicAny::DynValue_ptr &() const //
   return this->ptr_;
 }
 
-DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast 
+DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2767,11 +2767,11 @@ DynamicAny::DynValue_var::tao_nil (void)
 
 ::DynamicAny::DynValue_ptr
 DynamicAny::DynValue_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynValue::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynValue::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2852,16 +2852,16 @@ DynamicAny::DynValue::~DynValue (void)
 {}
 
 DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynValue::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynValue::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynValue_ptr DynamicAny::DynValue::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2911,7 +2911,7 @@ void *DynamicAny::DynValue::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2972,7 +2972,7 @@ DynamicAny::DynAnyFactory_var::operator const ::DynamicAny::DynAnyFactory_ptr &(
   return this->ptr_;
 }
 
-DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast 
+DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3032,11 +3032,11 @@ DynamicAny::DynAnyFactory_var::tao_nil (void)
 
 ::DynamicAny::DynAnyFactory_ptr
 DynamicAny::DynAnyFactory_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynAnyFactory::_narrow (p, ACE_TRY_ENV);
+  return ::DynamicAny::DynAnyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3117,16 +3117,16 @@ DynamicAny::DynAnyFactory::~DynAnyFactory (void)
 {}
 
 DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynAnyFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return DynAnyFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3164,7 +3164,7 @@ void *DynamicAny::DynAnyFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3220,16 +3220,16 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise ()
 }
 
 void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3300,13 +3300,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -3391,13 +3391,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -3496,13 +3496,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -3600,7 +3600,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -3642,7 +3642,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 53854d60d8e..22ddf3456b7 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -66,7 +66,7 @@ TAO_NAMESPACE  DynamicAny
 
   class DynAny;
   typedef DynAny *DynAny_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -77,31 +77,31 @@ TAO_NAMESPACE  DynamicAny
   {
   public:
     DynAny_var (void); // default constructor
-    DynAny_var (DynAny_ptr p) : ptr_ (p) {} 
+    DynAny_var (DynAny_ptr p) : ptr_ (p) {}
     DynAny_var (const DynAny_var &); // copy constructor
     ~DynAny_var (void); // destructor
-    
+
     DynAny_var &operator= (DynAny_ptr);
     DynAny_var &operator= (const DynAny_var &);
     DynAny_ptr operator-> (void) const;
-    
+
     operator const DynAny_ptr &() const;
     operator DynAny_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynAny_ptr in (void) const;
     DynAny_ptr &inout (void);
     DynAny_ptr &out (void);
     DynAny_ptr _retn (void);
     DynAny_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynAny_ptr tao_duplicate (DynAny_ptr);
     static void tao_release (DynAny_ptr);
     static DynAny_ptr tao_nil (void);
-    static DynAny_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynAny_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynAny_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -128,7 +128,7 @@ TAO_NAMESPACE  DynamicAny
     operator DynAny_ptr &();
     DynAny_ptr &ptr (void);
     DynAny_ptr operator-> (void);
-  
+
   private:
     DynAny_ptr &ptr_;
   };
@@ -153,15 +153,13 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
     // the static operations
     static DynAny_ptr _duplicate (DynAny_ptr obj);
     static DynAny_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynAny_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynAny_ptr _nil (void)
       {
         return (DynAny_ptr)0;
@@ -177,27 +175,27 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
       InvalidValue (void);
       // Default constructor.
-      
+
       InvalidValue (const InvalidValue &);
       // Copy constructor.
-      
+
       ~InvalidValue (void);
       // Destructor.
-      
+
       InvalidValue &operator= (const InvalidValue &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static InvalidValue *_downcast (CORBA::Exception *);
 
 
@@ -218,27 +216,27 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
       TypeMismatch (void);
       // Default constructor.
-      
+
       TypeMismatch (const TypeMismatch &);
       // Copy constructor.
-      
+
       ~TypeMismatch (void);
       // Destructor.
-      
+
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
 
 
@@ -250,28 +248,25 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     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;
 
     virtual void assign (
-        DynamicAny::DynAny_ptr dyn_any,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        DynamicAny::DynAny_ptr dyn_any
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       )) = 0;
 
     virtual void from_any (
-        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,
         DynamicAny::DynAny::TypeMismatch,
@@ -279,43 +274,38 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Any * to_any (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean equal (
-        DynamicAny::DynAny_ptr dyn_any,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        DynamicAny::DynAny_ptr dyn_any
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void insert_boolean (
-        CORBA::Boolean value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -323,10 +313,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_octet (
-        CORBA::Octet value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Octet value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -334,10 +323,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_char (
-        CORBA::Char value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Char value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -345,10 +333,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_short (
-        CORBA::Short value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Short value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -356,10 +343,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_ushort (
-        CORBA::UShort value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::UShort value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -367,10 +353,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_long (
-        CORBA::Long value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -378,10 +363,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_ulong (
-        CORBA::ULong value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULong value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -389,10 +373,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_float (
-        CORBA::Float value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Float value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -400,10 +383,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_double (
-        CORBA::Double value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Double value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -411,10 +393,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_string (
-        const char * value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -422,10 +403,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_reference (
-        CORBA::Object_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -433,10 +413,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_typecode (
-        CORBA::TypeCode_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::TypeCode_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -444,10 +423,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_longlong (
-        CORBA::LongLong value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::LongLong value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -455,10 +433,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_ulonglong (
-        CORBA::ULongLong value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULongLong value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -466,10 +443,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_longdouble (
-        CORBA::LongDouble value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::LongDouble value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -477,10 +453,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_wchar (
-        CORBA::WChar value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::WChar value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -488,10 +463,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_wstring (
-        const CORBA::WChar * value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::WChar * value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -499,10 +473,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_any (
-        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,
         DynamicAny::DynAny::TypeMismatch,
@@ -510,10 +483,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_dyn_any (
-        DynamicAny::DynAny_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        DynamicAny::DynAny_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -521,10 +493,9 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual void insert_val (
-        CORBA::ValueBase_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ValueBase_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -532,9 +503,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Boolean get_boolean (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -542,9 +512,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Octet get_octet (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -552,9 +521,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Char get_char (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -562,9 +530,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Short get_short (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -572,9 +539,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::UShort get_ushort (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -582,9 +548,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Long get_long (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -592,9 +557,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::ULong get_ulong (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -602,9 +566,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Float get_float (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -612,9 +575,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Double get_double (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -622,9 +584,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual char * get_string (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -632,9 +593,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr get_reference (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -642,9 +602,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::TypeCode_ptr get_typecode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -652,9 +611,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::LongLong get_longlong (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -662,9 +620,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::ULongLong get_ulonglong (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -672,9 +629,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::LongDouble get_longdouble (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -682,9 +638,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::WChar get_wchar (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -692,9 +647,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::WChar * get_wstring (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -702,9 +656,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Any * get_any (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -712,9 +665,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr get_dyn_any (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -722,9 +674,8 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::ValueBase_ptr get_val (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -732,54 +683,49 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Boolean seek (
-        CORBA::Long index,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long index
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void rewind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean next (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::ULong component_count (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr current_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynAny ();
-    
+
     virtual ~DynAny (void);
   private:
     DynAny (const DynAny &);
@@ -795,7 +741,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
   class DynFixed;
   typedef DynFixed *DynFixed_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -806,31 +752,31 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
   {
   public:
     DynFixed_var (void); // default constructor
-    DynFixed_var (DynFixed_ptr p) : ptr_ (p) {} 
+    DynFixed_var (DynFixed_ptr p) : ptr_ (p) {}
     DynFixed_var (const DynFixed_var &); // copy constructor
     ~DynFixed_var (void); // destructor
-    
+
     DynFixed_var &operator= (DynFixed_ptr);
     DynFixed_var &operator= (const DynFixed_var &);
     DynFixed_ptr operator-> (void) const;
-    
+
     operator const DynFixed_ptr &() const;
     operator DynFixed_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynFixed_ptr in (void) const;
     DynFixed_ptr &inout (void);
     DynFixed_ptr &out (void);
     DynFixed_ptr _retn (void);
     DynFixed_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynFixed_ptr tao_duplicate (DynFixed_ptr);
     static void tao_release (DynFixed_ptr);
     static DynFixed_ptr tao_nil (void);
-    static DynFixed_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynFixed_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynFixed_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -857,7 +803,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
     operator DynFixed_ptr &();
     DynFixed_ptr &ptr (void);
     DynFixed_ptr operator-> (void);
-  
+
   private:
     DynFixed_ptr &ptr_;
   };
@@ -882,33 +828,29 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
     // the static operations
     static DynFixed_ptr _duplicate (DynFixed_ptr obj);
     static DynFixed_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynFixed_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynFixed_ptr _nil (void)
       {
         return (DynFixed_ptr)0;
       }
 
     virtual char * get_value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean set_value (
-        const char * val,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * val
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -916,12 +858,12 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynFixed ();
-    
+
     virtual ~DynFixed (void);
   private:
     DynFixed (const DynFixed &);
@@ -937,7 +879,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
 
   class DynEnum;
   typedef DynEnum *DynEnum_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -948,31 +890,31 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
   {
   public:
     DynEnum_var (void); // default constructor
-    DynEnum_var (DynEnum_ptr p) : ptr_ (p) {} 
+    DynEnum_var (DynEnum_ptr p) : ptr_ (p) {}
     DynEnum_var (const DynEnum_var &); // copy constructor
     ~DynEnum_var (void); // destructor
-    
+
     DynEnum_var &operator= (DynEnum_ptr);
     DynEnum_var &operator= (const DynEnum_var &);
     DynEnum_ptr operator-> (void) const;
-    
+
     operator const DynEnum_ptr &() const;
     operator DynEnum_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynEnum_ptr in (void) const;
     DynEnum_ptr &inout (void);
     DynEnum_ptr &out (void);
     DynEnum_ptr _retn (void);
     DynEnum_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynEnum_ptr tao_duplicate (DynEnum_ptr);
     static void tao_release (DynEnum_ptr);
     static DynEnum_ptr tao_nil (void);
-    static DynEnum_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynEnum_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynEnum_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -999,7 +941,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
     operator DynEnum_ptr &();
     DynEnum_ptr &ptr (void);
     DynEnum_ptr operator-> (void);
-  
+
   private:
     DynEnum_ptr &ptr_;
   };
@@ -1024,63 +966,57 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     // the static operations
     static DynEnum_ptr _duplicate (DynEnum_ptr obj);
     static DynEnum_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynEnum_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynEnum_ptr _nil (void)
       {
         return (DynEnum_ptr)0;
       }
 
     virtual char * get_as_string (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_as_string (
-        const char * value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       )) = 0;
 
     virtual CORBA::ULong get_as_ulong (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_as_ulong (
-        CORBA::ULong value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULong value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynEnum ();
-    
+
     virtual ~DynEnum (void);
   private:
     DynEnum (const DynEnum &);
@@ -1097,7 +1033,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 
   struct NameValuePair;
   class NameValuePair_var;
-  
+
   struct TAO_DynamicAny_Export NameValuePair
   {
 
@@ -1118,18 +1054,18 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     NameValuePair_var (NameValuePair *);
     NameValuePair_var (const NameValuePair_var &); // copy constructor
     ~NameValuePair_var (void); // destructor
-    
+
     NameValuePair_var &operator= (NameValuePair *);
     NameValuePair_var &operator= (const NameValuePair_var &);
     NameValuePair *operator-> (void);
     const NameValuePair *operator-> (void) const;
-    
+
     operator const NameValuePair &() const;
     operator NameValuePair &();
     operator NameValuePair &() const;
     operator NameValuePair *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const NameValuePair &in (void) const;
     NameValuePair &inout (void);
     NameValuePair *&out (void);
@@ -1151,7 +1087,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     operator NameValuePair *&();
     NameValuePair *&ptr (void);
     NameValuePair *operator-> (void);
-    
+
   private:
     NameValuePair *&ptr_;
     // assignment from T_var not allowed
@@ -1162,7 +1098,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
 
@@ -1170,9 +1106,9 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum,
         CORBA::ULong length,
         NameValuePair *data,
@@ -1189,7 +1125,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       NameValuePair *get_buffer (CORBA::Boolean orphan = 0);
       const NameValuePair *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -1201,32 +1137,32 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
 
   class NameValuePairSeq;
   class NameValuePairSeq_var;
-  
+
   // *************************************************************
   // NameValuePairSeq
   // *************************************************************
-  
-  class TAO_DynamicAny_Export NameValuePairSeq : public 
+
+  class TAO_DynamicAny_Export NameValuePairSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<NameValuePair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     NameValuePairSeq (void); // default ctor
     NameValuePairSeq (CORBA::ULong max); // uses max size
     NameValuePairSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      NameValuePair *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      NameValuePair *buffer,
       CORBA::Boolean release = 0
     );
     NameValuePairSeq (const NameValuePairSeq &); // copy ctor
@@ -1238,7 +1174,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -1256,21 +1192,21 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     NameValuePairSeq_var (NameValuePairSeq *);
     NameValuePairSeq_var (const NameValuePairSeq_var &); // copy constructor
     ~NameValuePairSeq_var (void); // destructor
-    
+
     NameValuePairSeq_var &operator= (NameValuePairSeq *);
     NameValuePairSeq_var &operator= (const NameValuePairSeq_var &);
     NameValuePairSeq *operator-> (void);
     const NameValuePairSeq *operator-> (void) const;
-    
+
     operator const NameValuePairSeq &() const;
     operator NameValuePairSeq &();
     operator NameValuePairSeq &() const;
     operator NameValuePairSeq *&(); // variable-size base types only
-    
+
     NameValuePair & operator[] (CORBA::ULong index);
     const NameValuePair & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const NameValuePairSeq &in (void) const;
     NameValuePairSeq &inout (void);
     NameValuePairSeq *&out (void);
@@ -1300,7 +1236,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     NameValuePairSeq *&ptr (void);
     NameValuePairSeq *operator-> (void);
     NameValuePair & operator[] (CORBA::ULong index);
-    
+
   private:
     NameValuePairSeq *&ptr_;
     // assignment from T_var not allowed
@@ -1314,7 +1250,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 
   struct NameDynAnyPair;
   class NameDynAnyPair_var;
-  
+
   struct TAO_DynamicAny_Export NameDynAnyPair
   {
 
@@ -1333,18 +1269,18 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     NameDynAnyPair_var (NameDynAnyPair *);
     NameDynAnyPair_var (const NameDynAnyPair_var &); // copy constructor
     ~NameDynAnyPair_var (void); // destructor
-    
+
     NameDynAnyPair_var &operator= (NameDynAnyPair *);
     NameDynAnyPair_var &operator= (const NameDynAnyPair_var &);
     NameDynAnyPair *operator-> (void);
     const NameDynAnyPair *operator-> (void) const;
-    
+
     operator const NameDynAnyPair &() const;
     operator NameDynAnyPair &();
     operator NameDynAnyPair &() const;
     operator NameDynAnyPair *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const NameDynAnyPair &in (void) const;
     NameDynAnyPair &inout (void);
     NameDynAnyPair *&out (void);
@@ -1366,7 +1302,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     operator NameDynAnyPair *&();
     NameDynAnyPair *&ptr (void);
     NameDynAnyPair *operator-> (void);
-    
+
   private:
     NameDynAnyPair *&ptr_;
     // assignment from T_var not allowed
@@ -1375,7 +1311,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
 
@@ -1383,9 +1319,9 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum,
         CORBA::ULong length,
         NameDynAnyPair *data,
@@ -1402,7 +1338,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       NameDynAnyPair *get_buffer (CORBA::Boolean orphan = 0);
       const NameDynAnyPair *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -1414,32 +1350,32 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
 
   class NameDynAnyPairSeq;
   class NameDynAnyPairSeq_var;
-  
+
   // *************************************************************
   // NameDynAnyPairSeq
   // *************************************************************
-  
-  class TAO_DynamicAny_Export NameDynAnyPairSeq : public 
+
+  class TAO_DynamicAny_Export NameDynAnyPairSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<NameDynAnyPair>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     NameDynAnyPairSeq (void); // default ctor
     NameDynAnyPairSeq (CORBA::ULong max); // uses max size
     NameDynAnyPairSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      NameDynAnyPair *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      NameDynAnyPair *buffer,
       CORBA::Boolean release = 0
     );
     NameDynAnyPairSeq (const NameDynAnyPairSeq &); // copy ctor
@@ -1451,7 +1387,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -1469,21 +1405,21 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     NameDynAnyPairSeq_var (NameDynAnyPairSeq *);
     NameDynAnyPairSeq_var (const NameDynAnyPairSeq_var &); // copy constructor
     ~NameDynAnyPairSeq_var (void); // destructor
-    
+
     NameDynAnyPairSeq_var &operator= (NameDynAnyPairSeq *);
     NameDynAnyPairSeq_var &operator= (const NameDynAnyPairSeq_var &);
     NameDynAnyPairSeq *operator-> (void);
     const NameDynAnyPairSeq *operator-> (void) const;
-    
+
     operator const NameDynAnyPairSeq &() const;
     operator NameDynAnyPairSeq &();
     operator NameDynAnyPairSeq &() const;
     operator NameDynAnyPairSeq *&(); // variable-size base types only
-    
+
     NameDynAnyPair & operator[] (CORBA::ULong index);
     const NameDynAnyPair & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const NameDynAnyPairSeq &in (void) const;
     NameDynAnyPairSeq &inout (void);
     NameDynAnyPairSeq *&out (void);
@@ -1513,7 +1449,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     NameDynAnyPairSeq *&ptr (void);
     NameDynAnyPairSeq *operator-> (void);
     NameDynAnyPair & operator[] (CORBA::ULong index);
-    
+
   private:
     NameDynAnyPairSeq *&ptr_;
     // assignment from T_var not allowed
@@ -1529,7 +1465,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 
   class DynStruct;
   typedef DynStruct *DynStruct_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1540,31 +1476,31 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
   {
   public:
     DynStruct_var (void); // default constructor
-    DynStruct_var (DynStruct_ptr p) : ptr_ (p) {} 
+    DynStruct_var (DynStruct_ptr p) : ptr_ (p) {}
     DynStruct_var (const DynStruct_var &); // copy constructor
     ~DynStruct_var (void); // destructor
-    
+
     DynStruct_var &operator= (DynStruct_ptr);
     DynStruct_var &operator= (const DynStruct_var &);
     DynStruct_ptr operator-> (void) const;
-    
+
     operator const DynStruct_ptr &() const;
     operator DynStruct_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynStruct_ptr in (void) const;
     DynStruct_ptr &inout (void);
     DynStruct_ptr &out (void);
     DynStruct_ptr _retn (void);
     DynStruct_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynStruct_ptr tao_duplicate (DynStruct_ptr);
     static void tao_release (DynStruct_ptr);
     static DynStruct_ptr tao_nil (void);
-    static DynStruct_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynStruct_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynStruct_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1591,7 +1527,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     operator DynStruct_ptr &();
     DynStruct_ptr &ptr (void);
     DynStruct_ptr operator-> (void);
-  
+
   private:
     DynStruct_ptr &ptr_;
   };
@@ -1616,24 +1552,21 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
     // the static operations
     static DynStruct_ptr _duplicate (DynStruct_ptr obj);
     static DynStruct_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynStruct_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynStruct_ptr _nil (void)
       {
         return (DynStruct_ptr)0;
       }
 
     virtual char * current_member_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -1641,9 +1574,8 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       )) = 0;
 
     virtual CORBA::TCKind current_member_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -1651,18 +1583,16 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameValuePairSeq * get_members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_members (
-        const DynamicAny::NameValuePairSeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::NameValuePairSeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -1670,18 +1600,16 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_members_as_dyn_any (
-        const DynamicAny::NameDynAnyPairSeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::NameDynAnyPairSeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -1689,12 +1617,12 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynStruct ();
-    
+
     virtual ~DynStruct (void);
   private:
     DynStruct (const DynStruct &);
@@ -1710,7 +1638,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
 
   class DynUnion;
   typedef DynUnion *DynUnion_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1721,31 +1649,31 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
   {
   public:
     DynUnion_var (void); // default constructor
-    DynUnion_var (DynUnion_ptr p) : ptr_ (p) {} 
+    DynUnion_var (DynUnion_ptr p) : ptr_ (p) {}
     DynUnion_var (const DynUnion_var &); // copy constructor
     ~DynUnion_var (void); // destructor
-    
+
     DynUnion_var &operator= (DynUnion_ptr);
     DynUnion_var &operator= (const DynUnion_var &);
     DynUnion_ptr operator-> (void) const;
-    
+
     operator const DynUnion_ptr &() const;
     operator DynUnion_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynUnion_ptr in (void) const;
     DynUnion_ptr &inout (void);
     DynUnion_ptr &out (void);
     DynUnion_ptr _retn (void);
     DynUnion_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynUnion_ptr tao_duplicate (DynUnion_ptr);
     static void tao_release (DynUnion_ptr);
     static DynUnion_ptr tao_nil (void);
-    static DynUnion_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynUnion_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynUnion_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1772,7 +1700,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
     operator DynUnion_ptr &();
     DynUnion_ptr &ptr (void);
     DynUnion_ptr operator-> (void);
-  
+
   private:
     DynUnion_ptr &ptr_;
   };
@@ -1797,106 +1725,95 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     // the static operations
     static DynUnion_ptr _duplicate (DynUnion_ptr obj);
     static DynUnion_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynUnion_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynUnion_ptr _nil (void)
       {
         return (DynUnion_ptr)0;
       }
 
     virtual DynamicAny::DynAny_ptr get_discriminator (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_discriminator (
-        DynamicAny::DynAny_ptr d,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        DynamicAny::DynAny_ptr d
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       )) = 0;
 
     virtual void set_to_default_member (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       )) = 0;
 
     virtual void set_to_no_active_member (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       )) = 0;
 
     virtual CORBA::Boolean has_no_active_member (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::TCKind discriminator_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr member (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       )) = 0;
 
     virtual char * member_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       )) = 0;
 
     virtual CORBA::TCKind member_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynUnion ();
-    
+
     virtual ~DynUnion (void);
   private:
     DynUnion (const DynUnion &);
@@ -1908,7 +1825,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CH_
 
@@ -1916,9 +1833,9 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_DynamicAny_AnySeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum,
         CORBA::ULong length,
         CORBA::Any *data,
@@ -1935,7 +1852,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       CORBA::Any *get_buffer (CORBA::Boolean orphan = 0);
       const CORBA::Any *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -1947,32 +1864,32 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_DYNAMICANY_ANYSEQ_CH_)
 #define _DYNAMICANY_ANYSEQ_CH_
 
   class AnySeq;
   class AnySeq_var;
-  
+
   // *************************************************************
   // AnySeq
   // *************************************************************
-  
-  class TAO_DynamicAny_Export AnySeq : public 
+
+  class TAO_DynamicAny_Export AnySeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_DynamicAny_AnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Any>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     AnySeq (void); // default ctor
     AnySeq (CORBA::ULong max); // uses max size
     AnySeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::Any *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      CORBA::Any *buffer,
       CORBA::Boolean release = 0
     );
     AnySeq (const AnySeq &); // copy ctor
@@ -1984,7 +1901,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -2002,21 +1919,21 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     AnySeq_var (AnySeq *);
     AnySeq_var (const AnySeq_var &); // copy constructor
     ~AnySeq_var (void); // destructor
-    
+
     AnySeq_var &operator= (AnySeq *);
     AnySeq_var &operator= (const AnySeq_var &);
     AnySeq *operator-> (void);
     const AnySeq *operator-> (void) const;
-    
+
     operator const AnySeq &() const;
     operator AnySeq &();
     operator AnySeq &() const;
     operator AnySeq *&(); // variable-size base types only
-    
+
     CORBA::Any & operator[] (CORBA::ULong index);
     const CORBA::Any & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const AnySeq &in (void) const;
     AnySeq &inout (void);
     AnySeq *&out (void);
@@ -2046,7 +1963,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     AnySeq *&ptr (void);
     AnySeq *operator-> (void);
     CORBA::Any & operator[] (CORBA::ULong index);
-    
+
   private:
     AnySeq *&ptr_;
     // assignment from T_var not allowed
@@ -2060,7 +1977,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CH_
 
@@ -2068,7 +1985,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void);
       _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum);
       _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum,
@@ -2089,43 +2006,42 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
       virtual void _downcast (
           void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
+          CORBA_Object *src
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
       virtual CORBA_Object* _upcast (void *src) const;
-      
+
     };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
 #define _DYNAMICANY_DYNANYSEQ_CH_
 
   class DynAnySeq;
   class DynAnySeq_var;
-  
+
   // *************************************************************
   // DynAnySeq
   // *************************************************************
-  
-  class TAO_DynamicAny_Export DynAnySeq : public 
+
+  class TAO_DynamicAny_Export DynAnySeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Object_Sequence<DynAny,DynAny_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     DynAnySeq (void); // default ctor
     DynAnySeq (CORBA::ULong max); // uses max size
     DynAnySeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      DynAny_ptr *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      DynAny_ptr *buffer,
       CORBA::Boolean release = 0
     );
     DynAnySeq (const DynAnySeq &); // copy ctor
@@ -2137,7 +2053,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -2155,20 +2071,20 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     DynAnySeq_var (DynAnySeq *);
     DynAnySeq_var (const DynAnySeq_var &); // copy constructor
     ~DynAnySeq_var (void); // destructor
-    
+
     DynAnySeq_var &operator= (DynAnySeq *);
     DynAnySeq_var &operator= (const DynAnySeq_var &);
     DynAnySeq *operator-> (void);
     const DynAnySeq *operator-> (void) const;
-    
+
     operator const DynAnySeq &() const;
     operator DynAnySeq &();
     operator DynAnySeq &() const;
     operator DynAnySeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const DynAnySeq &in (void) const;
     DynAnySeq &inout (void);
     DynAnySeq *&out (void);
@@ -2198,7 +2114,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     DynAnySeq *&ptr (void);
     DynAnySeq *operator-> (void);
     TAO_Object_Manager<DynAny, DynAny_var> operator[] (CORBA::ULong index);
-    
+
   private:
     DynAnySeq *&ptr_;
     // assignment from T_var not allowed
@@ -2214,7 +2130,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
 
   class DynSequence;
   typedef DynSequence *DynSequence_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -2225,31 +2141,31 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
   {
   public:
     DynSequence_var (void); // default constructor
-    DynSequence_var (DynSequence_ptr p) : ptr_ (p) {} 
+    DynSequence_var (DynSequence_ptr p) : ptr_ (p) {}
     DynSequence_var (const DynSequence_var &); // copy constructor
     ~DynSequence_var (void); // destructor
-    
+
     DynSequence_var &operator= (DynSequence_ptr);
     DynSequence_var &operator= (const DynSequence_var &);
     DynSequence_ptr operator-> (void) const;
-    
+
     operator const DynSequence_ptr &() const;
     operator DynSequence_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynSequence_ptr in (void) const;
     DynSequence_ptr &inout (void);
     DynSequence_ptr &out (void);
     DynSequence_ptr _retn (void);
     DynSequence_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynSequence_ptr tao_duplicate (DynSequence_ptr);
     static void tao_release (DynSequence_ptr);
     static DynSequence_ptr tao_nil (void);
-    static DynSequence_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynSequence_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynSequence_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2276,7 +2192,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     operator DynSequence_ptr &();
     DynSequence_ptr &ptr (void);
     DynSequence_ptr operator-> (void);
-  
+
   private:
     DynSequence_ptr &ptr_;
   };
@@ -2301,51 +2217,45 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
     // the static operations
     static DynSequence_ptr _duplicate (DynSequence_ptr obj);
     static DynSequence_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynSequence_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynSequence_ptr _nil (void)
       {
         return (DynSequence_ptr)0;
       }
 
     virtual CORBA::ULong get_length (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_length (
-        CORBA::ULong len,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULong len
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::InvalidValue
       )) = 0;
 
     virtual DynamicAny::AnySeq * get_elements (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_elements (
-        const DynamicAny::AnySeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::AnySeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2353,18 +2263,16 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_elements_as_dyn_any (
-        const DynamicAny::DynAnySeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::DynAnySeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2372,12 +2280,12 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynSequence ();
-    
+
     virtual ~DynSequence (void);
   private:
     DynSequence (const DynSequence &);
@@ -2393,7 +2301,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
 
   class DynArray;
   typedef DynArray *DynArray_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -2404,31 +2312,31 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
   {
   public:
     DynArray_var (void); // default constructor
-    DynArray_var (DynArray_ptr p) : ptr_ (p) {} 
+    DynArray_var (DynArray_ptr p) : ptr_ (p) {}
     DynArray_var (const DynArray_var &); // copy constructor
     ~DynArray_var (void); // destructor
-    
+
     DynArray_var &operator= (DynArray_ptr);
     DynArray_var &operator= (const DynArray_var &);
     DynArray_ptr operator-> (void) const;
-    
+
     operator const DynArray_ptr &() const;
     operator DynArray_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynArray_ptr in (void) const;
     DynArray_ptr &inout (void);
     DynArray_ptr &out (void);
     DynArray_ptr _retn (void);
     DynArray_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynArray_ptr tao_duplicate (DynArray_ptr);
     static void tao_release (DynArray_ptr);
     static DynArray_ptr tao_nil (void);
-    static DynArray_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynArray_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynArray_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2455,7 +2363,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
     operator DynArray_ptr &();
     DynArray_ptr &ptr (void);
     DynArray_ptr operator-> (void);
-  
+
   private:
     DynArray_ptr &ptr_;
   };
@@ -2480,33 +2388,29 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
     // the static operations
     static DynArray_ptr _duplicate (DynArray_ptr obj);
     static DynArray_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynArray_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynArray_ptr _nil (void)
       {
         return (DynArray_ptr)0;
       }
 
     virtual DynamicAny::AnySeq * get_elements (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_elements (
-        const DynamicAny::AnySeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::AnySeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2514,18 +2418,16 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_elements_as_dyn_any (
-        const DynamicAny::DynAnySeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::DynAnySeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2533,12 +2435,12 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynArray ();
-    
+
     virtual ~DynArray (void);
   private:
     DynArray (const DynArray &);
@@ -2554,7 +2456,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
 
   class DynValue;
   typedef DynValue *DynValue_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -2565,31 +2467,31 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
   {
   public:
     DynValue_var (void); // default constructor
-    DynValue_var (DynValue_ptr p) : ptr_ (p) {} 
+    DynValue_var (DynValue_ptr p) : ptr_ (p) {}
     DynValue_var (const DynValue_var &); // copy constructor
     ~DynValue_var (void); // destructor
-    
+
     DynValue_var &operator= (DynValue_ptr);
     DynValue_var &operator= (const DynValue_var &);
     DynValue_ptr operator-> (void) const;
-    
+
     operator const DynValue_ptr &() const;
     operator DynValue_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynValue_ptr in (void) const;
     DynValue_ptr &inout (void);
     DynValue_ptr &out (void);
     DynValue_ptr _retn (void);
     DynValue_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynValue_ptr tao_duplicate (DynValue_ptr);
     static void tao_release (DynValue_ptr);
     static DynValue_ptr tao_nil (void);
-    static DynValue_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynValue_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynValue_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2616,7 +2518,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
     operator DynValue_ptr &();
     DynValue_ptr &ptr (void);
     DynValue_ptr operator-> (void);
-  
+
   private:
     DynValue_ptr &ptr_;
   };
@@ -2641,24 +2543,21 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
     // the static operations
     static DynValue_ptr _duplicate (DynValue_ptr obj);
     static DynValue_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynValue_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynValue_ptr _nil (void)
       {
         return (DynValue_ptr)0;
       }
 
     virtual char * current_member_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2666,9 +2565,8 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       )) = 0;
 
     virtual CORBA::TCKind current_member_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2676,18 +2574,16 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameValuePairSeq * get_members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_members (
-        const DynamicAny::NameValuePairSeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::NameValuePairSeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2695,18 +2591,16 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_members_as_dyn_any (
-        const DynamicAny::NameDynAnyPairSeq & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const DynamicAny::NameDynAnyPairSeq & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -2714,12 +2608,12 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynValue ();
-    
+
     virtual ~DynValue (void);
   private:
     DynValue (const DynValue &);
@@ -2735,7 +2629,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
 
   class DynAnyFactory;
   typedef DynAnyFactory *DynAnyFactory_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -2746,31 +2640,31 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
   {
   public:
     DynAnyFactory_var (void); // default constructor
-    DynAnyFactory_var (DynAnyFactory_ptr p) : ptr_ (p) {} 
+    DynAnyFactory_var (DynAnyFactory_ptr p) : ptr_ (p) {}
     DynAnyFactory_var (const DynAnyFactory_var &); // copy constructor
     ~DynAnyFactory_var (void); // destructor
-    
+
     DynAnyFactory_var &operator= (DynAnyFactory_ptr);
     DynAnyFactory_var &operator= (const DynAnyFactory_var &);
     DynAnyFactory_ptr operator-> (void) const;
-    
+
     operator const DynAnyFactory_ptr &() const;
     operator DynAnyFactory_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     DynAnyFactory_ptr in (void) const;
     DynAnyFactory_ptr &inout (void);
     DynAnyFactory_ptr &out (void);
     DynAnyFactory_ptr _retn (void);
     DynAnyFactory_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static DynAnyFactory_ptr tao_duplicate (DynAnyFactory_ptr);
     static void tao_release (DynAnyFactory_ptr);
     static DynAnyFactory_ptr tao_nil (void);
-    static DynAnyFactory_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static DynAnyFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     DynAnyFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2797,7 +2691,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
     operator DynAnyFactory_ptr &();
     DynAnyFactory_ptr &ptr (void);
     DynAnyFactory_ptr operator-> (void);
-  
+
   private:
     DynAnyFactory_ptr &ptr_;
   };
@@ -2822,15 +2716,13 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object
     // the static operations
     static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj);
     static DynAnyFactory_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynAnyFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static DynAnyFactory_ptr _nil (void)
       {
         return (DynAnyFactory_ptr)0;
@@ -2846,27 +2738,27 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object
 
       InconsistentTypeCode (void);
       // Default constructor.
-      
+
       InconsistentTypeCode (const InconsistentTypeCode &);
       // Copy constructor.
-      
+
       ~InconsistentTypeCode (void);
       // Destructor.
-      
+
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
 
 
@@ -2878,32 +2770,30 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual DynamicAny::DynAny_ptr create_dyn_any (
-        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,
         DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
-        CORBA::TypeCode_ptr type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::TypeCode_ptr type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     DynAnyFactory ();
-    
+
     virtual ~DynAnyFactory (void);
   private:
     DynAnyFactory (const DynAnyFactory &);
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
index 4ee4b1b5c79..240bb96c9c9 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.i
@@ -57,11 +57,11 @@ tao_DynamicAny_DynAny_nil (
 
 ACE_INLINE DynamicAny::DynAny_ptr
 tao_DynamicAny_DynAny_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynAny::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynAny::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -107,11 +107,11 @@ tao_DynamicAny_DynFixed_nil (
 
 ACE_INLINE DynamicAny::DynFixed_ptr
 tao_DynamicAny_DynFixed_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynFixed::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynFixed::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -157,11 +157,11 @@ tao_DynamicAny_DynEnum_nil (
 
 ACE_INLINE DynamicAny::DynEnum_ptr
 tao_DynamicAny_DynEnum_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynEnum::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynEnum::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -228,7 +228,7 @@ DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var
         {
           NameValuePair *deep_copy =
             new NameValuePair (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               NameValuePair *tmp = deep_copy;
@@ -238,7 +238,7 @@ DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -261,20 +261,20 @@ DynamicAny::NameValuePair_var::operator const ::DynamicAny::NameValuePair &() co
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() // cast 
+DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() const // cast 
+DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair *&() // cast 
+DynamicAny::NameValuePair_var::operator ::DynamicAny::NameValuePair *&() // cast
 {
   return this->ptr_;
 }
@@ -291,7 +291,7 @@ DynamicAny::NameValuePair_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::DynamicAny::NameValuePair *&
 DynamicAny::NameValuePair_var::out (void)
 {
@@ -352,7 +352,7 @@ DynamicAny::NameValuePair_out::operator= (NameValuePair *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePair_out::operator ::DynamicAny::NameValuePair *&() // cast
 {
   return this->ptr_;
@@ -372,7 +372,7 @@ DynamicAny::NameValuePair_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
 
@@ -385,24 +385,24 @@ DynamicAny::NameValuePair_out::operator-> (void)
     ACE_NEW_RETURN (retval, DynamicAny::NameValuePair[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::freebuf (DynamicAny::NameValuePair *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -411,7 +411,7 @@ DynamicAny::NameValuePair_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs)
   // Copy constructor.
@@ -421,10 +421,10 @@ DynamicAny::NameValuePair_out::operator-> (void)
     {
       DynamicAny::NameValuePair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (this->maximum_);
       DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -432,14 +432,14 @@ DynamicAny::NameValuePair_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -452,18 +452,18 @@ DynamicAny::NameValuePair_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     DynamicAny::NameValuePair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameValuePair *, this->buffer_);
     DynamicAny::NameValuePair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameValuePair * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE DynamicAny::NameValuePair &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i)
@@ -473,7 +473,7 @@ DynamicAny::NameValuePair_out::operator-> (void)
     DynamicAny::NameValuePair* tmp = ACE_reinterpret_cast(DynamicAny::NameValuePair*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const DynamicAny::NameValuePair &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -482,9 +482,9 @@ DynamicAny::NameValuePair_out::operator-> (void)
     DynamicAny::NameValuePair * const tmp = ACE_reinterpret_cast (DynamicAny::NameValuePair* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE DynamicAny::NameValuePair *
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -518,13 +518,13 @@ DynamicAny::NameValuePair_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const DynamicAny::NameValuePair *
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const DynamicAny::NameValuePair * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameValuePairSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -541,11 +541,11 @@ DynamicAny::NameValuePair_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CI_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CI_
@@ -601,7 +601,7 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe
         {
           NameValuePairSeq *deep_copy =
             new NameValuePairSeq (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               NameValuePairSeq *tmp = deep_copy;
@@ -611,7 +611,7 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -627,27 +627,27 @@ DynamicAny::NameValuePairSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_var::operator const ::DynamicAny::NameValuePairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() // cast 
+ACE_INLINE
+DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() const // cast 
+ACE_INLINE
+DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq *&() // cast 
+DynamicAny::NameValuePairSeq_var::operator ::DynamicAny::NameValuePairSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -676,7 +676,7 @@ DynamicAny::NameValuePairSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::DynamicAny::NameValuePairSeq *&
 DynamicAny::NameValuePairSeq_var::out (void)
 {
@@ -737,7 +737,7 @@ DynamicAny::NameValuePairSeq_out::operator= (NameValuePairSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameValuePairSeq_out::operator ::DynamicAny::NameValuePairSeq *&() // cast
 {
   return this->ptr_;
@@ -815,7 +815,7 @@ DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_va
         {
           NameDynAnyPair *deep_copy =
             new NameDynAnyPair (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               NameDynAnyPair *tmp = deep_copy;
@@ -825,7 +825,7 @@ DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_va
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -848,20 +848,20 @@ DynamicAny::NameDynAnyPair_var::operator const ::DynamicAny::NameDynAnyPair &()
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() // cast 
+DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() const // cast 
+DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair *&() // cast 
+DynamicAny::NameDynAnyPair_var::operator ::DynamicAny::NameDynAnyPair *&() // cast
 {
   return this->ptr_;
 }
@@ -878,7 +878,7 @@ DynamicAny::NameDynAnyPair_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::DynamicAny::NameDynAnyPair *&
 DynamicAny::NameDynAnyPair_var::out (void)
 {
@@ -939,7 +939,7 @@ DynamicAny::NameDynAnyPair_out::operator= (NameDynAnyPair *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPair_out::operator ::DynamicAny::NameDynAnyPair *&() // cast
 {
   return this->ptr_;
@@ -959,7 +959,7 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
 
@@ -972,24 +972,24 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
     ACE_NEW_RETURN (retval, DynamicAny::NameDynAnyPair[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::freebuf (DynamicAny::NameDynAnyPair *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -998,7 +998,7 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs)
   // Copy constructor.
@@ -1008,10 +1008,10 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
     {
       DynamicAny::NameDynAnyPair *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (this->maximum_);
       DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -1019,14 +1019,14 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -1039,18 +1039,18 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     DynamicAny::NameDynAnyPair *tmp1 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair *, this->buffer_);
     DynamicAny::NameDynAnyPair * const tmp2 = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE DynamicAny::NameDynAnyPair &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i)
@@ -1060,7 +1060,7 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
     DynamicAny::NameDynAnyPair* tmp = ACE_reinterpret_cast(DynamicAny::NameDynAnyPair*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const DynamicAny::NameDynAnyPair &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -1069,9 +1069,9 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
     DynamicAny::NameDynAnyPair * const tmp = ACE_reinterpret_cast (DynamicAny::NameDynAnyPair* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE DynamicAny::NameDynAnyPair *
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -1105,13 +1105,13 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
     }
     return result;
   }
-  
+
   ACE_INLINE const DynamicAny::NameDynAnyPair *
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const DynamicAny::NameDynAnyPair * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_NameDynAnyPairSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -1128,11 +1128,11 @@ DynamicAny::NameDynAnyPair_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CI_
@@ -1188,7 +1188,7 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair
         {
           NameDynAnyPairSeq *deep_copy =
             new NameDynAnyPairSeq (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               NameDynAnyPairSeq *tmp = deep_copy;
@@ -1198,7 +1198,7 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -1214,27 +1214,27 @@ DynamicAny::NameDynAnyPairSeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_var::operator const ::DynamicAny::NameDynAnyPairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() // cast 
+ACE_INLINE
+DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() const // cast 
+ACE_INLINE
+DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast 
+DynamicAny::NameDynAnyPairSeq_var::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast
 {
   return this->ptr_;
 }
@@ -1263,7 +1263,7 @@ DynamicAny::NameDynAnyPairSeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::DynamicAny::NameDynAnyPairSeq *&
 DynamicAny::NameDynAnyPairSeq_var::out (void)
 {
@@ -1324,7 +1324,7 @@ DynamicAny::NameDynAnyPairSeq_out::operator= (NameDynAnyPairSeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::NameDynAnyPairSeq_out::operator ::DynamicAny::NameDynAnyPairSeq *&() // cast
 {
   return this->ptr_;
@@ -1381,11 +1381,11 @@ tao_DynamicAny_DynStruct_nil (
 
 ACE_INLINE DynamicAny::DynStruct_ptr
 tao_DynamicAny_DynStruct_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynStruct::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynStruct::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1431,11 +1431,11 @@ tao_DynamicAny_DynUnion_nil (
 
 ACE_INLINE DynamicAny::DynUnion_ptr
 tao_DynamicAny_DynUnion_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynUnion::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynUnion::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1453,7 +1453,7 @@ tao_DynamicAny_DynUnion_upcast (
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_ANYSEQ_CI_
 
@@ -1466,24 +1466,24 @@ tao_DynamicAny_DynUnion_upcast (
     ACE_NEW_RETURN (retval, CORBA::Any[size], 0);
     return retval;
   }
-  
+
   ACE_INLINE void DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::freebuf (CORBA::Any *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (void) // Default constructor.
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -1492,7 +1492,7 @@ tao_DynamicAny_DynUnion_upcast (
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::_TAO_Unbounded_Sequence_DynamicAny_AnySeq (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs)
   // Copy constructor.
@@ -1502,10 +1502,10 @@ tao_DynamicAny_DynUnion_upcast (
     {
       CORBA::Any *tmp1 = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (this->maximum_);
       CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -1513,14 +1513,14 @@ tao_DynamicAny_DynUnion_upcast (
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator= (const _TAO_Unbounded_Sequence_DynamicAny_AnySeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -1533,18 +1533,18 @@ tao_DynamicAny_DynUnion_upcast (
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_DynamicAny_AnySeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA::Any *tmp1 = ACE_reinterpret_cast (CORBA::Any *, this->buffer_);
     CORBA::Any * const tmp2 = ACE_reinterpret_cast (CORBA::Any * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     return *this;
   }
-  
+
   // = Accessors.
   ACE_INLINE CORBA::Any &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i)
@@ -1554,7 +1554,7 @@ tao_DynamicAny_DynUnion_upcast (
     CORBA::Any* tmp = ACE_reinterpret_cast(CORBA::Any*,this->buffer_);
     return tmp[i];
   }
-  
+
   ACE_INLINE const CORBA::Any &
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::operator[] (CORBA::ULong i) const
   // operator []
@@ -1563,9 +1563,9 @@ tao_DynamicAny_DynUnion_upcast (
     CORBA::Any * const tmp = ACE_reinterpret_cast (CORBA::Any* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-  
+
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
+
   ACE_INLINE CORBA::Any *
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -1599,13 +1599,13 @@ tao_DynamicAny_DynUnion_upcast (
     }
     return result;
   }
-  
+
   ACE_INLINE const CORBA::Any *
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA::Any * ACE_CAST_CONST, this->buffer_);
   }
-  
+
   ACE_INLINE void
   DynamicAny::_TAO_Unbounded_Sequence_DynamicAny_AnySeq::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -1622,11 +1622,11 @@ tao_DynamicAny_DynUnion_upcast (
     this->buffer_ = data;
     this->release_ = release;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_ANYSEQ_CI_)
 #define _DYNAMICANY_ANYSEQ_CI_
@@ -1682,7 +1682,7 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
         {
           AnySeq *deep_copy =
             new AnySeq (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               AnySeq *tmp = deep_copy;
@@ -1692,7 +1692,7 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -1708,27 +1708,27 @@ DynamicAny::AnySeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_var::operator const ::DynamicAny::AnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() // cast 
+ACE_INLINE
+DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() const // cast 
+ACE_INLINE
+DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq *&() // cast 
+DynamicAny::AnySeq_var::operator ::DynamicAny::AnySeq *&() // cast
 {
   return this->ptr_;
 }
@@ -1757,7 +1757,7 @@ DynamicAny::AnySeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::DynamicAny::AnySeq *&
 DynamicAny::AnySeq_var::out (void)
 {
@@ -1818,7 +1818,7 @@ DynamicAny::AnySeq_out::operator= (AnySeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::AnySeq_out::operator ::DynamicAny::AnySeq *&() // cast
 {
   return this->ptr_;
@@ -1847,7 +1847,7 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CI_
 
@@ -1855,36 +1855,36 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (CORBA::ULong nelems)
   {
     DynamicAny::DynAny **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, DynamicAny::DynAny*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       {
         buf[i] = DynamicAny::DynAny::_nil ();
       }
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (DynamicAny::DynAny **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (void)
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -1893,7 +1893,7 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq(const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -1902,12 +1902,12 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
     {
       DynamicAny::DynAny **tmp1 = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (this->maximum_);
       DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
           tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
         }
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -1915,17 +1915,17 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator= (const _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -1939,20 +1939,20 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     DynamicAny::DynAny **tmp1 = ACE_reinterpret_cast (DynamicAny::DynAny **, this->buffer_);
     DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
         tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
       }
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var>
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -1961,7 +1961,7 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
     DynamicAny::DynAny ** const tmp = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<DynamicAny::DynAny,DynamicAny::DynAny_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE DynamicAny::DynAny* *
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (CORBA::Boolean orphan)
   {
@@ -1995,18 +1995,18 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
     }
     return result;
   }
-  
+
   ACE_INLINE const DynamicAny::DynAny* *
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const DynamicAny::DynAny ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CI_)
 #define _DYNAMICANY_DYNANYSEQ_CI_
@@ -2062,7 +2062,7 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
         {
           DynAnySeq *deep_copy =
             new DynAnySeq (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               DynAnySeq *tmp = deep_copy;
@@ -2072,7 +2072,7 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -2088,27 +2088,27 @@ DynamicAny::DynAnySeq_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_var::operator const ::DynamicAny::DynAnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() // cast 
+ACE_INLINE
+DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() const // cast 
+ACE_INLINE
+DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq *&() // cast 
+DynamicAny::DynAnySeq_var::operator ::DynamicAny::DynAnySeq *&() // cast
 {
   return this->ptr_;
 }
@@ -2131,7 +2131,7 @@ DynamicAny::DynAnySeq_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::DynamicAny::DynAnySeq *&
 DynamicAny::DynAnySeq_var::out (void)
 {
@@ -2192,7 +2192,7 @@ DynamicAny::DynAnySeq_out::operator= (DynAnySeq *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 DynamicAny::DynAnySeq_out::operator ::DynamicAny::DynAnySeq *&() // cast
 {
   return this->ptr_;
@@ -2249,11 +2249,11 @@ tao_DynamicAny_DynSequence_nil (
 
 ACE_INLINE DynamicAny::DynSequence_ptr
 tao_DynamicAny_DynSequence_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynSequence::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynSequence::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2299,11 +2299,11 @@ tao_DynamicAny_DynArray_nil (
 
 ACE_INLINE DynamicAny::DynArray_ptr
 tao_DynamicAny_DynArray_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynArray::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynArray::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2349,11 +2349,11 @@ tao_DynamicAny_DynValue_nil (
 
 ACE_INLINE DynamicAny::DynValue_ptr
 tao_DynamicAny_DynValue_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynValue::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynValue::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2403,11 +2403,11 @@ tao_DynamicAny_DynAnyFactory_nil (
 
 ACE_INLINE DynamicAny::DynAnyFactory_ptr
 tao_DynamicAny_DynAnyFactory_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynAnyFactory::_narrow (p, ACE_TRY_ENV);
+  return DynamicAny::DynAnyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2432,7 +2432,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const DynamicAny::Nam
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, DynamicAny::NameValuePair &_tao_aggregate)
@@ -2444,7 +2444,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, DynamicAny::NameValueP
     return 1;
   else
     return 0;
-  
+
 }
 
 
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index 3ba3d039091..aa1d1a9fc86 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -658,7 +658,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -749,7 +749,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -840,7 +840,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Exception
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 178b9983c48..6a30a7ff6bb 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -25,9 +25,9 @@ CORBA_Context::~CORBA_Context (void)
 CORBA::ULong
 CORBA_Context::_incr_refcnt (void)
 {
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
-                    ace_mon, 
-                    this->refcount_lock_, 
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    ace_mon,
+                    this->refcount_lock_,
                     0);
 
   return refcount_++;
@@ -37,9 +37,9 @@ CORBA::ULong
 CORBA_Context::_decr_refcnt (void)
 {
   {
-    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, 
-                      ace_mon, 
-                      this->refcount_lock_, 
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                      ace_mon,
+                      this->refcount_lock_,
                       0);
 
     this->refcount_--;
@@ -55,7 +55,7 @@ CORBA_Context::_decr_refcnt (void)
 }
 
 const char *
-CORBA_Context::context_name (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_Context::context_name (TAO_ENV_SINGLE_ARG_DECL) const
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO),
@@ -63,7 +63,7 @@ CORBA_Context::context_name (CORBA::Environment &ACE_TRY_ENV) const
 }
 
 CORBA_Context_ptr
-CORBA_Context::parent (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_Context::parent (TAO_ENV_SINGLE_ARG_DECL) const
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO),
@@ -72,8 +72,8 @@ CORBA_Context::parent (CORBA::Environment &ACE_TRY_ENV) const
 
 void
 CORBA_Context::create_child (const char * /* child_ctx_name */,
-                             CORBA_Context_out /* child_ctx */,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA_Context_out /* child_ctx */
+                             TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -81,24 +81,24 @@ CORBA_Context::create_child (const char * /* child_ctx_name */,
 
 void
 CORBA_Context::set_one_value (const char * /* propname */,
-                              const CORBA_Any & /* propvalue */,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA_Any & /* propvalue */
+                              TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
 }
 
 void
-CORBA_Context::set_values (CORBA::NVList_ptr,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA_Context::set_values (CORBA::NVList_ptr
+                           TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
 }
 
 void
-CORBA_Context::delete_values (const char * /* propname */,
-                              CORBA::Environment &ACE_TRY_ENV)
+CORBA_Context::delete_values (const char * /* propname */
+                              TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -108,8 +108,8 @@ void
 CORBA_Context::get_values (const char * /* start_scope */,
                            CORBA::Flags /* op_flags */,
                            const char * /* pattern */,
-                           CORBA::NVList_ptr & /* values */,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::NVList_ptr & /* values */
+                           TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -153,14 +153,14 @@ CORBA_ContextList::add_consume (char *ctx)
 }
 
 char *
-CORBA_ContextList::item (CORBA::ULong slot,
-                         CORBA::Environment &ACE_TRY_ENV)
+CORBA_ContextList::item (CORBA::ULong slot
+                         TAO_ENV_ARG_DECL)
 {
   char **ctx = 0;
 
   if (this->ctx_list_.get (ctx, slot) == -1)
     {
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 
+      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
                         0);
     }
   else
@@ -170,8 +170,8 @@ CORBA_ContextList::item (CORBA::ULong slot,
 }
 
 void
-CORBA_ContextList::remove (CORBA::ULong,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA_ContextList::remove (CORBA::ULong
+                           TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index 5d03f33a84f..d8fb0ea4b48 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -62,36 +62,29 @@ public:
   // = All the spec-required functions below will just throw a
   //   CORBA::NO_IMPLEMENT exception and do nothing else.
 
-  const char *context_name (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) const;
+  const char *context_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
-  CORBA_Context_ptr parent (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) const;
+  CORBA_Context_ptr parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   void create_child (const char *child_ctx_name,
-                     CORBA_Context_out child_ctx,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA_Context_out child_ctx
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void set_one_value (const char *propname,
-                      const CORBA_Any &propvalue,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                      const CORBA_Any &propvalue
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void set_values (CORBA::NVList_ptr values,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  void set_values (CORBA::NVList_ptr values
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void delete_values (const char *propname,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+  void delete_values (const char *propname
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void get_values (const char *start_scope,
                    CORBA::Flags op_flags,
                    const char *pattern,
-                   CORBA::NVList_ptr &values,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+                   CORBA::NVList_ptr &values
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA_Context_ptr _ptr_type;
@@ -211,14 +204,12 @@ public:
   void add_consume (char *ctx);
   // Add and consume a string to the list.
 
-  char *item (CORBA::ULong slot,
-              CORBA_Environment &ACE_TRY_ENV =
-                TAO_default_environment ());
+  char *item (CORBA::ULong slot
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Return the typecode at slot i. Raises the "Bounds" exception.
 
-  void remove (CORBA::ULong slot,
-               CORBA_Environment &ACE_TRY_ENV =
-                TAO_default_environment ());
+  void remove (CORBA::ULong slot
+               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Remove the typecode at slot i. Raises the "Bounds" exception.
 
   void _incr_refcnt (void);
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index d29992ccfee..768f38bf81e 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -16,12 +16,12 @@ ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$")
 
 
 int
-TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UnknownUserException))
 {
-  int retval = this->invoke_i (0,
-                               ACE_TRY_ENV);
+  int retval = this->invoke_i (0
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
@@ -51,11 +51,11 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions,
            exceptions != 0 && i < exceptions->count ();
            i++)
         {
-          CORBA::TypeCode_ptr tcp = exceptions->item (i,
-                                                      ACE_TRY_ENV);
+          CORBA::TypeCode_ptr tcp = exceptions->item (i
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
-          const char *xid = tcp->id (ACE_TRY_ENV);
+          const char *xid = tcp->id (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
           if (ACE_OS::strcmp (buf.in (), xid) != 0)
@@ -80,13 +80,15 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions,
 
           // @@ Think about a better way to raise the exception here,
           //    maybe we need some more macros?
-          ACE_TRY_ENV.exception (exception);  // We can not use ACE_THROW here.
+#if !defined (ACE_HAS_EXCEPTIONS)
+          TAO_ENV_SINGLE_ARG_PARAMETER.exception (exception);  // We can not use ACE_THROW here.
+#endif
           return TAO_INVOKE_EXCEPTION;
         }
 
       // If we couldn't find the right exception, report it as
-      // CORBA::UNKNOWN. 
-      
+      // CORBA::UNKNOWN.
+
       // But first, save the user exception in case we
       // are being used in a TAO gateway.
       this->host_->raw_user_exception (this->inp_stream ());
@@ -105,15 +107,15 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions,
 //***************************************************************************
 
 int
-TAO_GIOP_DII_Deferred_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_DII_Deferred_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->invoke_i (ACE_TRY_ENV);
+  return this->invoke_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
 int
-TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_DII_Deferred_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register a reply dispatcher for this Asynch_Invocation. Use the
@@ -132,8 +134,8 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   // Just send the request, without trying to wait for the reply.
-  retval = TAO_GIOP_Invocation::invoke (0,
-                                        ACE_TRY_ENV);
+  retval = TAO_GIOP_Invocation::invoke (0
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   if (retval != TAO_INVOKE_OK)
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index dfa7fe2ddd9..e1eb48df110 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -54,9 +54,8 @@ public:
                            int byte_order = TAO_ENCAP_BYTE_ORDER);
   // Constructor.
 
-  int invoke (CORBA::ExceptionList_ptr exceptions,
-              CORBA_Environment &ACE_TRY_ENV =
-                TAO_default_environment ())
+  int invoke (CORBA::ExceptionList_ptr exceptions
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException));
   // Send request, block until any reply comes back, and unmarshal
   // reply parameters as appropriate.
@@ -85,14 +84,13 @@ public:
                                     int byte_order = TAO_ENCAP_BYTE_ORDER);
   // Constructor.
 
-  int invoke (CORBA_Environment &TAO_IN_ENV =
-                    TAO_default_environment ())
+  int invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send request, block until any reply comes back, and unmarshal
   // reply parameters as appropriate.
 
 private:
-  int invoke_i (CORBA::Environment &ACE_TRY_ENV)
+  int invoke_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Implementation of the invoke() methods, handles the basic
   // send/reply code and the system exceptions.
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index ebad9ea91b5..c04d152b3aa 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -84,8 +84,8 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
     {
       // Call the Request back and send the reply data.
       this->req_->handle_response (this->reply_cdr_,
-                                   this->reply_status_,
-                                   ACE_TRY_ENV);
+                                   this->reply_status_
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -116,16 +116,16 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
 
       TAO_OutputCDR out_cdr;
 
-      comm_failure._tao_encode (out_cdr,
-                                ACE_TRY_ENV);
+      comm_failure._tao_encode (out_cdr
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Turn into an output CDR
       TAO_InputCDR cdr (out_cdr);
 
       this->req_->handle_response (cdr,
-                                   TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION,
-                                   ACE_TRY_ENV);
+                                   TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index 0027d1ec4d9..9259196a33e 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -27,8 +27,8 @@ TAO_Dynamic_Adapter_Impl::create_request (
     CORBA::NamedValue_ptr result,
     CORBA::ExceptionList_ptr exceptions,
     CORBA::Request_ptr &request,
-    CORBA::Flags req_flags,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA::Flags req_flags
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_NEW_THROW_EX (request,
@@ -38,8 +38,8 @@ TAO_Dynamic_Adapter_Impl::create_request (
                                     arg_list,
                                     result,
                                     req_flags,
-                                    exceptions,
-                                    ACE_TRY_ENV),
+                                    exceptions
+                                    TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY (
                         CORBA_SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
@@ -52,15 +52,15 @@ TAO_Dynamic_Adapter_Impl::create_request (
 CORBA::Request_ptr
 TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj,
                                    CORBA::ORB_ptr orb,
-                                   const char *operation,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const char *operation
+                                   TAO_ENV_ARG_DECL)
 {
   CORBA::Request_ptr req = CORBA::Request::_nil ();
   ACE_NEW_THROW_EX (req,
                     CORBA::Request (obj,
                                     orb,
-                                    operation,
-                                    ACE_TRY_ENV),
+                                    operation
+                                    TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY (
                         CORBA_SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
@@ -120,8 +120,8 @@ TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req)
 
 void
 TAO_Dynamic_Adapter_Impl::create_exception_list (
-    CORBA::ExceptionList_ptr &list,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA::ExceptionList_ptr &list
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_NEW_THROW_EX (list,
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index 52c69ea3de0..f391374ba95 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -30,7 +30,7 @@
 #include "dynamicinterface_export.h"
 #include "ace/Service_Config.h"
 
-class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl 
+class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl
   : public TAO_Dynamic_Adapter
 {
   // = TITLE
@@ -38,7 +38,7 @@ class TAO_DynamicInterface_Export TAO_Dynamic_Adapter_Impl
   //
   // = DESCRIPTION
   //    Concrete subclass of TAO_Dynamic_Adapter
-  //    in the TAO library. This class helps implement various 
+  //    in the TAO library. This class helps implement various
   //    functions in the CORBA namespace relating to DII/DSI
   //    invocations.
   //
@@ -55,15 +55,13 @@ public:
                                CORBA::NamedValue_ptr result,
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA_Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ());
+                               CORBA::Flags req_flags
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
                                       CORBA::ORB_ptr orb,
-                                      const char *op,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+                                      const char *op
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
 
@@ -81,9 +79,8 @@ public:
 
   // CORBA::ORB::create_exception_list.
 
-  virtual void create_exception_list (CORBA::ExceptionList_ptr &list,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  virtual void create_exception_list (CORBA::ExceptionList_ptr &list
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Used to force the initialization of the ORB code.
   static int Initializer (void);
@@ -97,13 +94,13 @@ ACE_FACTORY_DECLARE (TAO_DynamicInterface, TAO_Dynamic_Adapter_Impl)
 typedef int (*TAO_Module_Initializer) (void);
 
 static TAO_Module_Initializer
-TAO_Requires_Request_Factory_Initializer = 
+TAO_Requires_Request_Factory_Initializer =
   &TAO_Dynamic_Adapter_Impl::Initializer;
 
 #else
 
 static int
-TAO_Requires_Request_Factory_Initializer = 
+TAO_Requires_Request_Factory_Initializer =
   TAO_Dynamic_Adapter_Impl::Initializer ();
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 3234ee996a3..4d0781d9804 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -11,13 +11,13 @@ ACE_RCSID(DynamicInterface, Dynamic_Implementation, "$Id$")
 #include "tao/PortableServer/Collocated_Object.h"
 
 CORBA::Object_ptr
-TAO_DynamicImplementation::_this (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynamicImplementation::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The _this() function returns a CORBA::Object_ptr for the target
   // object. Unlike _this() for static skeletons, its return type is
   // not interface-specific because a DSI servant may very well
   // incarnate multiple CORBA objects of different types.
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Create a object.
@@ -48,7 +48,7 @@ TAO_DynamicImplementation::_downcast (const char *repository_id)
 }
 
 TAO_Stub *
-TAO_DynamicImplementation::_create_stub (CORBA::Environment &ACE_TRY_ENV)
+TAO_DynamicImplementation::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
 {
   // If DynamicImplementation::_this() is invoked outside of the
   // context of a request invocation on a target object being served
@@ -65,30 +65,30 @@ TAO_DynamicImplementation::_create_stub (CORBA::Environment &ACE_TRY_ENV)
                         0);
     }
 
-  PortableServer::POA_var poa = poa_current_impl->get_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = poa_current_impl->get_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::RepositoryId pinterface =
     this->_primary_interface (poa_current_impl->object_id (),
-                              poa.in (),
-                              ACE_TRY_ENV);
+                              poa.in ()
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::PolicyList_var client_exposed_policies =
-    poa_current_impl->poa ()->client_exposed_policies 
-      (poa_current_impl->priority (), ACE_TRY_ENV);
+    poa_current_impl->poa ()->client_exposed_policies
+      (poa_current_impl->priority () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (),
                                                 pinterface,
-                                                poa_current_impl->priority (),
-                                                ACE_TRY_ENV);
+                                                poa_current_impl->priority ()
+                                                TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
-                                      void * /* context */,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      void * /* context */
+                                      TAO_ENV_ARG_DECL)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
@@ -120,14 +120,14 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
   ACE_TRY
     {
       // Delegate to user.
-      this->invoke (dsi_request,
-                    ACE_TRY_ENV);
+      this->invoke (dsi_request
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only if the client is waiting.
       if (request.response_expected () && !request.sync_with_server ())
         {
-          dsi_request->dsi_marshal (ACE_TRY_ENV);
+          dsi_request->dsi_marshal (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 810245bbbd5..751aedc1da3 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -29,7 +29,7 @@
 
 #include "dynamicinterface_export.h"
 
-class TAO_DynamicInterface_Export TAO_DynamicImplementation 
+class TAO_DynamicInterface_Export TAO_DynamicImplementation
   : public virtual TAO_ServantBase
 {
   // = TITLE
@@ -41,25 +41,22 @@ class TAO_DynamicInterface_Export TAO_DynamicImplementation
   //    serving a CORBA request. Invoking this method in other
   //    circumstances may lead to unpredictable results.
 public:
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV = 
-                         TAO_default_environment ()) = 0;
+  virtual void invoke (CORBA::ServerRequest_ptr request
+                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
   // The invoke() method receives requests issued to any CORBA object
   // incarnated by the DSI servant and performs the processing
   // necessary to execute the request.
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa,
-      CORBA_Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    ) = 0;
+      PortableServer::POA_ptr poa
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+
   // The _primary_interface() method receives an ObjectId value and a
   // POA_ptr as input parameters and returns a valid RepositoryId
   // representing the most-derived interface for that oid.
 
-  CORBA::Object_ptr _this (CORBA_Environment &ACE_TRY_ENV = 
-                             TAO_default_environment ());
+  CORBA::Object_ptr _this (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns a CORBA::Object_ptr for the target object.
 
 protected:
@@ -70,14 +67,12 @@ protected:
   virtual void *_downcast (const char *repository_id);
   // Simply returns "this"
 
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = 
-                                    TAO_default_environment ());
+  virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // This is an auxiliary method for _this() and _narrow().
 
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context,
-                          CORBA_Environment &ACE_TRY_ENV = 
-                            TAO_default_environment ());
+                          void *context
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Turns around and calls invoke.
 };
 
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 54e3c07dbc3..456b23b4a72 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -49,8 +49,8 @@ CORBA_ExceptionList::add_consume (CORBA::TypeCode_ptr tc)
 }
 
 CORBA::TypeCode_ptr
-CORBA_ExceptionList::item (CORBA::ULong slot,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA_ExceptionList::item (CORBA::ULong slot
+                           TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_ptr *tc = 0;
 
@@ -66,8 +66,8 @@ CORBA_ExceptionList::item (CORBA::ULong slot,
 }
 
 void
-CORBA_ExceptionList::remove (CORBA::ULong,
-                             CORBA::Environment &ACE_TRY_ENV)
+CORBA_ExceptionList::remove (CORBA::ULong
+                             TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index 3f5115d7f21..57bdaad985a 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -74,14 +74,12 @@ public:
   void add_consume (CORBA::TypeCode_ptr tc);
   // Add and consume a TypeCode to the list.
 
-  CORBA::TypeCode_ptr item (CORBA::ULong slot,
-                            CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::TypeCode_ptr item (CORBA::ULong slot
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Return the typecode at slot i. Raises the "Bounds" exception.
 
-  void remove (CORBA::ULong slot,
-               CORBA_Environment &ACE_TRY_ENV =
-                 TAO_default_environment ());
+  void remove (CORBA::ULong slot
+               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Remove the typecode at slot i. Raises the "Bounds" exception.
 
   void  _incr_refcnt (void);
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 27aa0cc686e..4f4c740b39a 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -64,13 +64,13 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
                               CORBA::NVList_ptr args,
                               CORBA::NamedValue_ptr result,
                               CORBA::Flags flags,
-                              CORBA::ExceptionList_ptr exceptions,
-                              CORBA::Environment &env)
+                              CORBA::ExceptionList_ptr exceptions
+                              TAO_ENV_ARG_DECL_NOT_USED)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     args_ (CORBA::NVList::_duplicate (args)),
     result_ (CORBA::NamedValue::_duplicate (result)),
     flags_ (flags),
-    env_ (env),
+    // env_ (env),
     exceptions_ (CORBA::ExceptionList::_duplicate (exceptions)),
     contexts_ (0),
     ctx_ (CORBA::Context::_nil ()),
@@ -94,11 +94,11 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
 
 CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
                               CORBA::ORB_ptr orb,
-                              const CORBA::Char *op,
-                              CORBA::Environment &env)
+                              const CORBA::Char *op
+                              TAO_ENV_ARG_DECL_NOT_USED)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     flags_ (0),
-    env_ (env),
+    // env_ (env),
     contexts_ (0),
     ctx_ (CORBA::Context::_nil ()),
     refcount_ (1),
@@ -141,7 +141,7 @@ CORBA_Request::~CORBA_Request (void)
 // flow in some exotic situations.
 
 void
-CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Request::invoke (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments ();
 
@@ -156,25 +156,25 @@ CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
   // Loop as needed for forwarding.
   for (;;)
     {
-      call.start (ACE_TRY_ENV);
+      call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
       call.prepare_header (ACE_static_cast (CORBA::Octet,
-                                            flag),
-                           ACE_TRY_ENV);
+                                            flag)
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->args_->_tao_encode (call.out_stream (),
                                 this->orb_->orb_core (),
-                                CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                ACE_TRY_ENV);
+                                CORBA::ARG_IN | CORBA::ARG_INOUT
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Make the call ... blocking for the response.
-      int status = call.invoke (this->exceptions_.in (),
-                                ACE_TRY_ENV);
+      int status = call.invoke (this->exceptions_.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == TAO_INVOKE_RESTART)
@@ -216,19 +216,19 @@ CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->result_ != 0)
     {
-      this->result_->value ()->_tao_decode (call.inp_stream (),
-                                            ACE_TRY_ENV);
+      this->result_->value ()->_tao_decode (call.inp_stream ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->args_->_tao_incoming_cdr (call.inp_stream (),
                                   CORBA::ARG_OUT | CORBA::ARG_INOUT,
-                                  this->lazy_evaluation_,
-                                  ACE_TRY_ENV);
+                                  this->lazy_evaluation_
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Request::send_oneway (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments ();
 
@@ -242,23 +242,23 @@ CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
   // Loop as needed for forwarding.
   for (;;)
     {
-      call.start (ACE_TRY_ENV);
+      call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Octet response_flag = ACE_static_cast (CORBA::Octet,
                                                     call.sync_scope ());
 
-      call.prepare_header (response_flag,
-                           ACE_TRY_ENV);
+      call.prepare_header (response_flag
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->args_->_tao_encode (call.out_stream (),
                                 this->orb_->orb_core (),
-                                CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                ACE_TRY_ENV);
+                                CORBA::ARG_IN | CORBA::ARG_INOUT
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      int status = call.invoke (ACE_TRY_ENV);
+      int status = call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == TAO_INVOKE_RESTART)
@@ -288,7 +288,7 @@ CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Request::send_deferred (TAO_ENV_SINGLE_ARG_DECL)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -309,23 +309,23 @@ CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
   // Loop as needed for forwarding.
   for (;;)
     {
-      call.start (ACE_TRY_ENV);
+      call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
-      call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
-                           ACE_TRY_ENV);
+      call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->args_->_tao_encode (call.out_stream (),
                                 this->orb_->orb_core (),
-                                CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                ACE_TRY_ENV);
+                                CORBA::ARG_IN | CORBA::ARG_INOUT
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Make the call without blocking.
-      CORBA::ULong status = call.invoke (ACE_TRY_ENV);
+      CORBA::ULong status = call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == TAO_INVOKE_RESTART)
@@ -349,7 +349,7 @@ CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CORBA_Request::get_response (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Request::get_response (TAO_ENV_SINGLE_ARG_DECL)
 {
   while (!this->response_received_)
     {
@@ -358,13 +358,13 @@ CORBA_Request::get_response (CORBA::Environment &ACE_TRY_ENV)
 
   if (this->lazy_evaluation_)
     {
-      this->args_->evaluate (ACE_TRY_ENV);
+      this->args_->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 CORBA::Boolean
-CORBA_Request::poll_response (CORBA::Environment &)
+CORBA_Request::poll_response (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
@@ -376,8 +376,8 @@ CORBA_Request::poll_response (CORBA::Environment &)
 
 void
 CORBA_Request::handle_response (TAO_InputCDR &incoming,
-                                CORBA::ULong reply_status,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::ULong reply_status
+                                TAO_ENV_ARG_DECL)
 {
   // If this request was created by a gateway, then result_
   // and/or args_ are shared by a CORBA::ServerRequest, whose
@@ -390,15 +390,15 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming,
     case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
       if (this->result_ != 0)
         {
-          this->result_->value ()->_tao_decode (incoming,
-                                                ACE_TRY_ENV);
+          this->result_->value ()->_tao_decode (incoming
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       this->args_->_tao_incoming_cdr (incoming,
                                       CORBA::ARG_OUT | CORBA::ARG_INOUT,
-                                      this->lazy_evaluation_,
-                                      ACE_TRY_ENV);
+                                      this->lazy_evaluation_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       {
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 16d5225237a..444a4504224 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -78,8 +78,8 @@ public:
   // Return a list of the request's result's contexts. Since
   // TAO does not implement Contexts, this will always be 0.
 
-  CORBA::Environment_ptr env (void);
-  // Return the <Environment> for this request.
+  // CORBA::Environment_ptr env (void);
+  // *** DEPRECATED ***  Return the <Environment> for this request.
 
   // Argument manipulation helper functions.
 
@@ -99,8 +99,7 @@ public:
   CORBA_Any &return_value (void);
   // Returns reference to Any for extraction using >>=.
 
-  void invoke (CORBA::Environment &ACE_TRY_ENV =
-                 CORBA::Environment::default_environment ());
+  void invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Perform method resolution and invoke an appropriate method. If
   // the method returns successfully, its result is placed in the
   // result argument specified on <create_request>. The behavior is
@@ -110,25 +109,20 @@ public:
   // A default argument is set, but please note that this not recommended
   // as the user may not be able to propagate the exceptions
 
-  void send_oneway (CORBA::Environment &ACE_TRY_ENV =
-                      CORBA::Environment::default_environment ());
+  void send_oneway (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Send a oneway request.
   // A default argument is set, but please note that this not recommended
   // as the user may not be able to propagate the exceptions.
 
   // The 'deferred synchronous' methods.
-  void send_deferred (CORBA::Environment &ACE_TRY_ENV =
-                        CORBA::Environment::default_environment ());
-  void get_response (CORBA::Environment &ACE_TRY_ENV =
-                      CORBA::Environment::default_environment ());
-  CORBA::Boolean poll_response (CORBA::Environment &ACE_TRY_ENV =
-                                  CORBA::Environment::default_environment ());
+  void send_deferred (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void get_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::Boolean poll_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // Callback method for deferred synchronous requests.
   void handle_response (TAO_InputCDR &incoming,
-                        CORBA::ULong reply_status,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          CORBA::Environment::default_environment ());
+                        CORBA::ULong reply_status
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Pseudo object methods.
   static CORBA_Request* _duplicate (CORBA_Request*);
@@ -171,15 +165,13 @@ private:
                  CORBA::NVList_ptr args,
                  CORBA::NamedValue_ptr result,
                  CORBA::Flags flags,
-                 CORBA::ExceptionList_ptr exceptions,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 CORBA::ExceptionList_ptr exceptions
+                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_Request (CORBA::Object_ptr obj,
                  CORBA::ORB_ptr orb,
-                 const CORBA::Char *op,
-                 CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+                 const CORBA::Char *op
+                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   ~CORBA_Request (void);
 
@@ -201,8 +193,8 @@ private:
   CORBA::Flags flags_;
   // Invocation flags.
 
-  CORBA::Environment env_;
-  // Holds exceptions.
+  // CORBA::Environment env_;
+  // *** DEPRECATED ***  Holds exceptions.
 
   CORBA_ExceptionList_var exceptions_;
   // List of exceptions raised by the operation.
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 71038d5a6ae..d1bf04b3716 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -53,12 +53,12 @@ CORBA_Request::contexts (void)
   return this->contexts_;
 }
 
-// Return the <Environment> for this request.
-ACE_INLINE CORBA::Environment *
-CORBA_Request::env (void)
-{
-  return &this->env_;
-}
+//// *** DEPRECATED ***  Return the <Environment> for this request.
+// ACE_INLINE CORBA::Environment *
+// CORBA_Request::env (void)
+// {
+//   return &this->env_;
+// }
 
 // The argument manipulation helper functions
 
@@ -66,42 +66,42 @@ ACE_INLINE CORBA_Any &
 CORBA_Request::add_in_arg (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_IN, ACE_TRY_ENV)->any_;
+  return this->args_->add_element (CORBA::ARG_IN TAO_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_in_arg (const CORBA::Char *name)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_IN, ACE_TRY_ENV)->any_;
+  return this->args_->add_item (name, CORBA::ARG_IN TAO_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_inout_arg (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_INOUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_element (CORBA::ARG_INOUT TAO_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_inout_arg (const CORBA::Char *name)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_INOUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_item (name, CORBA::ARG_INOUT TAO_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_out_arg (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_OUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_element (CORBA::ARG_OUT TAO_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_out_arg (const CORBA::Char *name)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_OUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_item (name, CORBA::ARG_OUT TAO_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE void
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 539964a51c6..d214ee8e150 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -77,8 +77,8 @@ CORBA_ServerRequest::~CORBA_ServerRequest (void)
 // Unmarshal in/inout params, and set up to marshal the appropriate
 // inout/out/return values later on.
 void
-CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list,
-                                CORBA::Environment &ACE_TRY_ENV)
+CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list
+                                TAO_ENV_ARG_DECL)
 {
   // arguments() must be called before either of these.
   if (this->params_ != 0 || this->exception_ != 0)
@@ -91,8 +91,8 @@ CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list,
 
   this->params_->_tao_incoming_cdr (this->orb_server_request_.incoming (),
                                     CORBA::ARG_IN | CORBA::ARG_INOUT,
-                                    this->lazy_evaluation_,
-                                    ACE_TRY_ENV);
+                                    this->lazy_evaluation_
+                                    TAO_ENV_ARG_PARAMETER);
 
   // Pass this alignment back to the TAO_ServerRequest.
   this->orb_server_request_.dsi_nvlist_align (
@@ -104,8 +104,8 @@ CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list,
 // but not both of them.  Results can be reported (at most once)
 // only after the parameter list has been provided (maybe empty).
 void
-CORBA_ServerRequest::set_result (const CORBA::Any &value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+CORBA_ServerRequest::set_result (const CORBA::Any &value
+                                 TAO_ENV_ARG_DECL)
 {
   // Setting a result when another result already exists or if an exception
   // exists or before the args have been processeed is an error.
@@ -120,7 +120,7 @@ CORBA_ServerRequest::set_result (const CORBA::Any &value,
   ACE_CHECK;
 }
 
-  // NOTE: if "ACE_TRY_ENV" is set, there has been a system exception,
+  // NOTE: if "TAO_ENV_SINGLE_ARG_PARAMETER" is set, there has been a system exception,
   // and it will take precedence over exceptions reported using the
   // set_exception() mechanism of the ServerRequest, which we assume
   // the application writer will use to report only user exceptions.
@@ -129,8 +129,8 @@ CORBA_ServerRequest::set_result (const CORBA::Any &value,
 
 // Store the exception value.
 void
-CORBA_ServerRequest::set_exception (const CORBA::Any &value,
-                                    CORBA::Environment &ACE_TRY_ENV)
+CORBA_ServerRequest::set_exception (const CORBA::Any &value
+                                    TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = value.type ();
 
@@ -152,7 +152,7 @@ CORBA_ServerRequest::set_exception (const CORBA::Any &value,
 // This method will be utilized by the DSI servant to marshal outgoing
 // parameters.
 void
-CORBA_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL)
 {
   // There was a user exception, no need to marshal any parameters.
   if (this->sent_gateway_exception_)
@@ -175,8 +175,8 @@ CORBA_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
         {
           this->retval_->_tao_encode (
                              this->orb_server_request_.outgoing (),
-                             this->orb_server_request_.orb_core (),
-                             ACE_TRY_ENV
+                             this->orb_server_request_.orb_core ()
+                             TAO_ENV_ARG_PARAMETER
                            );
           ACE_CHECK;
         }
@@ -187,8 +187,8 @@ CORBA_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
           this->params_->_tao_encode (
                              this->orb_server_request_.outgoing (),
                              this->orb_server_request_.orb_core (),
-                             CORBA::ARG_INOUT | CORBA::ARG_OUT,
-                             ACE_TRY_ENV
+                             CORBA::ARG_INOUT | CORBA::ARG_OUT
+                             TAO_ENV_ARG_PARAMETER
                            );
           ACE_CHECK;
         }
@@ -203,8 +203,8 @@ CORBA_ServerRequest::dsi_marshal (CORBA::Environment &ACE_TRY_ENV)
 
       this->exception_->_tao_encode (
                             this->orb_server_request_.outgoing (),
-                            this->orb_server_request_.orb_core (),
-                            ACE_TRY_ENV
+                            this->orb_server_request_.orb_core ()
+                            TAO_ENV_ARG_PARAMETER
                           );
       ACE_CHECK;
     }
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index 19243bac2ff..a356d8abc15 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -52,25 +52,22 @@ public:
   ~CORBA_ServerRequest (void);
   // Destructor.
 
-  void arguments (CORBA::NVList_ptr &list,
-                  CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ());
+  void arguments (CORBA::NVList_ptr &list
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Implementation uses this to provide the ORB with the operation's
   // parameter list ... on return, their values are available; the
   // list fed in has typecodes and (perhap) memory assigned.
 
-  void set_result (const CORBA::Any &value,
-                   CORBA_Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  void set_result (const CORBA::Any &value
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Implementation uses this to provide the operation result
   // ... illegal if exception() was called or params() was not called.
   //
   // XXX Implementation should be able to assume response has been
   // sent when this returns, and reclaim memory it allocated.
 
-  void set_exception (const CORBA::Any &value,
-                      CORBA_Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+  void set_exception (const CORBA::Any &value
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Implementation uses this to provide the exception value which is
   // the only result of this particular invocation.
   //
@@ -86,8 +83,7 @@ public:
   // this stuff is a catastrophic error since this is all part of the
   // basic CORBA Object Model.
 
-  void dsi_marshal (CORBA_Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+  void dsi_marshal (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Marshal outgoing parameters.
 
   CORBA::Context_ptr ctx (void) const;
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index f0dce506ca2..ddbb5fbec54 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -41,9 +41,9 @@ CORBA_UnknownUserException::exception (void)
 int
 CORBA_UnknownUserException::_is_a (const char *interface_id) const
 {
-  return 
+  return
     ((ACE_OS_String::strcmp (interface_id,
-                             "IDL:omg.org/CORBA/UnknownUserException:1.0") 
+                             "IDL:omg.org/CORBA/UnknownUserException:1.0")
         == 0)
       || CORBA_UserException::_is_a (interface_id));
 }
@@ -68,16 +68,16 @@ CORBA_UnknownUserException::_raise (void)
 
 void
 CORBA_UnknownUserException::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void
-CORBA_UnknownUserException::_tao_decode (TAO_InputCDR &,
-                                         CORBA::Environment &ACE_TRY_ENV)
+CORBA_UnknownUserException::_tao_decode (TAO_InputCDR &
+                                         TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 81eb0bac85c..dd9585ba144 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -49,7 +49,7 @@
  * <CORBA::UnknownUserException> that contains the exception inside
  * an Any.
  */
-class TAO_DynamicInterface_Export CORBA_UnknownUserException 
+class TAO_DynamicInterface_Export CORBA_UnknownUserException
   : public CORBA_UserException
 {
 public:
@@ -73,10 +73,10 @@ public:
   /// To throw an UnknownUserException of this type.
   virtual void _raise (void);
 
-  virtual void _tao_encode (TAO_OutputCDR &cdr,
-                            CORBA::Environment &) const;
-  virtual void _tao_decode (TAO_InputCDR &cdr,
-                            CORBA::Environment &);
+  virtual void _tao_encode (TAO_OutputCDR &cdr
+                            TAO_ENV_ARG_DECL) const;
+  virtual void _tao_decode (TAO_InputCDR &cdr
+                            TAO_ENV_ARG_DECL);
 
   /// Narrow to an UnknowUserException.
   static CORBA_UnknownUserException *_downcast (CORBA_Exception *ex);
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index c99f4a2e1bc..b7840508950 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -12,7 +12,7 @@ TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void)
 
 // Methods to be overridden.
 
-void 
+void
 TAO_Dynamic_Adapter::create_request (
     CORBA::Object_ptr /* obj */,
     CORBA::ORB_ptr /* orb */,
@@ -21,57 +21,57 @@ TAO_Dynamic_Adapter::create_request (
     CORBA::NamedValue_ptr /* result */,
     CORBA::ExceptionList_ptr /* exceptions */,
     CORBA::Request_ptr & /* request */,
-    CORBA::Flags /* req_flags */,
-    CORBA_Environment & /* ACE_TRY_ENV */
+    CORBA::Flags /* req_flags */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
 {
 }
 
-CORBA::Request_ptr 
+CORBA::Request_ptr
 TAO_Dynamic_Adapter::request (CORBA::Object_ptr /* obj */,
                               CORBA::ORB_ptr /* orb */,
-                              const char * /* op */,
-                              CORBA::Environment & /* ACE_TRY_ENV */)
+                              const char * /* op */
+                              TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
 {
   return 0;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_Dynamic_Adapter::context_is_nil (CORBA::Context_ptr)
 {
   return 0;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_Dynamic_Adapter::request_is_nil (CORBA::Request_ptr)
 {
   return 0;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_Dynamic_Adapter::server_request_is_nil (CORBA::ServerRequest_ptr)
 {
   return 0;
 }
 
-void 
+void
 TAO_Dynamic_Adapter::context_release (CORBA::Context_ptr)
 {
 }
 
-void 
+void
 TAO_Dynamic_Adapter::request_release (CORBA::Request_ptr)
 {
 }
 
-void 
+void
 TAO_Dynamic_Adapter::server_request_release (CORBA::ServerRequest_ptr)
 {
 }
 
 void
-TAO_Dynamic_Adapter::create_exception_list (CORBA::ExceptionList_ptr &,
-                                            CORBA_Environment &)
+TAO_Dynamic_Adapter::create_exception_list (CORBA::ExceptionList_ptr &
+                                            TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -85,7 +85,7 @@ CORBA::is_nil (CORBA::Context_ptr ctx)
 {
   TAO_Dynamic_Adapter *dynamic_adapter =
     ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
-	      TAO_ORB_Core::dynamic_adapter_name ()
+              TAO_ORB_Core::dynamic_adapter_name ()
       );
 
   return dynamic_adapter->context_is_nil (ctx);
diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h
index 361f24c696a..957a46aa579 100644
--- a/TAO/tao/Dynamic_Adapter.h
+++ b/TAO/tao/Dynamic_Adapter.h
@@ -49,15 +49,13 @@ public:
                                CORBA::NamedValue_ptr result,
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA_Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ());
+                               CORBA::Flags req_flags
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
                                       CORBA::ORB_ptr orb,
-                                      const char *op,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+                                      const char *op
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
 
@@ -74,8 +72,8 @@ public:
   virtual void server_request_release (CORBA::ServerRequest_ptr req);
 
   // CORBA::ORB::create_exception_list.
-  virtual void create_exception_list (CORBA::ExceptionList_ptr &,
-                                      CORBA_Environment &);
+  virtual void create_exception_list (CORBA::ExceptionList_ptr &
+                                      TAO_ENV_ARG_DECL_NOT_USED);
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h
index ef60cff9d40..933b87bc233 100644
--- a/TAO/tao/Endpoint_Selector_Factory.h
+++ b/TAO/tao/Endpoint_Selector_Factory.h
@@ -57,8 +57,8 @@ public:
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
-                             TAO_GIOP_Invocation *invocation,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
+                             TAO_GIOP_Invocation *invocation
+                             TAO_ENV_ARG_DECL) = 0;
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index c53200c1c70..d347c310b45 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -285,8 +285,8 @@ CORBA_SystemException::_downcast (CORBA_Exception* exception)
 }
 
 void
-CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr,
-                                    CORBA::Environment &ACE_TRY_ENV) const
+CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr
+                                    TAO_ENV_ARG_DECL) const
 {
   if (cdr.write_string (this->_id ())
       && cdr.write_ulong (this->minor ())
@@ -296,8 +296,8 @@ CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr,
 }
 
 void
-CORBA_SystemException::_tao_decode (TAO_InputCDR &cdr,
-                                    CORBA::Environment &ACE_TRY_ENV)
+CORBA_SystemException::_tao_decode (TAO_InputCDR &cdr
+                                    TAO_ENV_ARG_DECL)
 {
   // The string is read by the caller, to determine the exact type of
   // the exception.  We just decode the fields...
@@ -825,8 +825,8 @@ CORBA_SystemException::_tao_get_omg_exception_description (
 // then overwritten.
 
 void
-TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp
+                                            TAO_ENV_ARG_DECL)
 {
   // Create the TypeCode for the CORBA_UnknownUserException.
 
@@ -881,8 +881,8 @@ void
 TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
                                         const char *name,
                                         char *buffer,
-                                        size_t buflen,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        size_t buflen
+                                        TAO_ENV_ARG_DECL)
 {
   // This function must only be called ONCE, and with a global lock
   // held!  The <CORBA::ORB_init> method is responsible for ensuring
@@ -1032,7 +1032,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
 #undef TAO_TC_BUF_LEN
 
 void
-TAO_Exceptions::init (CORBA::Environment &ACE_TRY_ENV)
+TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   // This routine should only be called once.
 
@@ -1051,19 +1051,19 @@ TAO_Exceptions::init (CORBA::Environment &ACE_TRY_ENV)
   TAO_Exceptions::make_standard_typecode (CORBA::_tc_ ## name, \
                                           #name, \
                                           (char*)tc_buf_##name, \
-                                          sizeof(tc_buf_##name), \
-                                          ACE_TRY_ENV); \
+                                          sizeof(tc_buf_##name) \
+                                           TAO_ENV_ARG_PARAMETER); \
   ACE_CHECK;
   STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
 
-  TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException,
-                                              ACE_TRY_ENV);
+  TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException
+                                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_SystemException *
-TAO_Exceptions::create_system_exception (const char *id,
-                                         CORBA::Environment &)
+TAO_Exceptions::create_system_exception (const char *id
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
 #define TAO_SYSTEM_EXCEPTION(name) \
   { \
@@ -1159,11 +1159,11 @@ tao_insert_for_insertion_system_exception (CORBA::Any &any,
                                            const CORBA::SystemException &ex,
                                            const char *msg)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      ex._tao_encode (stream, ACE_TRY_ENV);
+      ex._tao_encode (stream TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any._tao_replace (ex._type (),
                         TAO_ENCAP_BYTE_ORDER,
@@ -1195,11 +1195,11 @@ tao_insert_system_exception (CORBA::Any &any,
                              CORBA::Any::_tao_destructor destructor,
                              const char *msg)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      ex->_tao_encode (stream, ACE_TRY_ENV);
+      ex->_tao_encode (stream TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any._tao_replace (ex->_type (),
                         TAO_ENCAP_BYTE_ORDER,
@@ -1249,12 +1249,12 @@ tao_insert_in_extractor_system_exception (
         const char *compare_IR_Id,
         const char *msg)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::TypeCode_var type = any.type ();
       CORBA::Boolean equiv =
-        type->equivalent (tc_name, ACE_TRY_ENV);
+        type->equivalent (tc_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (!equiv)
         return 0;
@@ -1276,7 +1276,7 @@ tao_insert_in_extractor_system_exception (
                                      compare_IR_Id))
             return 0;
           CORBA::SystemException *tmp = allocator ();
-          tmp->_tao_decode (stream, ACE_TRY_ENV);
+          tmp->_tao_decode (stream TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ((CORBA::Any *)&any)->_tao_replace (
               tc_name,
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 3b35fe3b406..81d6aecd6f8 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -93,10 +93,10 @@ public:
   /// function is not CORBA compliant.
   virtual ACE_CString _info (void) const = 0;
 
-  virtual void _tao_encode (TAO_OutputCDR &cdr,
-                            CORBA::Environment &) const = 0;
-  virtual void _tao_decode (TAO_InputCDR &cdr,
-                            CORBA::Environment &) = 0;
+  virtual void _tao_encode (TAO_OutputCDR &cdr
+                            TAO_ENV_ARG_DECL_NOT_USED) const = 0;
+  virtual void _tao_decode (TAO_InputCDR &cdr
+                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
   /// Used in the non-copying Any insertion operator.
   static void _tao_any_destructor (void *);
@@ -227,10 +227,10 @@ public:
   /// function is not CORBA compliant.
   virtual ACE_CString _info (void) const;
 
-  virtual void _tao_encode (TAO_OutputCDR &cdr,
-                            CORBA::Environment &) const;
-  virtual void _tao_decode (TAO_InputCDR &cdr,
-                            CORBA::Environment &);
+  virtual void _tao_encode (TAO_OutputCDR &cdr
+                            TAO_ENV_ARG_DECL_NOT_USED) const;
+  virtual void _tao_decode (TAO_InputCDR &cdr
+                            TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Helper to create a minor status value.
   static CORBA::ULong _tao_minor_code (u_int location,
@@ -343,30 +343,26 @@ public:
   static void make_standard_typecode (CORBA::TypeCode_ptr &tcp,
                                       const char *name,
                                       char *buf,
-                                      size_t buflen,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+                                      size_t buflen
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Make the TypeCode for the CORBA::UnknownUserException standard
   /// exception.
-  static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-                                          CORBA_Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ());
+  static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Runtime initialization of all standard exception typecodes.
   /// Called from <CORBA::ORB_init>.
-  static void init (CORBA_Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+  static void init (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Runtime finalization of all standard exception typecodes.
   static void fini (void);
 
   /// Create a CORBA::SystemException given the interface repository ID.
   static CORBA_SystemException *create_system_exception (
-      const char *id,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /**
    * This global allocator is used to initialize system exception
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 5b97b90919e..8ddad3a1661 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -30,8 +30,8 @@ TAO_FILE_Parser::match_prefix (const char *ior_string) const
 
 CORBA::Object_ptr
 TAO_FILE_Parser::parse_string (const char *ior,
-                               CORBA::ORB_ptr orb,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::ORB_ptr orb
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
@@ -54,7 +54,7 @@ TAO_FILE_Parser::parse_string (const char *ior,
   CORBA::Object_ptr object = CORBA::Object::_nil ();
   ACE_TRY
     {
-      object = orb->string_to_object (string, ACE_TRY_ENV);
+      object = orb->string_to_object (string TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       reader.alloc ()->free (string);
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
index 1cb5b4839f8..17729ceca1b 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -44,8 +44,8 @@ public:
   //   IOR_Parser.h
   virtual int match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb,
-                                          CORBA::Environment &)
+                                          CORBA::ORB_ptr orb
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index fb75e68a725..9e5e1899ac7 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -360,7 +360,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, GIOP::IORAddressingInfo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_IORAddressingInfo, ACE_TRY_ENV);
+      type->equivalent (GIOP::_tc_IORAddressingInfo TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -464,7 +464,7 @@ CORBA::Boolean operator>>= (
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_TargetAddress, ACE_TRY_ENV);
+      type->equivalent (GIOP::_tc_TargetAddress TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index d9f52141b98..682b1dbe338 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -132,14 +132,14 @@ TAO_GIOP_Message_Base::generate_reply_header (
                            -1);
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Now call the implementation for the rest of the header
       int result =
         this->generator_parser_->write_reply_header (cdr,
-                                                     params,
-                                                     ACE_TRY_ENV);
+                                                     params
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -674,14 +674,14 @@ TAO_GIOP_Message_Base::generate_exception_reply (
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Make the GIOP & reply header.
       this->generate_reply_header (cdr,
                                    params);
-      x._tao_encode (cdr, ACE_TRY_ENV);
+      x._tao_encode (cdr TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
@@ -754,7 +754,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
 
   int parse_error = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       parse_error =
@@ -774,8 +774,8 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
       this->orb_core_->adapter_registry ()->dispatch (
           request.object_key (),
           request,
-          forward_to,
-          ACE_TRY_ENV);
+          forward_to
+           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
@@ -941,7 +941,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 
   CORBA::Boolean response_required = 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       int parse_error =
@@ -987,8 +987,8 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
       this->orb_core_->adapter_registry ()->dispatch (
           server_request.object_key (),
           server_request,
-          forward_to,
-          ACE_TRY_ENV);
+          forward_to
+           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index 5363fca970c..b1a6a9289d4 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -68,8 +68,8 @@ public:
   /// Write the reply header in to <output>
   virtual int write_reply_header (
       TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply,
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_Pluggable_Reply_Params_Base &reply
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Writes the locate _reply message in to the <output>
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index 22bc29161b5..7c255d90b30 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -116,8 +116,8 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_request_header (
 int
 TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
     TAO_OutputCDR &output,
-    TAO_Pluggable_Reply_Params_Base &reply,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_Pluggable_Reply_Params_Base &reply
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -241,8 +241,6 @@ TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
   this->marshal_reply_status (output,
                               reply);
 
-  ACE_UNUSED_ARG (ACE_TRY_ENV);  // FUZZ: ignore check_for_ace_check
-
   return 1;
 }
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index ea2c2ab77af..d762c6de367 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -58,8 +58,8 @@ public:
   /// Write the reply header in to <output>
   virtual int write_reply_header (
       TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply,
-      CORBA::Environment &ACE_TRY_ENV
+      TAO_Pluggable_Reply_Params_Base &reply
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index c42fa68ae90..293104e75eb 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -130,8 +130,8 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_request_header (
 int
 TAO_GIOP_Message_Generator_Parser_12::write_reply_header (
     TAO_OutputCDR & output,
-    TAO_Pluggable_Reply_Params_Base &reply,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    TAO_Pluggable_Reply_Params_Base &reply
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index 946037a35cf..9795ae822d4 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -60,8 +60,8 @@ public:
   /// Write the reply header in to <output>
   virtual int write_reply_header (
       TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply,
-      CORBA::Environment &ACE_TRY_ENV
+      TAO_Pluggable_Reply_Params_Base &reply
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 976f71f39f3..c2f0875b45a 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -627,14 +627,14 @@ TAO_GIOP_Message_Lite::generate_exception_reply (
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Make the GIOP & reply header. They are version specific.
       this->write_reply_header (cdr,
                                 params);
-      x._tao_encode (cdr, ACE_TRY_ENV);
+      x._tao_encode (cdr TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
@@ -701,7 +701,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
 
   int parse_error = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       parse_error =
@@ -720,8 +720,8 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
       // Do this before the reply is sent.
       this->orb_core_->adapter_registry ()->dispatch (request.object_key (),
                                                       request,
-                                                      forward_to,
-                                                      ACE_TRY_ENV);
+                                                      forward_to
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
@@ -886,7 +886,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
 
   CORBA::Boolean response_required = 1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       int parse_error =
@@ -938,8 +938,8 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
 
       this->orb_core_->adapter_registry ()->dispatch (server_request.object_key (),
                                                       server_request,
-                                                      forward_to,
-                                                      ACE_TRY_ENV);
+                                                      forward_to
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
@@ -1119,8 +1119,8 @@ TAO_GIOP_Message_Lite::parse_reply (TAO_InputCDR &cdr,
 int
 TAO_GIOP_Message_Lite::write_reply_header (
     TAO_OutputCDR &output,
-    TAO_Pluggable_Reply_Params_Base &reply,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    TAO_Pluggable_Reply_Params_Base &reply
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1407,7 +1407,7 @@ TAO_GIOP_Message_Lite::send_reply_exception (
 
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -1424,7 +1424,7 @@ TAO_GIOP_Message_Lite::send_reply_exception (
                                 reply_params);
 
 
-      x->_tao_encode (output, ACE_TRY_ENV);
+      x->_tao_encode (output TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 8bd5202ca70..4bab59806be 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -213,9 +213,8 @@ private:
   /// Write the reply header in to <output>
   int write_reply_header (
       TAO_OutputCDR &output,
-      TAO_Pluggable_Reply_Params_Base &reply,
-      CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ())
+      TAO_Pluggable_Reply_Params_Base &reply
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Writes the locate _reply message in to the <output>
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index b880b7368e3..abf2ede2d18 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -63,11 +63,11 @@ tao_CORBA_IRObject_nil (
 
 CORBA_IRObject_ptr
 tao_CORBA_IRObject_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_IRObject::_narrow (p, ACE_TRY_ENV);
+  return CORBA_IRObject::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -130,7 +130,7 @@ CORBA_IRObject_var::operator const ::CORBA_IRObject_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_IRObject_var::operator ::CORBA_IRObject_ptr &() // cast 
+CORBA_IRObject_var::operator ::CORBA_IRObject_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -190,11 +190,11 @@ CORBA_IRObject_var::tao_nil (void)
 
 ::CORBA_IRObject_ptr
 CORBA_IRObject_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_IRObject::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_IRObject::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -271,27 +271,23 @@ class TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::DefinitionKind result);
@@ -305,57 +301,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::DefinitionKind result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -364,86 +360,82 @@ class TAO_ClientRequestInfo_CORBA_IRObject_destroy : public TAO_ClientRequestInf
 public:
   TAO_ClientRequestInfo_CORBA_IRObject_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
 private:
   TAO_ClientRequestInfo_CORBA_IRObject_destroy (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
   void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
 
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_IRObject_Proxy_Impl::_TAO_CORBA_IRObject_Proxy_Impl (void)
@@ -455,22 +447,22 @@ _TAO_CORBA_IRObject_Remote_Proxy_Impl::_TAO_CORBA_IRObject_Remote_Proxy_Impl (vo
 // Remote Implementation of the IDL interface methods
 
 CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_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
   ))
 {
-  
+
   CORBA::DefinitionKind _tao_retval = (CORBA::DefinitionKind)0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_def_kind",
@@ -478,89 +470,89 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_retval)
@@ -570,73 +562,73 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA::DefinitionKind _tao_retval_info = _tao_retval;
           ri.result (_tao_retval_info);
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN  (_tao_retval);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_retval;
 }
 
 void _TAO_CORBA_IRObject_Remote_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
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -644,129 +636,129 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -774,7 +766,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -812,8 +804,8 @@ _TAO_CORBA_IRObject_Remote_Proxy_Broker::~_TAO_CORBA_IRObject_Remote_Proxy_Broke
 
 _TAO_CORBA_IRObject_Proxy_Impl&
 _TAO_CORBA_IRObject_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_IRObject *,
-  CORBA::Environment &
+  ::CORBA_IRObject *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -853,25 +845,25 @@ void CORBA_IRObject::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_IRObject_ptr CORBA_IRObject::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_IRObject::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
       if (is_a == 0)
         return CORBA_IRObject::_nil ();
     }
-  return CORBA_IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_IRObject::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -895,14 +887,14 @@ CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_IRObject::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_IRObject (stub, 0, obj->_servant ()), CORBA_IRObject::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -926,14 +918,14 @@ CORBA_IRObject::_duplicate (CORBA_IRObject_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type)
@@ -946,7 +938,7 @@ void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -958,36 +950,36 @@ const char* CORBA_IRObject::_interface_repository_id (void) const
 }
 
 CORBA::DefinitionKind CORBA_IRObject::def_kind (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_IRObject_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_IRObject_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::DefinitionKind)0);
-  
+
   return proxy.def_kind (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_IRObject::destroy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_IRObject_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_IRObject_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.destroy (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -1017,11 +1009,11 @@ tao_CORBA_Contained_nil (
 
 CORBA_Contained_ptr
 tao_CORBA_Contained_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_Contained::_narrow (p, ACE_TRY_ENV);
+  return CORBA_Contained::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1084,7 +1076,7 @@ CORBA_Contained_var::operator const ::CORBA_Contained_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_Contained_var::operator ::CORBA_Contained_ptr &() // cast 
+CORBA_Contained_var::operator ::CORBA_Contained_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1144,11 +1136,11 @@ CORBA_Contained_var::tao_nil (void)
 
 ::CORBA_Contained_ptr
 CORBA_Contained_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Contained::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_Contained::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1225,27 +1217,23 @@ class TAO_ClientRequestInfo_CORBA_Contained_id_get : public TAO_ClientRequestInf
 public:
   TAO_ClientRequestInfo_CORBA_Contained_id_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (char * result);
@@ -1259,57 +1247,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Contained_id_get::TAO_ClientRequestInfo_CORBA_Contained_id_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_id_get::result (char * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -1319,27 +1307,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_id_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -1347,63 +1331,63 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_Contained_id_set &);
 
   const char * id_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_Contained_id_set::TAO_ClientRequestInfo_CORBA_Contained_id_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * id,
-    CORBA::Environment &    
+    const char * id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
 }
 
@@ -1412,27 +1396,23 @@ class TAO_ClientRequestInfo_CORBA_Contained_name_get : public TAO_ClientRequestI
 public:
   TAO_ClientRequestInfo_CORBA_Contained_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (char * result);
@@ -1446,57 +1426,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Contained_name_get::TAO_ClientRequestInfo_CORBA_Contained_name_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_name_get::result (char * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -1506,27 +1486,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_name_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -1534,63 +1510,63 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_Contained_name_set &);
 
   const char * name_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_Contained_name_set::TAO_ClientRequestInfo_CORBA_Contained_name_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * name,
-    CORBA::Environment &    
+    const char * name
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     name_ (name)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
 }
 
@@ -1599,27 +1575,23 @@ class TAO_ClientRequestInfo_CORBA_Contained_version_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_Contained_version_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (char * result);
@@ -1633,57 +1605,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Contained_version_get::TAO_ClientRequestInfo_CORBA_Contained_version_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_version_get::result (char * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -1693,27 +1665,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_version_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -1721,63 +1689,63 @@ private:
   void operator= (const TAO_ClientRequestInfo_CORBA_Contained_version_set &);
 
   const char * version_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_Contained_version_set::TAO_ClientRequestInfo_CORBA_Contained_version_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * version,
-    CORBA::Environment &    
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     version_ (version)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
 }
 
@@ -1786,27 +1754,23 @@ class TAO_ClientRequestInfo_CORBA_Contained_defined_in_get : public TAO_ClientRe
 public:
   TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_Container_ptr result);
@@ -1820,57 +1784,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (CORBA_Container_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -1879,27 +1843,23 @@ class TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get : public TAO_Clien
 public:
   TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (char * result);
@@ -1913,57 +1873,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (char * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -1972,27 +1932,23 @@ class TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get : public T
 public:
   TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_Repository_ptr result);
@@ -2006,57 +1962,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA_Repository_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -2065,27 +2021,23 @@ class TAO_ClientRequestInfo_CORBA_Contained_describe : public TAO_ClientRequestI
 public:
   TAO_ClientRequestInfo_CORBA_Contained_describe (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_Contained::Description * result);
@@ -2099,57 +2051,57 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Contained_describe::TAO_ClientRequestInfo_CORBA_Contained_describe (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Contained_describe::result (CORBA_Contained::Description * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -2161,27 +2113,23 @@ public:
       CORBA::Object_ptr _tao_target,
       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));
 
 private:
@@ -2191,7 +2139,7 @@ private:
   CORBA_Container_ptr new_container_;
   const char * new_name_;
   const char * new_version_;
-  
+
 };
 
 TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Contained_move (
@@ -2199,8 +2147,8 @@ TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Containe
     CORBA::Object_ptr _tao_target,
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     new_container_ (new_container),
@@ -2209,19 +2157,19 @@ TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Containe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<=  this->new_container_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -2231,40 +2179,40 @@ TAO_ClientRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_T
     (*parameter_list)[len].argument <<= new_version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_Contained_Proxy_Impl::_TAO_CORBA_Contained_Proxy_Impl (void)
@@ -2276,22 +2224,22 @@ _TAO_CORBA_Contained_Remote_Proxy_Impl::_TAO_CORBA_Contained_Remote_Proxy_Impl (
 // Remote Implementation of the IDL interface methods
 
 char * _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
+
   CORBA::String_var _tao_safe_retval;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_id",
@@ -2299,89 +2247,89 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_id_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2391,52 +2339,52 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           char * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -2444,22 +2392,22 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_id",
@@ -2467,64 +2415,64 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_id_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        id,
-        ACE_TRY_ENV
+        id
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id)
@@ -2532,95 +2480,95 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
 }
 
 char * _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
+
   CORBA::String_var _tao_safe_retval;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_name",
@@ -2628,89 +2576,89 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_name_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2720,52 +2668,52 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           char * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -2773,22 +2721,22 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_name",
@@ -2796,64 +2744,64 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_name_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        name,
-        ACE_TRY_ENV
+        name
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << name)
@@ -2861,95 +2809,95 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
 }
 
 char * _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
+
   CORBA::String_var _tao_safe_retval;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_version",
@@ -2957,89 +2905,89 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_version_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -3049,52 +2997,52 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           char * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -3102,22 +3050,22 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_set_version",
@@ -3125,64 +3073,64 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_version_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << version)
@@ -3190,96 +3138,96 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
 }
 
 CORBA_Container_ptr _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
+
   CORBA_Container_ptr _tao_retval = CORBA_Container::_nil ();
   CORBA_Container_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_defined_in",
@@ -3287,89 +3235,89 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_defined_in_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -3379,74 +3327,74 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
 }
 
 char * _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
+
   CORBA::String_var _tao_safe_retval;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_absolute_name",
@@ -3454,89 +3402,89 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -3546,75 +3494,75 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           char * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
 }
 
 CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
+
   CORBA_Repository_ptr _tao_retval = tao_CORBA_Repository_nil ();
   CORBA_Repository_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_containing_repository",
@@ -3622,89 +3570,89 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -3714,73 +3662,73 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
 }
 
 CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
+
   CORBA_Contained::Description *_tao_retval = 0;
-  
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_Contained::Description, _tao_retval);
   CORBA_Contained::Description_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -3790,89 +3738,89 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_describe ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -3882,52 +3830,52 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -3937,22 +3885,22 @@ void _TAO_CORBA_Contained_Remote_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
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "move",
@@ -3960,66 +3908,66 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Contained_move ri (
         &_tao_call,
         _collocated_tao_target_,
         new_container,
         new_name,
-        new_version,
-        ACE_TRY_ENV
+        new_version
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << new_container) &&
@@ -4029,73 +3977,73 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -4103,7 +4051,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4141,8 +4089,8 @@ _TAO_CORBA_Contained_Remote_Proxy_Broker::~_TAO_CORBA_Contained_Remote_Proxy_Bro
 
 _TAO_CORBA_Contained_Proxy_Impl&
 _TAO_CORBA_Contained_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_Contained *,
-  CORBA::Environment &
+  ::CORBA_Contained *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -4173,7 +4121,7 @@ CORBA_Contained::CORBA_Contained_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_Contained_Proxy_Broker_ =
       ::_TAO_CORBA_Contained_Remote_Proxy_Broker::the_TAO_CORBA_Contained_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
@@ -4184,25 +4132,25 @@ void CORBA_Contained::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_Contained_ptr CORBA_Contained::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Contained::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Contained::_nil ());
       if (is_a == 0)
         return CORBA_Contained::_nil ();
     }
-  return CORBA_Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Contained::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr CORBA_Contained::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4226,14 +4174,14 @@ CORBA_Contained_ptr CORBA_Contained::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_Contained::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_Contained (stub, 0, obj->_servant ()), CORBA_Contained::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -4257,7 +4205,7 @@ CORBA_Contained::_duplicate (CORBA_Contained_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
@@ -4265,7 +4213,7 @@ CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_Contained::_tao_QueryInterface (ptr_arith_t type)
@@ -4290,7 +4238,7 @@ void *CORBA_Contained::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -4302,161 +4250,161 @@ const char* CORBA_Contained::_interface_repository_id (void) const
 }
 
 char * CORBA_Contained::id (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.id (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_Contained::id (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.id (
       this,
-      id,
-      ACE_TRY_ENV
+      id
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 char * CORBA_Contained::name (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.name (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_Contained::name (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.name (
       this,
-      name,
-      ACE_TRY_ENV
+      name
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 char * CORBA_Contained::version (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.version (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_Contained::version (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.version (
       this,
-      version,
-      ACE_TRY_ENV
+      version
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_Container_ptr CORBA_Contained::defined_in (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.defined_in (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 char * CORBA_Contained::absolute_name (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.absolute_name (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_Repository_ptr CORBA_Contained::containing_repository (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.containing_repository (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -4464,161 +4412,161 @@ static const CORBA::Long _oc_CORBA_Contained_Description[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65642f), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65642f),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained/Description:1.0
   12,
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = Description
   2, // member count
   5,
-  ACE_NTOHL (0x6b696e64), 
+  ACE_NTOHL (0x6b696e64),
   ACE_NTOHL (0x0),  // name = kind
   CORBA::tk_enum, // typecode kind
   524, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4465), 
-    ACE_NTOHL (0x66696e69), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x4b696e64), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4465),
+    ACE_NTOHL (0x66696e69),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x4b696e64),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
     15,
-    ACE_NTOHL (0x44656669), 
-    ACE_NTOHL (0x6e697469), 
-    ACE_NTOHL (0x6f6e4b69), 
+    ACE_NTOHL (0x44656669),
+    ACE_NTOHL (0x6e697469),
+    ACE_NTOHL (0x6f6e4b69),
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
     26, // member count
     8,
-    ACE_NTOHL (0x646b5f6e), 
+    ACE_NTOHL (0x646b5f6e),
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
     7,
-    ACE_NTOHL (0x646b5f61), 
+    ACE_NTOHL (0x646b5f61),
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
     13,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x74747269), 
-    ACE_NTOHL (0x62757465), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x74747269),
+    ACE_NTOHL (0x62757465),
     ACE_NTOHL (0x0),  // name = dk_Attribute
     12,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6e7374), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6e7374),
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
     13,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x78636570), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x78636570),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Exception
     13,
-    ACE_NTOHL (0x646b5f49), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f49),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_Interface
     10,
-    ACE_NTOHL (0x646b5f4d), 
-    ACE_NTOHL (0x6f64756c), 
+    ACE_NTOHL (0x646b5f4d),
+    ACE_NTOHL (0x6f64756c),
     ACE_NTOHL (0x65000000),  // name = dk_Module
     13,
-    ACE_NTOHL (0x646b5f4f), 
-    ACE_NTOHL (0x70657261), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f4f),
+    ACE_NTOHL (0x70657261),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Operation
     11,
-    ACE_NTOHL (0x646b5f54), 
-    ACE_NTOHL (0x79706564), 
+    ACE_NTOHL (0x646b5f54),
+    ACE_NTOHL (0x79706564),
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x6c696173), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x6c696173),
     ACE_NTOHL (0x0),  // name = dk_Alias
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x74727563), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x74727563),
     ACE_NTOHL (0x74000000),  // name = dk_Struct
     9,
-    ACE_NTOHL (0x646b5f55), 
-    ACE_NTOHL (0x6e696f6e), 
+    ACE_NTOHL (0x646b5f55),
+    ACE_NTOHL (0x6e696f6e),
     ACE_NTOHL (0x0),  // name = dk_Union
     8,
-    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x646b5f45),
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
     13,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x72696d69), 
-    ACE_NTOHL (0x74697665), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x72696d69),
+    ACE_NTOHL (0x74697665),
     ACE_NTOHL (0x0),  // name = dk_Primitive
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x7472696e), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x7472696e),
     ACE_NTOHL (0x67000000),  // name = dk_String
     12,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x65717565), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x65717565),
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x72726179), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x72726179),
     ACE_NTOHL (0x0),  // name = dk_Array
     14,
-    ACE_NTOHL (0x646b5f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
+    ACE_NTOHL (0x646b5f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
     ACE_NTOHL (0x79000000),  // name = dk_Repository
     11,
-    ACE_NTOHL (0x646b5f57), 
-    ACE_NTOHL (0x73747269), 
+    ACE_NTOHL (0x646b5f57),
+    ACE_NTOHL (0x73747269),
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
     9,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x69786564), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x69786564),
     ACE_NTOHL (0x0),  // name = dk_Fixed
     9,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x0),  // name = dk_Value
     12,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
     15,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
-    ACE_NTOHL (0x4d656d62), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x4d656d62),
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
     10,
-    ACE_NTOHL (0x646b5f4e), 
-    ACE_NTOHL (0x61746976), 
+    ACE_NTOHL (0x646b5f4e),
+    ACE_NTOHL (0x61746976),
     ACE_NTOHL (0x65000000),  // name = dk_Native
     21,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x62737472), 
-    ACE_NTOHL (0x61637449), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x62737472),
+    ACE_NTOHL (0x61637449),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
     18,
-    ACE_NTOHL (0x646b5f4c), 
-    ACE_NTOHL (0x6f63616c), 
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
+    ACE_NTOHL (0x646b5f4c),
+    ACE_NTOHL (0x6f63616c),
+    ACE_NTOHL (0x496e7465),
+    ACE_NTOHL (0x72666163),
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
 
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
   CORBA::tk_any,
 
@@ -4642,42 +4590,42 @@ void CORBA_Contained::Description::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_Contained::Description * CORBA_Contained::describe (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_Contained::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_CORBA_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.move (
       this,
       new_container,
       new_name,
-      new_version,
-      ACE_TRY_ENV
+      new_version
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -4692,7 +4640,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULon
 {
   CORBA_Contained **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_Contained **old = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
@@ -4707,7 +4655,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_allocate_buffer (CORBA::ULon
             tmp[i] = old[i];
           }
       }
-    
+
     if (this->release_)
       {
         delete[] old;
@@ -4722,13 +4670,13 @@ _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_deallocate_buffer (void)
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
   CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
-  
+
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = CORBA_Contained::_nil ();
     }
-  
+
   _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -4742,7 +4690,7 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
-  
+
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       CORBA::release (tmp[i]);
@@ -4750,15 +4698,15 @@ _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_shrink_buffer (CORBA::ULong
     }
 }
 
-void 
+void
 _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, target);
-  *tmp = CORBA_Contained::_narrow (src, ACE_TRY_ENV);
+  *tmp = CORBA_Contained::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -4772,7 +4720,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_CONTAINEDSEQ_CS_)
 #define _CORBA_CONTAINEDSEQ_CS_
@@ -4784,30 +4732,30 @@ _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_upcast (void *src) const
 CORBA_ContainedSeq::CORBA_ContainedSeq (void)
 {}
 CORBA_ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Contained_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_ContainedSeq::CORBA_ContainedSeq (const CORBA_ContainedSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_ContainedSeq::~CORBA_ContainedSeq (void) // dtor
@@ -4832,7 +4780,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::U
 {
   CORBA_InterfaceDef **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_InterfaceDef **old = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
@@ -4847,7 +4795,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::U
             tmp[i] = old[i];
           }
       }
-    
+
     if (this->release_)
       {
         delete[] old;
@@ -4862,13 +4810,13 @@ _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (void)
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
   CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tao_CORBA_InterfaceDef_release (tmp[i]);
       tmp[i] = tao_CORBA_InterfaceDef_nil ();
     }
-  
+
   _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -4882,7 +4830,7 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       tao_CORBA_InterfaceDef_release (tmp[i]);
@@ -4890,15 +4838,15 @@ _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULo
     }
 }
 
-void 
+void
 _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA_InterfaceDef **tmp = ACE_static_cast (CORBA_InterfaceDef**, target);
-  *tmp = tao_CORBA_InterfaceDef_narrow (src, ACE_TRY_ENV);
+  *tmp = tao_CORBA_InterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -4911,7 +4859,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CS_)
 #define _CORBA_INTERFACEDEFSEQ_CS_
@@ -4923,30 +4871,30 @@ _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
 CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (void)
 {}
 CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_InterfaceDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_InterfaceDefSeq::~CORBA_InterfaceDefSeq (void) // dtor
@@ -4971,7 +4919,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong
 {
   CORBA_ValueDef **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_ValueDef **old = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
@@ -4986,7 +4934,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong
             tmp[i] = old[i];
           }
       }
-    
+
     if (this->release_)
       {
         delete[] old;
@@ -5001,13 +4949,13 @@ _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (void)
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
   CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tao_CORBA_ValueDef_release (tmp[i]);
       tmp[i] = tao_CORBA_ValueDef_nil ();
     }
-  
+
   _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -5021,7 +4969,7 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       tao_CORBA_ValueDef_release (tmp[i]);
@@ -5029,15 +4977,15 @@ _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong n
     }
 }
 
-void 
+void
 _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA_ValueDef **tmp = ACE_static_cast (CORBA_ValueDef**, target);
-  *tmp = tao_CORBA_ValueDef_narrow (src, ACE_TRY_ENV);
+  *tmp = tao_CORBA_ValueDef_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -5050,7 +4998,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_VALUEDEFSEQ_CS_)
 #define _CORBA_VALUEDEFSEQ_CS_
@@ -5062,30 +5010,30 @@ _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
 CORBA_ValueDefSeq::CORBA_ValueDefSeq (void)
 {}
 CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ValueDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_ValueDefSeq::CORBA_ValueDefSeq (const CORBA_ValueDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_ValueDefSeq::~CORBA_ValueDefSeq (void) // dtor
@@ -5110,7 +5058,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (
 {
   CORBA_AbstractInterfaceDef **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_AbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
@@ -5125,7 +5073,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (
             tmp[i] = old[i];
           }
       }
-    
+
     if (this->release_)
       {
         delete[] old;
@@ -5140,13 +5088,13 @@ _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_deallocate_buffer
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
   CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
       tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
     }
-  
+
   _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -5160,7 +5108,7 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
@@ -5168,15 +5116,15 @@ _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CO
     }
 }
 
-void 
+void
 _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA_AbstractInterfaceDef **tmp = ACE_static_cast (CORBA_AbstractInterfaceDef**, target);
-  *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src, ACE_TRY_ENV);
+  *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -5189,7 +5137,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
@@ -5201,30 +5149,30 @@ _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src
 CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (void)
 {}
 CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AbstractInterfaceDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_AbstractInterfaceDefSeq::~CORBA_AbstractInterfaceDefSeq (void) // dtor
@@ -5249,7 +5197,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (COR
 {
   CORBA_LocalInterfaceDef **tmp = 0;
   tmp = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_LocalInterfaceDef **old = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
@@ -5264,7 +5212,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (COR
             tmp[i] = old[i];
           }
       }
-    
+
     if (this->release_)
       {
         delete[] old;
@@ -5279,13 +5227,13 @@ _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_deallocate_buffer (v
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
   CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       tao_CORBA_LocalInterfaceDef_release (tmp[i]);
       tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
     }
-  
+
   _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
   this->buffer_ = 0;
 }
@@ -5299,7 +5247,7 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
 {
   CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
-  
+
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
       tao_CORBA_LocalInterfaceDef_release (tmp[i]);
@@ -5307,15 +5255,15 @@ _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA
     }
 }
 
-void 
+void
 _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA_LocalInterfaceDef **tmp = ACE_static_cast (CORBA_LocalInterfaceDef**, target);
-  *tmp = tao_CORBA_LocalInterfaceDef_narrow (src, ACE_TRY_ENV);
+  *tmp = tao_CORBA_LocalInterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -5328,7 +5276,7 @@ _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) c
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CS_)
 #define _CORBA_LOCALINTERFACEDEFSEQ_CS_
@@ -5340,30 +5288,30 @@ _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) c
 CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (void)
 {}
 CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_LocalInterfaceDef_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_LocalInterfaceDefSeq::~CORBA_LocalInterfaceDefSeq (void) // dtor
@@ -5394,17 +5342,17 @@ _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_allocate_buffer (CORBA::ULong le
 {
   CORBA_StructMember* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_StructMember *old = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp[i] = old[i];
-    
+
     if (this->release_)
       _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (old);
-    
+
   }
   this->buffer_ = tmp;
 }
@@ -5414,12 +5362,12 @@ _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
-  
+
   CORBA_StructMember *tmp = ACE_reinterpret_cast (CORBA_StructMember *,this->buffer_);
-  
+
   _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::freebuf (tmp);
   this->buffer_ = 0;
-} 
+}
 
 _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_StructMemberSeq (void) // Dtor.
 {
@@ -5430,7 +5378,7 @@ _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_St
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CS_)
 #define _CORBA_STRUCTMEMBERSEQ_CS_
@@ -5442,30 +5390,30 @@ _TAO_Unbounded_Sequence_CORBA_StructMemberSeq::~_TAO_Unbounded_Sequence_CORBA_St
 CORBA_StructMemberSeq::CORBA_StructMemberSeq (void)
 {}
 CORBA_StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_StructMember *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_StructMemberSeq::CORBA_StructMemberSeq (const CORBA_StructMemberSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
@@ -5496,17 +5444,17 @@ _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_allocate_buffer (CORBA::ULong len
 {
   CORBA_Initializer* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_CORBA_InitializerSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_Initializer *old = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp[i] = old[i];
-    
+
     if (this->release_)
       _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (old);
-    
+
   }
   this->buffer_ = tmp;
 }
@@ -5516,12 +5464,12 @@ _TAO_Unbounded_Sequence_CORBA_InitializerSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
-  
+
   CORBA_Initializer *tmp = ACE_reinterpret_cast (CORBA_Initializer *,this->buffer_);
-  
+
   _TAO_Unbounded_Sequence_CORBA_InitializerSeq::freebuf (tmp);
   this->buffer_ = 0;
-} 
+}
 
 _TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_InitializerSeq (void) // Dtor.
 {
@@ -5532,7 +5480,7 @@ _TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_Ini
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_INITIALIZERSEQ_CS_)
 #define _CORBA_INITIALIZERSEQ_CS_
@@ -5544,30 +5492,30 @@ _TAO_Unbounded_Sequence_CORBA_InitializerSeq::~_TAO_Unbounded_Sequence_CORBA_Ini
 CORBA_InitializerSeq::CORBA_InitializerSeq (void)
 {}
 CORBA_InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Initializer *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_InitializerSeq::CORBA_InitializerSeq (const CORBA_InitializerSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_InitializerSeq::~CORBA_InitializerSeq (void) // dtor
@@ -5599,17 +5547,17 @@ _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_allocate_buffer (CORBA::ULong len
 {
   CORBA_UnionMember* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_UnionMember *old = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp[i] = old[i];
-    
+
     if (this->release_)
       _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (old);
-    
+
   }
   this->buffer_ = tmp;
 }
@@ -5619,12 +5567,12 @@ _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
-  
+
   CORBA_UnionMember *tmp = ACE_reinterpret_cast (CORBA_UnionMember *,this->buffer_);
-  
+
   _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::freebuf (tmp);
   this->buffer_ = 0;
-} 
+}
 
 _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_UnionMemberSeq (void) // Dtor.
 {
@@ -5635,7 +5583,7 @@ _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_Uni
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CS_)
 #define _CORBA_UNIONMEMBERSEQ_CS_
@@ -5647,30 +5595,30 @@ _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq::~_TAO_Unbounded_Sequence_CORBA_Uni
 CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (void)
 {}
 CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_UnionMember *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_UnionMemberSeq::~CORBA_UnionMemberSeq (void) // dtor
@@ -5694,30 +5642,30 @@ void CORBA_UnionMemberSeq::_tao_any_destructor (void *_tao_void_pointer)
 CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (void)
 {}
 CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_EnumMemberSeq::CORBA_EnumMemberSeq (const CORBA_EnumMemberSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_EnumMemberSeq::~CORBA_EnumMemberSeq (void) // dtor
@@ -5757,11 +5705,11 @@ tao_CORBA_Container_nil (
 
 CORBA_Container_ptr
 tao_CORBA_Container_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_Container::_narrow (p, ACE_TRY_ENV);
+  return CORBA_Container::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5824,7 +5772,7 @@ CORBA_Container_var::operator const ::CORBA_Container_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_Container_var::operator ::CORBA_Container_ptr &() // cast 
+CORBA_Container_var::operator ::CORBA_Container_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -5884,11 +5832,11 @@ CORBA_Container_var::tao_nil (void)
 
 ::CORBA_Container_ptr
 CORBA_Container_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Container::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_Container::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5966,27 +5914,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Container_lookup (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA_Contained_ptr result);
@@ -6002,67 +5946,67 @@ private:
 TAO_ClientRequestInfo_CORBA_Container_lookup::TAO_ClientRequestInfo_CORBA_Container_lookup (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * search_name,
-    CORBA::Environment &    
+    const char * search_name
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     search_name_ (search_name)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= search_name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_lookup::result (CORBA_Contained_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6073,27 +6017,23 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       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));
 
   void result (CORBA_ContainedSeq * result);
@@ -6111,8 +6051,8 @@ TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Cont
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &    
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     limit_type_ (limit_type),
@@ -6120,62 +6060,62 @@ TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<=  this->limit_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
     (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_contents::result (CORBA_ContainedSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6188,27 +6128,23 @@ 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));
 
   void result (CORBA_ContainedSeq * result);
@@ -6230,8 +6166,8 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     search_name_ (search_name),
@@ -6241,19 +6177,19 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= search_name_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -6266,43 +6202,43 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment
     (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (CORBA_ContainedSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6314,27 +6250,23 @@ public:
       CORBA::Object_ptr _tao_target,
       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));
 
   void result (CORBA_Container::DescriptionSeq * result);
@@ -6354,8 +6286,8 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_C
     CORBA::Object_ptr _tao_target,
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     limit_type_ (limit_type),
@@ -6364,19 +6296,19 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<=  this->limit_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -6386,43 +6318,43 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Envir
     (*parameter_list)[len].argument <<= max_returned_objs_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (CORBA_Container::DescriptionSeq * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6434,27 +6366,23 @@ public:
       CORBA::Object_ptr _tao_target,
       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));
 
   void result (CORBA_ModuleDef_ptr result);
@@ -6474,8 +6402,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA
     CORBA::Object_ptr _tao_target,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &    
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -6484,19 +6412,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -6506,43 +6434,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environme
     (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_module::result (CORBA_ModuleDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6556,27 +6484,23 @@ 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));
 
   void result (CORBA_ConstantDef_ptr result);
@@ -6600,8 +6524,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -6612,19 +6536,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -6640,43 +6564,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environ
     (*parameter_list)[len].argument <<= value_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_constant::result (CORBA_ConstantDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6689,27 +6613,23 @@ 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));
 
   void result (CORBA_StructDef_ptr result);
@@ -6731,8 +6651,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -6742,19 +6662,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -6767,43 +6687,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environme
     (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_struct::result (CORBA_StructDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6817,27 +6737,23 @@ 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));
 
   void result (CORBA_UnionDef_ptr result);
@@ -6861,8 +6777,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -6873,19 +6789,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (5);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -6901,43 +6817,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environmen
     (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_union::result (CORBA_UnionDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -6950,27 +6866,23 @@ 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));
 
   void result (CORBA_EnumDef_ptr result);
@@ -6992,8 +6904,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7003,19 +6915,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7028,43 +6940,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment
     (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_enum::result (CORBA_EnumDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -7077,27 +6989,23 @@ 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));
 
   void result (CORBA_AliasDef_ptr result);
@@ -7119,8 +7027,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7130,19 +7038,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7155,43 +7063,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environmen
     (*parameter_list)[len].argument <<=  this->original_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_alias::result (CORBA_AliasDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -7204,27 +7112,23 @@ 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));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -7246,8 +7150,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7257,19 +7161,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7282,43 +7186,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Enviro
     (*parameter_list)[len].argument <<=  this->base_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_interface::result (CORBA_InterfaceDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -7337,27 +7241,23 @@ 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));
 
   void result (CORBA_ValueDef_ptr result);
@@ -7391,8 +7291,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7408,19 +7308,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (10);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7451,43 +7351,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environmen
     (*parameter_list)[len].argument <<=  this->initializers_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_value::result (CORBA_ValueDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -7500,27 +7400,23 @@ 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));
 
   void result (CORBA_ValueBoxDef_ptr result);
@@ -7542,8 +7438,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7553,19 +7449,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7578,43 +7474,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Enviro
     (*parameter_list)[len].argument <<=  this->original_type_def_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (CORBA_ValueBoxDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -7627,27 +7523,23 @@ 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));
 
   void result (CORBA_ExceptionDef_ptr result);
@@ -7669,8 +7561,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7680,19 +7572,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7705,43 +7597,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Enviro
     (*parameter_list)[len].argument <<=  this->members_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_exception::result (CORBA_ExceptionDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -7753,27 +7645,23 @@ public:
       CORBA::Object_ptr _tao_target,
       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));
 
   void result (CORBA_NativeDef_ptr result);
@@ -7793,8 +7681,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA
     CORBA::Object_ptr _tao_target,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &    
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7803,19 +7691,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7825,43 +7713,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environme
     (*parameter_list)[len].argument <<= version_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_native::result (CORBA_NativeDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -7874,27 +7762,23 @@ 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));
 
   void result (CORBA_AbstractInterfaceDef_ptr result);
@@ -7916,8 +7800,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -7927,19 +7811,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -7952,43 +7836,43 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORB
     (*parameter_list)[len].argument <<=  this->base_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA_AbstractInterfaceDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -8001,27 +7885,23 @@ 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));
 
   void result (CORBA_LocalInterfaceDef_ptr result);
@@ -8043,8 +7923,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -8054,19 +7934,19 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
-  
+
   parameter_list->length (4);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= id_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -8079,50 +7959,50 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::
     (*parameter_list)[len].argument <<=  this->base_interfaces_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (CORBA_LocalInterfaceDef_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_Container_Proxy_Impl::_TAO_CORBA_Container_Proxy_Impl (void)
@@ -8135,23 +8015,23 @@ _TAO_CORBA_Container_Remote_Proxy_Impl::_TAO_CORBA_Container_Remote_Proxy_Impl (
 
 CORBA_Contained_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_Contained_ptr _tao_retval = CORBA_Contained::_nil ();
   CORBA_Contained_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "lookup",
@@ -8159,64 +8039,64 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_lookup ri (
         &_tao_call,
         _collocated_tao_target_,
-        search_name,
-        ACE_TRY_ENV
+        search_name
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << search_name)
@@ -8225,33 +8105,33 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8261,52 +8141,52 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -8315,22 +8195,22 @@ return _tao_safe_retval._retn ();
 CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_ContainedSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_ContainedSeq, _tao_retval);
   CORBA_ContainedSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -8340,65 +8220,65 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_contents ri (
         &_tao_call,
         _collocated_tao_target_,
         limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
+        exclude_inherited
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << limit_type) &&
@@ -8408,33 +8288,33 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8444,52 +8324,52 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -8500,22 +8380,22 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_ContainedSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_ContainedSeq, _tao_retval);
   CORBA_ContainedSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -8525,22 +8405,22 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_lookup_name ri (
         &_tao_call,
@@ -8548,44 +8428,44 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
         search_name,
         levels_to_search,
         limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
+        exclude_inherited
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << search_name) &&
@@ -8597,33 +8477,33 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8633,52 +8513,52 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -8688,22 +8568,22 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
     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
   ))
 {
-  
+
   CORBA_Container::DescriptionSeq *_tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   ACE_NEW_RETURN (_tao_retval, CORBA_Container::DescriptionSeq, _tao_retval);
   CORBA_Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
@@ -8713,66 +8593,66 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_describe_contents ri (
         &_tao_call,
         _collocated_tao_target_,
         limit_type,
         exclude_inherited,
-        max_returned_objs,
-        ACE_TRY_ENV
+        max_returned_objs
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << limit_type) &&
@@ -8783,33 +8663,33 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -8819,52 +8699,52 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -8874,23 +8754,23 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_ModuleDef_ptr _tao_retval = tao_CORBA_ModuleDef_nil ();
   CORBA_ModuleDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_module",
@@ -8898,66 +8778,66 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_module ri (
         &_tao_call,
         _collocated_tao_target_,
         id,
         name,
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -8968,33 +8848,33 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -9004,52 +8884,52 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -9061,23 +8941,23 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_ConstantDef_ptr _tao_retval = tao_CORBA_ConstantDef_nil ();
   CORBA_ConstantDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_constant",
@@ -9085,22 +8965,22 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_constant ri (
         &_tao_call,
@@ -9109,44 +8989,44 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
         name,
         version,
         type,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -9159,33 +9039,33 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -9195,52 +9075,52 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -9251,23 +9131,23 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_StructDef_ptr _tao_retval = tao_CORBA_StructDef_nil ();
   CORBA_StructDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_struct",
@@ -9275,22 +9155,22 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_struct ri (
         &_tao_call,
@@ -9298,44 +9178,44 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -9347,33 +9227,33 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -9383,52 +9263,52 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -9440,23 +9320,23 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_UnionDef_ptr _tao_retval = tao_CORBA_UnionDef_nil ();
   CORBA_UnionDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_union",
@@ -9464,22 +9344,22 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_union ri (
         &_tao_call,
@@ -9488,44 +9368,44 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
         name,
         version,
         discriminator_type,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -9538,33 +9418,33 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -9574,52 +9454,52 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -9630,23 +9510,23 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_EnumDef_ptr _tao_retval = tao_CORBA_EnumDef_nil ();
   CORBA_EnumDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_enum",
@@ -9654,22 +9534,22 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_enum ri (
         &_tao_call,
@@ -9677,44 +9557,44 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -9726,33 +9606,33 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -9762,52 +9642,52 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -9818,23 +9698,23 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_AliasDef_ptr _tao_retval = tao_CORBA_AliasDef_nil ();
   CORBA_AliasDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_alias",
@@ -9842,22 +9722,22 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_alias ri (
         &_tao_call,
@@ -9865,44 +9745,44 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
         id,
         name,
         version,
-        original_type,
-        ACE_TRY_ENV
+        original_type
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -9914,33 +9794,33 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -9950,52 +9830,52 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -10006,23 +9886,23 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_InterfaceDef_ptr _tao_retval = tao_CORBA_InterfaceDef_nil ();
   CORBA_InterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_interface",
@@ -10030,22 +9910,22 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_interface ri (
         &_tao_call,
@@ -10053,44 +9933,44 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -10102,33 +9982,33 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10138,52 +10018,52 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -10200,23 +10080,23 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_ValueDef_ptr _tao_retval = tao_CORBA_ValueDef_nil ();
   CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_value",
@@ -10224,22 +10104,22 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_value ri (
         &_tao_call,
@@ -10253,44 +10133,44 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
         is_truncatable,
         abstract_base_values,
         supported_interfaces,
-        initializers,
-        ACE_TRY_ENV
+        initializers
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -10308,33 +10188,33 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10344,52 +10224,52 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -10400,23 +10280,23 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_ValueBoxDef_ptr _tao_retval = tao_CORBA_ValueBoxDef_nil ();
   CORBA_ValueBoxDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_value_box",
@@ -10424,22 +10304,22 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_value_box ri (
         &_tao_call,
@@ -10447,44 +10327,44 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
         id,
         name,
         version,
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -10496,33 +10376,33 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10532,52 +10412,52 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -10588,23 +10468,23 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_ExceptionDef_ptr _tao_retval = tao_CORBA_ExceptionDef_nil ();
   CORBA_ExceptionDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_exception",
@@ -10612,22 +10492,22 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_exception ri (
         &_tao_call,
@@ -10635,44 +10515,44 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -10684,33 +10564,33 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10720,52 +10600,52 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -10775,23 +10655,23 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_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
   ))
 {
-  
+
   CORBA_NativeDef_ptr _tao_retval = tao_CORBA_NativeDef_nil ();
   CORBA_NativeDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_native",
@@ -10799,66 +10679,66 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_native ri (
         &_tao_call,
         _collocated_tao_target_,
         id,
         name,
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -10869,33 +10749,33 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -10905,52 +10785,52 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -10961,23 +10841,23 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
     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_AbstractInterfaceDef_ptr _tao_retval = tao_CORBA_AbstractInterfaceDef_nil ();
   CORBA_AbstractInterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_abstract_interface",
@@ -10985,22 +10865,22 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface ri (
         &_tao_call,
@@ -11008,44 +10888,44 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -11057,33 +10937,33 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11093,52 +10973,52 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_AbstractInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -11149,23 +11029,23 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::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
   ))
 {
-  
+
   CORBA_LocalInterfaceDef_ptr _tao_retval = tao_CORBA_LocalInterfaceDef_nil ();
   CORBA_LocalInterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "create_local_interface",
@@ -11173,22 +11053,22 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Container_create_local_interface ri (
         &_tao_call,
@@ -11196,44 +11076,44 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << id) &&
@@ -11245,33 +11125,33 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -11281,52 +11161,52 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA_LocalInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -11334,7 +11214,7 @@ return _tao_safe_retval._retn ();
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -11372,8 +11252,8 @@ _TAO_CORBA_Container_Remote_Proxy_Broker::~_TAO_CORBA_Container_Remote_Proxy_Bro
 
 _TAO_CORBA_Container_Proxy_Impl&
 _TAO_CORBA_Container_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_Container *,
-  CORBA::Environment &
+  ::CORBA_Container *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -11404,7 +11284,7 @@ CORBA_Container::CORBA_Container_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_Container_Proxy_Broker_ =
       ::_TAO_CORBA_Container_Remote_Proxy_Broker::the_TAO_CORBA_Container_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
@@ -11415,25 +11295,25 @@ void CORBA_Container::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_Container_ptr CORBA_Container::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Container::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Container::_nil ());
       if (is_a == 0)
         return CORBA_Container::_nil ();
     }
-  return CORBA_Container::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Container::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Container_ptr CORBA_Container::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -11457,14 +11337,14 @@ CORBA_Container_ptr CORBA_Container::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_Container::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_Container (stub, 0, obj->_servant ()), CORBA_Container::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -11488,7 +11368,7 @@ CORBA_Container::_duplicate (CORBA_Container_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
@@ -11496,7 +11376,7 @@ CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_Container::_tao_QueryInterface (ptr_arith_t type)
@@ -11521,7 +11401,7 @@ void *CORBA_Container::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -11533,42 +11413,42 @@ const char* CORBA_Container::_interface_repository_id (void) const
 }
 
 CORBA_Contained_ptr CORBA_Container::lookup (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.lookup (
       this,
-      search_name,
-      ACE_TRY_ENV
+      search_name
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ContainedSeq * CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.contents (
       this,
       limit_type,
-      exclude_inherited,
-      ACE_TRY_ENV
+      exclude_inherited
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -11576,24 +11456,24 @@ CORBA_ContainedSeq * CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.lookup_name (
       this,
       search_name,
       levels_to_search,
       limit_type,
-      exclude_inherited,
-      ACE_TRY_ENV
+      exclude_inherited
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -11601,184 +11481,184 @@ static const CORBA::Long _oc_CORBA_Container_Description[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65722f), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65722f),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
   12,
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
   ACE_NTOHL (0x696f6e00),  // name = Description
   3, // member count
   17,
-  ACE_NTOHL (0x636f6e74), 
-  ACE_NTOHL (0x61696e65), 
-  ACE_NTOHL (0x645f6f62), 
-  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x636f6e74),
+  ACE_NTOHL (0x61696e65),
+  ACE_NTOHL (0x645f6f62),
+  ACE_NTOHL (0x6a656374),
   ACE_NTOHL (0x0),  // name = contained_object
   CORBA::tk_objref, // typecode kind
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f436f), 
-    ACE_NTOHL (0x6e746169), 
-    ACE_NTOHL (0x6e65643a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f436f),
+    ACE_NTOHL (0x6e746169),
+    ACE_NTOHL (0x6e65643a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
     10,
-    ACE_NTOHL (0x436f6e74), 
-    ACE_NTOHL (0x61696e65), 
+    ACE_NTOHL (0x436f6e74),
+    ACE_NTOHL (0x61696e65),
     ACE_NTOHL (0x64000000),  // name = Contained
 
   5,
-  ACE_NTOHL (0x6b696e64), 
+  ACE_NTOHL (0x6b696e64),
   ACE_NTOHL (0x0),  // name = kind
   CORBA::tk_enum, // typecode kind
   524, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4465), 
-    ACE_NTOHL (0x66696e69), 
-    ACE_NTOHL (0x74696f6e), 
-    ACE_NTOHL (0x4b696e64), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4465),
+    ACE_NTOHL (0x66696e69),
+    ACE_NTOHL (0x74696f6e),
+    ACE_NTOHL (0x4b696e64),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
     15,
-    ACE_NTOHL (0x44656669), 
-    ACE_NTOHL (0x6e697469), 
-    ACE_NTOHL (0x6f6e4b69), 
+    ACE_NTOHL (0x44656669),
+    ACE_NTOHL (0x6e697469),
+    ACE_NTOHL (0x6f6e4b69),
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
     26, // member count
     8,
-    ACE_NTOHL (0x646b5f6e), 
+    ACE_NTOHL (0x646b5f6e),
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
     7,
-    ACE_NTOHL (0x646b5f61), 
+    ACE_NTOHL (0x646b5f61),
     ACE_NTOHL (0x6c6c0000),  // name = dk_all
     13,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x74747269), 
-    ACE_NTOHL (0x62757465), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x74747269),
+    ACE_NTOHL (0x62757465),
     ACE_NTOHL (0x0),  // name = dk_Attribute
     12,
-    ACE_NTOHL (0x646b5f43), 
-    ACE_NTOHL (0x6f6e7374), 
+    ACE_NTOHL (0x646b5f43),
+    ACE_NTOHL (0x6f6e7374),
     ACE_NTOHL (0x616e7400),  // name = dk_Constant
     13,
-    ACE_NTOHL (0x646b5f45), 
-    ACE_NTOHL (0x78636570), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f45),
+    ACE_NTOHL (0x78636570),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Exception
     13,
-    ACE_NTOHL (0x646b5f49), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f49),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_Interface
     10,
-    ACE_NTOHL (0x646b5f4d), 
-    ACE_NTOHL (0x6f64756c), 
+    ACE_NTOHL (0x646b5f4d),
+    ACE_NTOHL (0x6f64756c),
     ACE_NTOHL (0x65000000),  // name = dk_Module
     13,
-    ACE_NTOHL (0x646b5f4f), 
-    ACE_NTOHL (0x70657261), 
-    ACE_NTOHL (0x74696f6e), 
+    ACE_NTOHL (0x646b5f4f),
+    ACE_NTOHL (0x70657261),
+    ACE_NTOHL (0x74696f6e),
     ACE_NTOHL (0x0),  // name = dk_Operation
     11,
-    ACE_NTOHL (0x646b5f54), 
-    ACE_NTOHL (0x79706564), 
+    ACE_NTOHL (0x646b5f54),
+    ACE_NTOHL (0x79706564),
     ACE_NTOHL (0x65660000),  // name = dk_Typedef
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x6c696173), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x6c696173),
     ACE_NTOHL (0x0),  // name = dk_Alias
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x74727563), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x74727563),
     ACE_NTOHL (0x74000000),  // name = dk_Struct
     9,
-    ACE_NTOHL (0x646b5f55), 
-    ACE_NTOHL (0x6e696f6e), 
+    ACE_NTOHL (0x646b5f55),
+    ACE_NTOHL (0x6e696f6e),
     ACE_NTOHL (0x0),  // name = dk_Union
     8,
-    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x646b5f45),
     ACE_NTOHL (0x6e756d00),  // name = dk_Enum
     13,
-    ACE_NTOHL (0x646b5f50), 
-    ACE_NTOHL (0x72696d69), 
-    ACE_NTOHL (0x74697665), 
+    ACE_NTOHL (0x646b5f50),
+    ACE_NTOHL (0x72696d69),
+    ACE_NTOHL (0x74697665),
     ACE_NTOHL (0x0),  // name = dk_Primitive
     10,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x7472696e), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x7472696e),
     ACE_NTOHL (0x67000000),  // name = dk_String
     12,
-    ACE_NTOHL (0x646b5f53), 
-    ACE_NTOHL (0x65717565), 
+    ACE_NTOHL (0x646b5f53),
+    ACE_NTOHL (0x65717565),
     ACE_NTOHL (0x6e636500),  // name = dk_Sequence
     9,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x72726179), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x72726179),
     ACE_NTOHL (0x0),  // name = dk_Array
     14,
-    ACE_NTOHL (0x646b5f52), 
-    ACE_NTOHL (0x65706f73), 
-    ACE_NTOHL (0x69746f72), 
+    ACE_NTOHL (0x646b5f52),
+    ACE_NTOHL (0x65706f73),
+    ACE_NTOHL (0x69746f72),
     ACE_NTOHL (0x79000000),  // name = dk_Repository
     11,
-    ACE_NTOHL (0x646b5f57), 
-    ACE_NTOHL (0x73747269), 
+    ACE_NTOHL (0x646b5f57),
+    ACE_NTOHL (0x73747269),
     ACE_NTOHL (0x6e670000),  // name = dk_Wstring
     9,
-    ACE_NTOHL (0x646b5f46), 
-    ACE_NTOHL (0x69786564), 
+    ACE_NTOHL (0x646b5f46),
+    ACE_NTOHL (0x69786564),
     ACE_NTOHL (0x0),  // name = dk_Fixed
     9,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x0),  // name = dk_Value
     12,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
     ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
     15,
-    ACE_NTOHL (0x646b5f56), 
-    ACE_NTOHL (0x616c7565), 
-    ACE_NTOHL (0x4d656d62), 
+    ACE_NTOHL (0x646b5f56),
+    ACE_NTOHL (0x616c7565),
+    ACE_NTOHL (0x4d656d62),
     ACE_NTOHL (0x65720000),  // name = dk_ValueMember
     10,
-    ACE_NTOHL (0x646b5f4e), 
-    ACE_NTOHL (0x61746976), 
+    ACE_NTOHL (0x646b5f4e),
+    ACE_NTOHL (0x61746976),
     ACE_NTOHL (0x65000000),  // name = dk_Native
     21,
-    ACE_NTOHL (0x646b5f41), 
-    ACE_NTOHL (0x62737472), 
-    ACE_NTOHL (0x61637449), 
-    ACE_NTOHL (0x6e746572), 
-    ACE_NTOHL (0x66616365), 
+    ACE_NTOHL (0x646b5f41),
+    ACE_NTOHL (0x62737472),
+    ACE_NTOHL (0x61637449),
+    ACE_NTOHL (0x6e746572),
+    ACE_NTOHL (0x66616365),
     ACE_NTOHL (0x0),  // name = dk_AbstractInterface
     18,
-    ACE_NTOHL (0x646b5f4c), 
-    ACE_NTOHL (0x6f63616c), 
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
+    ACE_NTOHL (0x646b5f4c),
+    ACE_NTOHL (0x6f63616c),
+    ACE_NTOHL (0x496e7465),
+    ACE_NTOHL (0x72666163),
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
 
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
   CORBA::tk_any,
 
@@ -11812,17 +11692,17 @@ CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_alloca
 {
   CORBA_Container::Description* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     CORBA_Container::Description *old = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp[i] = old[i];
-    
+
     if (this->release_)
       _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (old);
-    
+
   }
   this->buffer_ = tmp;
 }
@@ -11832,12 +11712,12 @@ CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_deallo
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
-  
+
   CORBA_Container::Description *tmp = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
-  
+
   _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
   this->buffer_ = 0;
-} 
+}
 
 CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Dtor.
 {
@@ -11848,7 +11728,7 @@ CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_U
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
@@ -11860,30 +11740,30 @@ CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_U
 CORBA_Container::DescriptionSeq::DescriptionSeq (void)
 {}
 CORBA_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 CORBA_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Container::Description *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 CORBA_Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<CORBA_Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 CORBA_Container::DescriptionSeq::~DescriptionSeq (void) // dtor
@@ -11901,22 +11781,22 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x434f5242), 
-  ACE_NTOHL (0x412f436f), 
-  ACE_NTOHL (0x6e746169), 
-  ACE_NTOHL (0x6e65722f), 
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f436f),
+  ACE_NTOHL (0x6e746169),
+  ACE_NTOHL (0x6e65722f),
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/Container/DescriptionSeq:1.0
   15,
-  ACE_NTOHL (0x44657363), 
-  ACE_NTOHL (0x72697074), 
-  ACE_NTOHL (0x696f6e53), 
+  ACE_NTOHL (0x44657363),
+  ACE_NTOHL (0x72697074),
+  ACE_NTOHL (0x696f6e53),
   ACE_NTOHL (0x65710000),  // name = DescriptionSeq
   CORBA::tk_sequence, // typecode kind
   736, // encapsulation length
@@ -11925,184 +11805,184 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
     720, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       44,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x434f5242), 
-      ACE_NTOHL (0x412f436f), 
-      ACE_NTOHL (0x6e746169), 
-      ACE_NTOHL (0x6e65722f), 
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
-      ACE_NTOHL (0x696f6e3a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x434f5242),
+      ACE_NTOHL (0x412f436f),
+      ACE_NTOHL (0x6e746169),
+      ACE_NTOHL (0x6e65722f),
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
+      ACE_NTOHL (0x696f6e3a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
       12,
-      ACE_NTOHL (0x44657363), 
-      ACE_NTOHL (0x72697074), 
+      ACE_NTOHL (0x44657363),
+      ACE_NTOHL (0x72697074),
       ACE_NTOHL (0x696f6e00),  // name = Description
       3, // member count
       17,
-      ACE_NTOHL (0x636f6e74), 
-      ACE_NTOHL (0x61696e65), 
-      ACE_NTOHL (0x645f6f62), 
-      ACE_NTOHL (0x6a656374), 
+      ACE_NTOHL (0x636f6e74),
+      ACE_NTOHL (0x61696e65),
+      ACE_NTOHL (0x645f6f62),
+      ACE_NTOHL (0x6a656374),
       ACE_NTOHL (0x0),  // name = contained_object
       CORBA::tk_objref, // typecode kind
       56, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f436f), 
-        ACE_NTOHL (0x6e746169), 
-        ACE_NTOHL (0x6e65643a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f436f),
+        ACE_NTOHL (0x6e746169),
+        ACE_NTOHL (0x6e65643a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
         10,
-        ACE_NTOHL (0x436f6e74), 
-        ACE_NTOHL (0x61696e65), 
+        ACE_NTOHL (0x436f6e74),
+        ACE_NTOHL (0x61696e65),
         ACE_NTOHL (0x64000000),  // name = Contained
 
       5,
-      ACE_NTOHL (0x6b696e64), 
+      ACE_NTOHL (0x6b696e64),
       ACE_NTOHL (0x0),  // name = kind
       CORBA::tk_enum, // typecode kind
       524, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         37,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4465), 
-        ACE_NTOHL (0x66696e69), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x4b696e64), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x6f6d672e),
+        ACE_NTOHL (0x6f72672f),
+        ACE_NTOHL (0x434f5242),
+        ACE_NTOHL (0x412f4465),
+        ACE_NTOHL (0x66696e69),
+        ACE_NTOHL (0x74696f6e),
+        ACE_NTOHL (0x4b696e64),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
         15,
-        ACE_NTOHL (0x44656669), 
-        ACE_NTOHL (0x6e697469), 
-        ACE_NTOHL (0x6f6e4b69), 
+        ACE_NTOHL (0x44656669),
+        ACE_NTOHL (0x6e697469),
+        ACE_NTOHL (0x6f6e4b69),
         ACE_NTOHL (0x6e640000),  // name = DefinitionKind
         26, // member count
         8,
-        ACE_NTOHL (0x646b5f6e), 
+        ACE_NTOHL (0x646b5f6e),
         ACE_NTOHL (0x6f6e6500),  // name = dk_none
         7,
-        ACE_NTOHL (0x646b5f61), 
+        ACE_NTOHL (0x646b5f61),
         ACE_NTOHL (0x6c6c0000),  // name = dk_all
         13,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x74747269), 
-        ACE_NTOHL (0x62757465), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x74747269),
+        ACE_NTOHL (0x62757465),
         ACE_NTOHL (0x0),  // name = dk_Attribute
         12,
-        ACE_NTOHL (0x646b5f43), 
-        ACE_NTOHL (0x6f6e7374), 
+        ACE_NTOHL (0x646b5f43),
+        ACE_NTOHL (0x6f6e7374),
         ACE_NTOHL (0x616e7400),  // name = dk_Constant
         13,
-        ACE_NTOHL (0x646b5f45), 
-        ACE_NTOHL (0x78636570), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x646b5f45),
+        ACE_NTOHL (0x78636570),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = dk_Exception
         13,
-        ACE_NTOHL (0x646b5f49), 
-        ACE_NTOHL (0x6e746572), 
-        ACE_NTOHL (0x66616365), 
+        ACE_NTOHL (0x646b5f49),
+        ACE_NTOHL (0x6e746572),
+        ACE_NTOHL (0x66616365),
         ACE_NTOHL (0x0),  // name = dk_Interface
         10,
-        ACE_NTOHL (0x646b5f4d), 
-        ACE_NTOHL (0x6f64756c), 
+        ACE_NTOHL (0x646b5f4d),
+        ACE_NTOHL (0x6f64756c),
         ACE_NTOHL (0x65000000),  // name = dk_Module
         13,
-        ACE_NTOHL (0x646b5f4f), 
-        ACE_NTOHL (0x70657261), 
-        ACE_NTOHL (0x74696f6e), 
+        ACE_NTOHL (0x646b5f4f),
+        ACE_NTOHL (0x70657261),
+        ACE_NTOHL (0x74696f6e),
         ACE_NTOHL (0x0),  // name = dk_Operation
         11,
-        ACE_NTOHL (0x646b5f54), 
-        ACE_NTOHL (0x79706564), 
+        ACE_NTOHL (0x646b5f54),
+        ACE_NTOHL (0x79706564),
         ACE_NTOHL (0x65660000),  // name = dk_Typedef
         9,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x6c696173), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x6c696173),
         ACE_NTOHL (0x0),  // name = dk_Alias
         10,
-        ACE_NTOHL (0x646b5f53), 
-        ACE_NTOHL (0x74727563), 
+        ACE_NTOHL (0x646b5f53),
+        ACE_NTOHL (0x74727563),
         ACE_NTOHL (0x74000000),  // name = dk_Struct
         9,
-        ACE_NTOHL (0x646b5f55), 
-        ACE_NTOHL (0x6e696f6e), 
+        ACE_NTOHL (0x646b5f55),
+        ACE_NTOHL (0x6e696f6e),
         ACE_NTOHL (0x0),  // name = dk_Union
         8,
-        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x646b5f45),
         ACE_NTOHL (0x6e756d00),  // name = dk_Enum
         13,
-        ACE_NTOHL (0x646b5f50), 
-        ACE_NTOHL (0x72696d69), 
-        ACE_NTOHL (0x74697665), 
+        ACE_NTOHL (0x646b5f50),
+        ACE_NTOHL (0x72696d69),
+        ACE_NTOHL (0x74697665),
         ACE_NTOHL (0x0),  // name = dk_Primitive
         10,
-        ACE_NTOHL (0x646b5f53), 
-        ACE_NTOHL (0x7472696e), 
+        ACE_NTOHL (0x646b5f53),
+        ACE_NTOHL (0x7472696e),
         ACE_NTOHL (0x67000000),  // name = dk_String
         12,
-        ACE_NTOHL (0x646b5f53), 
-        ACE_NTOHL (0x65717565), 
+        ACE_NTOHL (0x646b5f53),
+        ACE_NTOHL (0x65717565),
         ACE_NTOHL (0x6e636500),  // name = dk_Sequence
         9,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x72726179), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x72726179),
         ACE_NTOHL (0x0),  // name = dk_Array
         14,
-        ACE_NTOHL (0x646b5f52), 
-        ACE_NTOHL (0x65706f73), 
-        ACE_NTOHL (0x69746f72), 
+        ACE_NTOHL (0x646b5f52),
+        ACE_NTOHL (0x65706f73),
+        ACE_NTOHL (0x69746f72),
         ACE_NTOHL (0x79000000),  // name = dk_Repository
         11,
-        ACE_NTOHL (0x646b5f57), 
-        ACE_NTOHL (0x73747269), 
+        ACE_NTOHL (0x646b5f57),
+        ACE_NTOHL (0x73747269),
         ACE_NTOHL (0x6e670000),  // name = dk_Wstring
         9,
-        ACE_NTOHL (0x646b5f46), 
-        ACE_NTOHL (0x69786564), 
+        ACE_NTOHL (0x646b5f46),
+        ACE_NTOHL (0x69786564),
         ACE_NTOHL (0x0),  // name = dk_Fixed
         9,
-        ACE_NTOHL (0x646b5f56), 
-        ACE_NTOHL (0x616c7565), 
+        ACE_NTOHL (0x646b5f56),
+        ACE_NTOHL (0x616c7565),
         ACE_NTOHL (0x0),  // name = dk_Value
         12,
-        ACE_NTOHL (0x646b5f56), 
-        ACE_NTOHL (0x616c7565), 
+        ACE_NTOHL (0x646b5f56),
+        ACE_NTOHL (0x616c7565),
         ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
         15,
-        ACE_NTOHL (0x646b5f56), 
-        ACE_NTOHL (0x616c7565), 
-        ACE_NTOHL (0x4d656d62), 
+        ACE_NTOHL (0x646b5f56),
+        ACE_NTOHL (0x616c7565),
+        ACE_NTOHL (0x4d656d62),
         ACE_NTOHL (0x65720000),  // name = dk_ValueMember
         10,
-        ACE_NTOHL (0x646b5f4e), 
-        ACE_NTOHL (0x61746976), 
+        ACE_NTOHL (0x646b5f4e),
+        ACE_NTOHL (0x61746976),
         ACE_NTOHL (0x65000000),  // name = dk_Native
         21,
-        ACE_NTOHL (0x646b5f41), 
-        ACE_NTOHL (0x62737472), 
-        ACE_NTOHL (0x61637449), 
-        ACE_NTOHL (0x6e746572), 
-        ACE_NTOHL (0x66616365), 
+        ACE_NTOHL (0x646b5f41),
+        ACE_NTOHL (0x62737472),
+        ACE_NTOHL (0x61637449),
+        ACE_NTOHL (0x6e746572),
+        ACE_NTOHL (0x66616365),
         ACE_NTOHL (0x0),  // name = dk_AbstractInterface
         18,
-        ACE_NTOHL (0x646b5f4c), 
-        ACE_NTOHL (0x6f63616c), 
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
+        ACE_NTOHL (0x646b5f4c),
+        ACE_NTOHL (0x6f63616c),
+        ACE_NTOHL (0x496e7465),
+        ACE_NTOHL (0x72666163),
         ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
 
       6,
-      ACE_NTOHL (0x76616c75), 
+      ACE_NTOHL (0x76616c75),
       ACE_NTOHL (0x65000000),  // name = value
       CORBA::tk_any,
 
@@ -12125,46 +12005,46 @@ CORBA::TypeCode_ptr CORBA_Container::_tc_DescriptionSeq =
 CORBA_Container::DescriptionSeq * CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.describe_contents (
       this,
       limit_type,
       exclude_inherited,
-      max_returned_objs,
-      ACE_TRY_ENV
+      max_returned_objs
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ModuleDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_module (
       this,
       id,
       name,
-      version,
-      ACE_TRY_ENV
+      version
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12173,25 +12053,25 @@ CORBA_ConstantDef_ptr CORBA_Container::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
   ))
 {
-  _TAO_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_constant (
       this,
       id,
       name,
       version,
       type,
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12199,24 +12079,24 @@ CORBA_StructDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_struct (
       this,
       id,
       name,
       version,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12225,25 +12105,25 @@ CORBA_UnionDef_ptr CORBA_Container::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
   ))
 {
-  _TAO_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_union (
       this,
       id,
       name,
       version,
       discriminator_type,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12251,24 +12131,24 @@ CORBA_EnumDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_enum (
       this,
       id,
       name,
       version,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12276,24 +12156,24 @@ CORBA_AliasDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_alias (
       this,
       id,
       name,
       version,
-      original_type,
-      ACE_TRY_ENV
+      original_type
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12301,24 +12181,24 @@ CORBA_InterfaceDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_interface (
       this,
       id,
       name,
       version,
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12332,17 +12212,17 @@ CORBA_ValueDef_ptr CORBA_Container::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
   ))
 {
-  _TAO_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_value (
       this,
       id,
@@ -12354,8 +12234,8 @@ CORBA_ValueDef_ptr CORBA_Container::create_value (
       is_truncatable,
       abstract_base_values,
       supported_interfaces,
-      initializers,
-      ACE_TRY_ENV
+      initializers
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12363,24 +12243,24 @@ CORBA_ValueBoxDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_value_box (
       this,
       id,
       name,
       version,
-      original_type_def,
-      ACE_TRY_ENV
+      original_type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12388,47 +12268,47 @@ CORBA_ExceptionDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_exception (
       this,
       id,
       name,
       version,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_NativeDef_ptr CORBA_Container::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_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_native (
       this,
       id,
       name,
-      version,
-      ACE_TRY_ENV
+      version
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12436,24 +12316,24 @@ CORBA_AbstractInterfaceDef_ptr CORBA_Container::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
   ))
 {
-  _TAO_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_abstract_interface (
       this,
       id,
       name,
       version,
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12461,24 +12341,24 @@ CORBA_LocalInterfaceDef_ptr CORBA_Container::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
   ))
 {
-  _TAO_CORBA_Container_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.create_local_interface (
       this,
       id,
       name,
       version,
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12508,11 +12388,11 @@ tao_CORBA_IDLType_nil (
 
 CORBA_IDLType_ptr
 tao_CORBA_IDLType_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_IDLType::_narrow (p, ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12575,7 +12455,7 @@ CORBA_IDLType_var::operator const ::CORBA_IDLType_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_IDLType_var::operator ::CORBA_IDLType_ptr &() // cast 
+CORBA_IDLType_var::operator ::CORBA_IDLType_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -12635,11 +12515,11 @@ CORBA_IDLType_var::tao_nil (void)
 
 ::CORBA_IDLType_ptr
 CORBA_IDLType_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_IDLType::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_IDLType::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12716,27 +12596,23 @@ class TAO_ClientRequestInfo_CORBA_IDLType_type_get : public TAO_ClientRequestInf
 public:
   TAO_ClientRequestInfo_CORBA_IDLType_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -12750,64 +12626,64 @@ private:
 
 TAO_ClientRequestInfo_CORBA_IDLType_type_get::TAO_ClientRequestInfo_CORBA_IDLType_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_IDLType_Proxy_Impl::_TAO_CORBA_IDLType_Proxy_Impl (void)
@@ -12819,23 +12695,23 @@ _TAO_CORBA_IDLType_Remote_Proxy_Impl::_TAO_CORBA_IDLType_Remote_Proxy_Impl (void
 // Remote Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_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
   ))
 {
-  
+
   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_type",
@@ -12843,89 +12719,89 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_IDLType_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -12935,52 +12811,52 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -12988,7 +12864,7 @@ return _tao_safe_retval._retn ();
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -13026,8 +12902,8 @@ _TAO_CORBA_IDLType_Remote_Proxy_Broker::~_TAO_CORBA_IDLType_Remote_Proxy_Broker
 
 _TAO_CORBA_IDLType_Proxy_Impl&
 _TAO_CORBA_IDLType_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_IDLType *,
-  CORBA::Environment &
+  ::CORBA_IDLType *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -13058,7 +12934,7 @@ CORBA_IDLType::CORBA_IDLType_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_IDLType_Proxy_Broker_ =
       ::_TAO_CORBA_IDLType_Remote_Proxy_Broker::the_TAO_CORBA_IDLType_Remote_Proxy_Broker ();
-  
+
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
@@ -13069,25 +12945,25 @@ void CORBA_IDLType::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_IDLType_ptr CORBA_IDLType::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_IDLType::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
       if (is_a == 0)
         return CORBA_IDLType::_nil ();
     }
-  return CORBA_IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_IDLType::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr CORBA_IDLType::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -13111,14 +12987,14 @@ CORBA_IDLType_ptr CORBA_IDLType::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_IDLType::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_IDLType (stub, 0, obj->_servant ()), CORBA_IDLType::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -13142,7 +13018,7 @@ CORBA_IDLType::_duplicate (CORBA_IDLType_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -13150,7 +13026,7 @@ CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value, CORBA::Environmen
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_IDLType::_tao_QueryInterface (ptr_arith_t type)
@@ -13175,7 +13051,7 @@ void *CORBA_IDLType::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -13187,19 +13063,19 @@ const char* CORBA_IDLType::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_IDLType::type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_CORBA_IDLType_Proxy_Impl &proxy = 
-    this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_IDLType_Proxy_Impl &proxy =
+    this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -13229,11 +13105,11 @@ tao_CORBA_TypedefDef_nil (
 
 CORBA_TypedefDef_ptr
 tao_CORBA_TypedefDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_TypedefDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_TypedefDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13296,7 +13172,7 @@ CORBA_TypedefDef_var::operator const ::CORBA_TypedefDef_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_TypedefDef_var::operator ::CORBA_TypedefDef_ptr &() // cast 
+CORBA_TypedefDef_var::operator ::CORBA_TypedefDef_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -13356,11 +13232,11 @@ CORBA_TypedefDef_var::tao_nil (void)
 
 ::CORBA_TypedefDef_ptr
 CORBA_TypedefDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_TypedefDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_TypedefDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13435,7 +13311,7 @@ CORBA_TypedefDef_out::operator-> (void)
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 _TAO_CORBA_TypedefDef_Proxy_Impl::_TAO_CORBA_TypedefDef_Proxy_Impl (void)
@@ -13448,7 +13324,7 @@ _TAO_CORBA_TypedefDef_Remote_Proxy_Impl::_TAO_CORBA_TypedefDef_Remote_Proxy_Impl
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -13486,8 +13362,8 @@ _TAO_CORBA_TypedefDef_Remote_Proxy_Broker::~_TAO_CORBA_TypedefDef_Remote_Proxy_B
 
 _TAO_CORBA_TypedefDef_Proxy_Impl&
 _TAO_CORBA_TypedefDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_TypedefDef *,
-  CORBA::Environment &
+  ::CORBA_TypedefDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -13518,9 +13394,9 @@ CORBA_TypedefDef::CORBA_TypedefDef_setup_collocation (int collocated)
   else
     this->the_TAO_CORBA_TypedefDef_Proxy_Broker_ =
       ::_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::the_TAO_CORBA_TypedefDef_Remote_Proxy_Broker ();
-  
+
   this->CORBA_Contained_setup_collocation (collocated);
-  
+
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
@@ -13531,25 +13407,25 @@ void CORBA_TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_TypedefDef_ptr CORBA_TypedefDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_TypedefDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ());
       if (is_a == 0)
         return CORBA_TypedefDef::_nil ();
     }
-  return CORBA_TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_TypedefDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_TypedefDef_ptr CORBA_TypedefDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -13573,14 +13449,14 @@ CORBA_TypedefDef_ptr CORBA_TypedefDef::_unchecked_narrow (
             stub,
             1,
             obj->_servant ()),
-            
+
           CORBA_TypedefDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_TypedefDef (stub, 0, obj->_servant ()), CORBA_TypedefDef::_nil ());
         return default_proxy;
       }
-    else 
+    else
       return
         ACE_reinterpret_cast
           (
@@ -13604,7 +13480,7 @@ CORBA_TypedefDef::_duplicate (CORBA_TypedefDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
@@ -13614,7 +13490,7 @@ CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environ
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
@@ -13663,7 +13539,7 @@ void *CORBA_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -13696,13 +13572,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DefinitionKind &_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_DefinitionKind, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_DefinitionKind TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -13726,7 +13602,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_IRObject_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_IRObject, 
+        CORBA::_tc_IRObject,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -13742,13 +13618,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao
   {
     _tao_elem = CORBA_IRObject::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -13787,7 +13663,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_Contained_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_Contained, 
+        CORBA::_tc_Contained,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -13803,13 +13679,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Contained_ptr &_ta
   {
     _tao_elem = CORBA_Contained::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -13878,13 +13754,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Contained::D
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -13969,13 +13845,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContainedSeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14060,13 +13936,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14151,13 +14027,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDefSeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14242,13 +14118,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AbstractInte
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14333,13 +14209,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_LocalInterfa
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14416,13 +14292,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMember
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14507,13 +14383,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMember
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14590,13 +14466,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Initializer
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14681,13 +14557,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InitializerS
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14764,13 +14640,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMember
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14855,13 +14731,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMemberS
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14946,13 +14822,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_EnumMemberSe
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -14999,7 +14875,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_Container_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_Container, 
+        CORBA::_tc_Container,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -15015,13 +14891,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Container_ptr &_ta
   {
     _tao_elem = CORBA_Container::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Container, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Container TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -15090,13 +14966,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::D
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -15181,13 +15057,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::D
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -15234,7 +15110,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_IDLType_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_IDLType, 
+        CORBA::_tc_IDLType,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -15250,13 +15126,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IDLType_ptr &_tao_
   {
     _tao_elem = CORBA_IDLType::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -15295,7 +15171,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_TypedefDef_ptr _tao_elem)
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_TypedefDef, 
+        CORBA::_tc_TypedefDef,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -15311,13 +15187,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_TypedefDef_ptr &_t
   {
     _tao_elem = CORBA_TypedefDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -15386,13 +15262,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_TypeDescript
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -15455,8 +15331,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_IRObject::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -15491,8 +15367,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_Contained::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -15534,7 +15410,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15576,7 +15452,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15618,7 +15494,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15660,7 +15536,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15702,7 +15578,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15744,7 +15620,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15786,7 +15662,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15828,7 +15704,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15870,7 +15746,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15912,7 +15788,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -15947,8 +15823,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_Container::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -15983,8 +15859,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_IDLType::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -16019,8 +15895,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_TypedefDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 7c222d68a1b..2520f156782 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -93,8 +93,8 @@ public:
   static void tao_release (CORBA_IRObject_ptr);
   static CORBA_IRObject_ptr tao_nil (void);
   static CORBA_IRObject_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -157,16 +157,14 @@ public:
   static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
 
   static CORBA_IRObject_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_IRObject_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_IRObject_ptr _nil (void)
     {
@@ -176,26 +174,23 @@ public:
   static void _tao_any_destructor (void*);
 
   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
     ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::Char *type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -243,16 +238,16 @@ class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Impl
 public:
   virtual ~_TAO_CORBA_IRObject_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
     )) = 0;
 
   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
@@ -281,16 +276,16 @@ public:
 
   virtual ~_TAO_CORBA_IRObject_Remote_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
@@ -318,8 +313,8 @@ class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_IRObject_Proxy_Broker (void);
   virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
-      CORBA_IRObject *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      CORBA_IRObject *object
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
 protected:
@@ -345,8 +340,8 @@ public:
   virtual ~_TAO_CORBA_IRObject_Remote_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:
@@ -398,8 +393,8 @@ public:
     static void tao_release (CORBA_Repository_ptr);
     static CORBA_Repository_ptr tao_nil (void);
     static CORBA_Repository_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -477,8 +472,8 @@ public:
     static void tao_release (CORBA_Container_ptr);
     static CORBA_Container_ptr tao_nil (void);
     static CORBA_Container_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -556,8 +551,8 @@ public:
     static void tao_release (CORBA_Contained_ptr);
     static CORBA_Contained_ptr tao_nil (void);
     static CORBA_Contained_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -620,16 +615,14 @@ public:
     static CORBA_Contained_ptr _duplicate (CORBA_Contained_ptr obj);
 
     static CORBA_Contained_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static CORBA_Contained_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static CORBA_Contained_ptr _nil (void)
       {
@@ -639,76 +632,67 @@ public:
     static void _tao_any_destructor (void*);
 
     virtual char * id (
-        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
       ));
 
     virtual char * name (
-        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
       ));
 
     virtual char * version (
-        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
       ));
 
     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
       ));
 
     virtual char * absolute_name (
-        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
       ));
@@ -781,9 +765,8 @@ public:
     static CORBA::TypeCode_ptr _tc_Description;
 
     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
       ));
@@ -791,19 +774,17 @@ public:
     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
       ));
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -851,8 +832,8 @@ public:
   public:
     virtual ~_TAO_CORBA_Contained_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
@@ -860,16 +841,16 @@ public:
 
     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
       )) = 0;
 
     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
@@ -877,16 +858,16 @@ public:
 
     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
       )) = 0;
 
     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
@@ -894,40 +875,40 @@ public:
 
     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
       )) = 0;
 
     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
       )) = 0;
 
     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
       )) = 0;
 
     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
       )) = 0;
 
     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
@@ -937,8 +918,8 @@ public:
         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
@@ -968,8 +949,8 @@ public:
 
     virtual ~_TAO_CORBA_Contained_Remote_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
@@ -977,16 +958,16 @@ public:
 
     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
@@ -994,16 +975,16 @@ public:
 
     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
@@ -1011,40 +992,40 @@ public:
 
     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
@@ -1054,8 +1035,8 @@ public:
         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
@@ -1083,8 +1064,8 @@ public:
   public:
     virtual ~_TAO_CORBA_Contained_Proxy_Broker (void);
     virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
-        CORBA_Contained *object,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_Contained *object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1110,8 +1091,8 @@ public:
     virtual ~_TAO_CORBA_Contained_Remote_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:
@@ -1177,10 +1158,9 @@ public:
 
       virtual void _downcast (
           void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA_Object *src
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
       virtual CORBA_Object* _upcast (void *src) const;
     };
 
@@ -1336,8 +1316,8 @@ public:
       static void tao_release (CORBA_ModuleDef_ptr);
       static CORBA_ModuleDef_ptr tao_nil (void);
       static CORBA_ModuleDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1415,8 +1395,8 @@ public:
       static void tao_release (CORBA_ConstantDef_ptr);
       static CORBA_ConstantDef_ptr tao_nil (void);
       static CORBA_ConstantDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1494,8 +1474,8 @@ public:
       static void tao_release (CORBA_IDLType_ptr);
       static CORBA_IDLType_ptr tao_nil (void);
       static CORBA_IDLType_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1573,8 +1553,8 @@ public:
       static void tao_release (CORBA_StructDef_ptr);
       static CORBA_StructDef_ptr tao_nil (void);
       static CORBA_StructDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1652,8 +1632,8 @@ public:
       static void tao_release (CORBA_UnionDef_ptr);
       static CORBA_UnionDef_ptr tao_nil (void);
       static CORBA_UnionDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1731,8 +1711,8 @@ public:
       static void tao_release (CORBA_EnumDef_ptr);
       static CORBA_EnumDef_ptr tao_nil (void);
       static CORBA_EnumDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1810,8 +1790,8 @@ public:
       static void tao_release (CORBA_AliasDef_ptr);
       static CORBA_AliasDef_ptr tao_nil (void);
       static CORBA_AliasDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1889,8 +1869,8 @@ public:
       static void tao_release (CORBA_InterfaceDef_ptr);
       static CORBA_InterfaceDef_ptr tao_nil (void);
       static CORBA_InterfaceDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1974,10 +1954,9 @@ public:
 
       virtual void _downcast (
           void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA_Object *src
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
       virtual CORBA_Object* _upcast (void *src) const;
     };
 
@@ -2133,8 +2112,8 @@ public:
       static void tao_release (CORBA_ExceptionDef_ptr);
       static CORBA_ExceptionDef_ptr tao_nil (void);
       static CORBA_ExceptionDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2212,8 +2191,8 @@ public:
       static void tao_release (CORBA_NativeDef_ptr);
       static CORBA_NativeDef_ptr tao_nil (void);
       static CORBA_NativeDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2291,8 +2270,8 @@ public:
       static void tao_release (CORBA_ValueDef_ptr);
       static CORBA_ValueDef_ptr tao_nil (void);
       static CORBA_ValueDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2376,10 +2355,9 @@ public:
 
       virtual void _downcast (
           void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA_Object *src
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
       virtual CORBA_Object* _upcast (void *src) const;
     };
 
@@ -2535,8 +2513,8 @@ public:
       static void tao_release (CORBA_ValueBoxDef_ptr);
       static CORBA_ValueBoxDef_ptr tao_nil (void);
       static CORBA_ValueBoxDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2614,8 +2592,8 @@ public:
       static void tao_release (CORBA_AbstractInterfaceDef_ptr);
       static CORBA_AbstractInterfaceDef_ptr tao_nil (void);
       static CORBA_AbstractInterfaceDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2699,10 +2677,9 @@ public:
 
       virtual void _downcast (
           void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA_Object *src
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
       virtual CORBA_Object* _upcast (void *src) const;
     };
 
@@ -2858,8 +2835,8 @@ public:
       static void tao_release (CORBA_LocalInterfaceDef_ptr);
       static CORBA_LocalInterfaceDef_ptr tao_nil (void);
       static CORBA_LocalInterfaceDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2943,10 +2920,9 @@ public:
 
       virtual void _downcast (
           void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA_Object *src
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
       virtual CORBA_Object* _upcast (void *src) const;
     };
 
@@ -3876,16 +3852,14 @@ public:
       static CORBA_Container_ptr _duplicate (CORBA_Container_ptr obj);
 
       static CORBA_Container_ptr _narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       static CORBA_Container_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       static CORBA_Container_ptr _nil (void)
         {
@@ -3895,20 +3869,18 @@ public:
       static void _tao_any_destructor (void*);
 
       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
         ));
 
       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
         ));
@@ -3917,10 +3889,9 @@ public:
           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
         ));
@@ -4159,10 +4130,9 @@ public:
       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
         ));
@@ -4170,10 +4140,9 @@ public:
       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
         ));
@@ -4183,10 +4152,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
         ));
@@ -4195,10 +4163,9 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -4208,10 +4175,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
         ));
@@ -4220,10 +4186,9 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -4232,10 +4197,9 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -4244,10 +4208,9 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -4262,10 +4225,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
         ));
@@ -4274,10 +4236,9 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -4286,10 +4247,9 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -4297,10 +4257,9 @@ public:
       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
         ));
@@ -4309,10 +4268,9 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
@@ -4321,19 +4279,17 @@ 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)
+
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA::Boolean _is_a (
-          const CORBA::Char *type_id,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          const CORBA::Char *type_id
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -4382,8 +4338,8 @@ public:
       virtual ~_TAO_CORBA_Container_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
@@ -4392,8 +4348,8 @@ public:
       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
@@ -4404,8 +4360,8 @@ public:
           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
@@ -4415,8 +4371,8 @@ public:
           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
@@ -4426,8 +4382,8 @@ public:
           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
@@ -4439,8 +4395,8 @@ public:
           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
@@ -4451,8 +4407,8 @@ public:
           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
@@ -4464,8 +4420,8 @@ public:
           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
@@ -4476,8 +4432,8 @@ public:
           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
@@ -4488,8 +4444,8 @@ public:
           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
@@ -4500,8 +4456,8 @@ public:
           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
@@ -4518,8 +4474,8 @@ 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
@@ -4530,8 +4486,8 @@ public:
           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
@@ -4542,8 +4498,8 @@ public:
           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
@@ -4553,8 +4509,8 @@ public:
           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
@@ -4565,8 +4521,8 @@ public:
           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
@@ -4577,8 +4533,8 @@ public:
           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
@@ -4609,8 +4565,8 @@ public:
       virtual ~_TAO_CORBA_Container_Remote_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
@@ -4619,8 +4575,8 @@ public:
       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
@@ -4631,8 +4587,8 @@ public:
           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
@@ -4642,8 +4598,8 @@ public:
           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
@@ -4653,8 +4609,8 @@ public:
           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
@@ -4666,8 +4622,8 @@ public:
           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
@@ -4678,8 +4634,8 @@ public:
           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
@@ -4691,8 +4647,8 @@ public:
           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
@@ -4703,8 +4659,8 @@ public:
           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
@@ -4715,8 +4671,8 @@ public:
           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
@@ -4727,8 +4683,8 @@ public:
           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
@@ -4745,8 +4701,8 @@ 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
@@ -4757,8 +4713,8 @@ public:
           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
@@ -4769,8 +4725,8 @@ public:
           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
@@ -4780,8 +4736,8 @@ public:
           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
@@ -4792,8 +4748,8 @@ public:
           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
@@ -4804,8 +4760,8 @@ public:
           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
@@ -4833,8 +4789,8 @@ public:
     public:
       virtual ~_TAO_CORBA_Container_Proxy_Broker (void);
       virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
-          CORBA_Container *object,
-          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          CORBA_Container *object
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
 
     protected:
@@ -4860,8 +4816,8 @@ public:
       virtual ~_TAO_CORBA_Container_Remote_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:
@@ -4905,16 +4861,14 @@ public:
         static CORBA_IDLType_ptr _duplicate (CORBA_IDLType_ptr obj);
 
         static CORBA_IDLType_ptr _narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         static CORBA_IDLType_ptr _unchecked_narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         static CORBA_IDLType_ptr _nil (void)
           {
@@ -4924,18 +4878,16 @@ public:
         static void _tao_any_destructor (void*);
 
         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::Boolean _is_a (
-            const CORBA::Char *type_id,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            const CORBA::Char *type_id
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -4983,8 +4935,8 @@ public:
       public:
         virtual ~_TAO_CORBA_IDLType_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
@@ -5014,8 +4966,8 @@ public:
 
         virtual ~_TAO_CORBA_IDLType_Remote_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
@@ -5043,8 +4995,8 @@ public:
       public:
         virtual ~_TAO_CORBA_IDLType_Proxy_Broker (void);
         virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
-            CORBA_IDLType *object,
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+            CORBA_IDLType *object
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
 
       protected:
@@ -5070,8 +5022,8 @@ public:
         virtual ~_TAO_CORBA_IDLType_Remote_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:
@@ -5131,8 +5083,8 @@ public:
           static void tao_release (CORBA_TypedefDef_ptr);
           static CORBA_TypedefDef_ptr tao_nil (void);
           static CORBA_TypedefDef_ptr tao_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           static CORBA::Object * tao_upcast (void *);
 
@@ -5196,16 +5148,14 @@ public:
           static CORBA_TypedefDef_ptr _duplicate (CORBA_TypedefDef_ptr obj);
 
           static CORBA_TypedefDef_ptr _narrow (
-              CORBA::Object_ptr obj,
-              CORBA::Environment &ACE_TRY_ENV =
-                TAO_default_environment ()
-            );
+              CORBA::Object_ptr obj
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
           static CORBA_TypedefDef_ptr _unchecked_narrow (
-              CORBA::Object_ptr obj,
-              CORBA::Environment &ACE_TRY_ENV =
-                TAO_default_environment ()
-            );
+              CORBA::Object_ptr obj
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
           static CORBA_TypedefDef_ptr _nil (void)
             {
@@ -5215,10 +5165,9 @@ public:
           static void _tao_any_destructor (void*);
 
           virtual CORBA::Boolean _is_a (
-              const CORBA::Char *type_id,
-              CORBA::Environment &ACE_TRY_ENV =
-                TAO_default_environment ()
-            );
+              const CORBA::Char *type_id
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
           virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -5312,8 +5261,8 @@ public:
         public:
           virtual ~_TAO_CORBA_TypedefDef_Proxy_Broker (void);
           virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
-              CORBA_TypedefDef *object,
-              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+              CORBA_TypedefDef *object
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS
             ) = 0;
 
         protected:
@@ -5339,8 +5288,8 @@ public:
           virtual ~_TAO_CORBA_TypedefDef_Remote_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:
@@ -5480,8 +5429,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_Repository_ptr
           tao_CORBA_Repository_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5509,8 +5458,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_ModuleDef_ptr
           tao_CORBA_ModuleDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5538,8 +5487,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_ConstantDef_ptr
           tao_CORBA_ConstantDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5567,8 +5516,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_StructDef_ptr
           tao_CORBA_StructDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5596,8 +5545,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_UnionDef_ptr
           tao_CORBA_UnionDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5625,8 +5574,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_EnumDef_ptr
           tao_CORBA_EnumDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5654,8 +5603,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_AliasDef_ptr
           tao_CORBA_AliasDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5683,8 +5632,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_InterfaceDef_ptr
           tao_CORBA_InterfaceDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5712,8 +5661,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_ExceptionDef_ptr
           tao_CORBA_ExceptionDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5741,8 +5690,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_NativeDef_ptr
           tao_CORBA_NativeDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5770,8 +5719,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_ValueDef_ptr
           tao_CORBA_ValueDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5799,8 +5748,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_ValueBoxDef_ptr
           tao_CORBA_ValueBoxDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5828,8 +5777,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_AbstractInterfaceDef_ptr
           tao_CORBA_AbstractInterfaceDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5857,8 +5806,8 @@ public:
           TAO_IFR_Client_Export
           CORBA_LocalInterfaceDef_ptr
           tao_CORBA_LocalInterfaceDef_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index ecfa767781a..e80764ca069 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -66,11 +66,11 @@ tao_CORBA_Repository_nil (
 
 CORBA_Repository_ptr
 tao_CORBA_Repository_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_Repository::_narrow (p, ACE_TRY_ENV);
+  return CORBA_Repository::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -193,11 +193,11 @@ CORBA_Repository_var::tao_nil (void)
 
 ::CORBA_Repository_ptr
 CORBA_Repository_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Repository::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_Repository::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -275,27 +275,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Repository_lookup_id (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA_Contained_ptr result);
@@ -311,20 +307,20 @@ private:
 TAO_ClientRequestInfo_CORBA_Repository_lookup_id::TAO_ClientRequestInfo_CORBA_Repository_lookup_id (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * search_id,
-    CORBA::Environment &
+    const char * search_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     search_id_ (search_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -340,12 +336,12 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -353,13 +349,13 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -381,27 +377,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -417,20 +409,20 @@ private:
 TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     tc_ (tc)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -446,12 +438,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -459,13 +451,13 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -487,27 +479,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Repository_get_primitive (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA_PrimitiveDef_ptr result);
@@ -523,20 +511,20 @@ private:
 TAO_ClientRequestInfo_CORBA_Repository_get_primitive::TAO_ClientRequestInfo_CORBA_Repository_get_primitive (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::PrimitiveKind & kind,
-    CORBA::Environment &
+    CORBA::PrimitiveKind & kind
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     kind_ (kind)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -552,12 +540,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -565,13 +553,13 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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,27 +581,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Repository_create_string (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA_StringDef_ptr result);
@@ -629,20 +613,20 @@ private:
 TAO_ClientRequestInfo_CORBA_Repository_create_string::TAO_ClientRequestInfo_CORBA_Repository_create_string (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -658,12 +642,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -671,13 +655,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -699,27 +683,23 @@ public:
   TAO_ClientRequestInfo_CORBA_Repository_create_wstring (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA_WstringDef_ptr result);
@@ -735,20 +715,20 @@ private:
 TAO_ClientRequestInfo_CORBA_Repository_create_wstring::TAO_ClientRequestInfo_CORBA_Repository_create_wstring (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -764,12 +744,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -777,13 +757,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -806,27 +786,23 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       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));
 
   void result (CORBA_SequenceDef_ptr result);
@@ -844,8 +820,8 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CO
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound),
@@ -853,12 +829,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -877,12 +853,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -890,13 +866,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (CORBA::Envir
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -919,27 +895,23 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       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));
 
   void result (CORBA_ArrayDef_ptr result);
@@ -957,8 +929,8 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     length_ (length),
@@ -966,12 +938,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -990,12 +962,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -1003,13 +975,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -1032,27 +1004,23 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       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));
 
   void result (CORBA_FixedDef_ptr result);
@@ -1070,8 +1038,8 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::UShort & digits,
-    const CORBA::Short & scale,
-    CORBA::Environment &
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     digits_ (digits),
@@ -1079,12 +1047,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -1103,12 +1071,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -1116,13 +1084,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -1154,8 +1122,8 @@ _TAO_CORBA_Repository_Remote_Proxy_Impl::_TAO_CORBA_Repository_Remote_Proxy_Impl
 
 CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_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
@@ -1198,8 +1166,8 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
       TAO_ClientRequestInfo_CORBA_Repository_lookup_id ri (
         &_tao_call,
         _collocated_tao_target_,
-        search_id,
-        ACE_TRY_ENV
+        search_id
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1214,8 +1182,8 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1227,12 +1195,12 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1246,7 +1214,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1262,8 +1230,8 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1290,8 +1258,8 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1300,13 +1268,13 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1317,7 +1285,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1333,8 +1301,8 @@ return _tao_safe_retval._retn ();
 
 CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_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
@@ -1377,8 +1345,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
       TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode ri (
         &_tao_call,
         _collocated_tao_target_,
-        tc,
-        ACE_TRY_ENV
+        tc
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1393,8 +1361,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1406,12 +1374,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1425,7 +1393,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1441,8 +1409,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1469,8 +1437,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1479,13 +1447,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1496,7 +1464,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1512,8 +1480,8 @@ return _tao_safe_retval._retn ();
 
 CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_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
@@ -1556,8 +1524,8 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
       TAO_ClientRequestInfo_CORBA_Repository_get_primitive ri (
         &_tao_call,
         _collocated_tao_target_,
-        kind,
-        ACE_TRY_ENV
+        kind
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1572,8 +1540,8 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1585,12 +1553,12 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1604,7 +1572,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1620,8 +1588,8 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1648,8 +1616,8 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1658,13 +1626,13 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1675,7 +1643,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1691,8 +1659,8 @@ return _tao_safe_retval._retn ();
 
 CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_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
@@ -1735,8 +1703,8 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
       TAO_ClientRequestInfo_CORBA_Repository_create_string ri (
         &_tao_call,
         _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1751,8 +1719,8 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1764,12 +1732,12 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1783,7 +1751,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1799,8 +1767,8 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1827,8 +1795,8 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1837,13 +1805,13 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1854,7 +1822,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1870,8 +1838,8 @@ return _tao_safe_retval._retn ();
 
 CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_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
@@ -1914,8 +1882,8 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
       TAO_ClientRequestInfo_CORBA_Repository_create_wstring ri (
         &_tao_call,
         _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1930,8 +1898,8 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1943,12 +1911,12 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1962,7 +1930,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1978,8 +1946,8 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2006,8 +1974,8 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2016,13 +1984,13 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2033,7 +2001,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2050,8 +2018,8 @@ return _tao_safe_retval._retn ();
 CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_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
@@ -2095,8 +2063,8 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
         &_tao_call,
         _collocated_tao_target_,
         bound,
-        element_type,
-        ACE_TRY_ENV
+        element_type
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2111,8 +2079,8 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2124,12 +2092,12 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2144,7 +2112,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2160,8 +2128,8 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2188,8 +2156,8 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2198,13 +2166,13 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2215,7 +2183,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2232,8 +2200,8 @@ return _tao_safe_retval._retn ();
 CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_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
@@ -2277,8 +2245,8 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
         &_tao_call,
         _collocated_tao_target_,
         length,
-        element_type,
-        ACE_TRY_ENV
+        element_type
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2293,8 +2261,8 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2306,12 +2274,12 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2326,7 +2294,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2342,8 +2310,8 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2370,8 +2338,8 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2380,13 +2348,13 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2397,7 +2365,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2414,8 +2382,8 @@ return _tao_safe_retval._retn ();
 CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_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
@@ -2459,8 +2427,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
         &_tao_call,
         _collocated_tao_target_,
         digits,
-        scale,
-        ACE_TRY_ENV
+        scale
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2475,8 +2443,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2488,12 +2456,12 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2508,7 +2476,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2524,8 +2492,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2552,8 +2520,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2562,13 +2530,13 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2579,7 +2547,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2633,8 +2601,8 @@ _TAO_CORBA_Repository_Remote_Proxy_Broker::~_TAO_CORBA_Repository_Remote_Proxy_B
 
 _TAO_CORBA_Repository_Proxy_Impl&
 _TAO_CORBA_Repository_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_Repository *,
-  CORBA::Environment &
+  ::CORBA_Repository *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -2676,25 +2644,25 @@ void CORBA_Repository::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_Repository_ptr CORBA_Repository::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Repository::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Repository::_nil ());
       if (is_a == 0)
         return CORBA_Repository::_nil ();
     }
-  return CORBA_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Repository::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Repository_ptr CORBA_Repository::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2749,7 +2717,7 @@ CORBA_Repository::_duplicate (CORBA_Repository_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
@@ -2758,7 +2726,7 @@ CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value, CORBA::Environ
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_Repository::_tao_QueryInterface (ptr_arith_t type)
@@ -2807,160 +2775,160 @@ const char* CORBA_Repository::_interface_repository_id (void) const
 }
 
 CORBA_Contained_ptr CORBA_Repository::lookup_id (
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.lookup_id (
       this,
-      search_id,
-      ACE_TRY_ENV
+      search_id
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::TypeCode_ptr CORBA_Repository::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
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.get_canonical_typecode (
       this,
-      tc,
-      ACE_TRY_ENV
+      tc
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_PrimitiveDef_ptr CORBA_Repository::get_primitive (
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PrimitiveKind kind
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.get_primitive (
       this,
-      kind,
-      ACE_TRY_ENV
+      kind
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_StringDef_ptr CORBA_Repository::create_string (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_string (
       this,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_WstringDef_ptr CORBA_Repository::create_wstring (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_wstring (
       this,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_SequenceDef_ptr CORBA_Repository::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_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_sequence (
       this,
       bound,
-      element_type,
-      ACE_TRY_ENV
+      element_type
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ArrayDef_ptr CORBA_Repository::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_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_array (
       this,
       length,
-      element_type,
-      ACE_TRY_ENV
+      element_type
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_FixedDef_ptr CORBA_Repository::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_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_fixed (
       this,
       digits,
-      scale,
-      ACE_TRY_ENV
+      scale
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -2990,11 +2958,11 @@ tao_CORBA_ModuleDef_nil (
 
 CORBA_ModuleDef_ptr
 tao_CORBA_ModuleDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ModuleDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ModuleDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3117,11 +3085,11 @@ CORBA_ModuleDef_var::tao_nil (void)
 
 ::CORBA_ModuleDef_ptr
 CORBA_ModuleDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ModuleDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ModuleDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3247,8 +3215,8 @@ _TAO_CORBA_ModuleDef_Remote_Proxy_Broker::~_TAO_CORBA_ModuleDef_Remote_Proxy_Bro
 
 _TAO_CORBA_ModuleDef_Proxy_Impl&
 _TAO_CORBA_ModuleDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ModuleDef *,
-  CORBA::Environment &
+  ::CORBA_ModuleDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3292,25 +3260,25 @@ void CORBA_ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_ModuleDef_ptr CORBA_ModuleDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ModuleDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
       if (is_a == 0)
         return CORBA_ModuleDef::_nil ();
     }
-  return CORBA_ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ModuleDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ModuleDef_ptr CORBA_ModuleDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3365,7 +3333,7 @@ CORBA_ModuleDef::_duplicate (CORBA_ModuleDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
@@ -3375,7 +3343,7 @@ CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ModuleDef::_tao_QueryInterface (ptr_arith_t type)
@@ -3467,11 +3435,11 @@ tao_CORBA_ConstantDef_nil (
 
 CORBA_ConstantDef_ptr
 tao_CORBA_ConstantDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ConstantDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ConstantDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3594,11 +3562,11 @@ CORBA_ConstantDef_var::tao_nil (void)
 
 ::CORBA_ConstantDef_ptr
 CORBA_ConstantDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ConstantDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ConstantDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3675,27 +3643,23 @@ class TAO_ClientRequestInfo_CORBA_ConstantDef_type_get : public TAO_ClientReques
 public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -3709,31 +3673,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3741,13 +3705,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3768,27 +3732,23 @@ class TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get : public TAO_ClientRe
 public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -3802,31 +3762,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3834,13 +3794,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3862,27 +3822,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -3896,20 +3852,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     type_def_ (type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3925,12 +3881,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3938,13 +3894,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3955,27 +3911,23 @@ class TAO_ClientRequestInfo_CORBA_ConstantDef_value_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Any * result);
@@ -3989,31 +3941,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4021,13 +3973,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4049,27 +4001,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_value_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -4083,20 +4031,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::TAO_ClientRequestInfo_CORBA_ConstantDef_value_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::Any & value,
-    CORBA::Environment &
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     value_ (value)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4112,12 +4060,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4125,13 +4073,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4152,8 +4100,8 @@ _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::_TAO_CORBA_ConstantDef_Remote_Proxy_Im
 // Remote Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_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
@@ -4195,8 +4143,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4211,8 +4159,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4224,17 +4172,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4250,8 +4198,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4278,8 +4226,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4288,13 +4236,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -4305,7 +4253,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4320,8 +4268,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_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
@@ -4363,8 +4311,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4379,8 +4327,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4392,17 +4340,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4418,8 +4366,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4446,8 +4394,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4456,13 +4404,13 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -4473,7 +4421,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4489,8 +4437,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ConstantDef_Remote_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
@@ -4532,8 +4480,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -4548,8 +4496,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4561,12 +4509,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -4579,7 +4527,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4594,8 +4542,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4608,8 +4556,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4618,13 +4566,13 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -4635,7 +4583,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4650,8 +4598,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 }
 
 CORBA::Any * _TAO_CORBA_ConstantDef_Remote_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
@@ -4694,8 +4642,8 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ConstantDef_value_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4710,8 +4658,8 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4723,17 +4671,17 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4749,8 +4697,8 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4777,8 +4725,8 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4787,13 +4735,13 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -4804,7 +4752,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4820,8 +4768,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ConstantDef_Remote_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
@@ -4863,8 +4811,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       TAO_ClientRequestInfo_CORBA_ConstantDef_value_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -4879,8 +4827,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4892,12 +4840,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -4910,7 +4858,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4925,8 +4873,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4939,8 +4887,8 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4949,13 +4897,13 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -4966,7 +4914,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -5020,8 +4968,8 @@ _TAO_CORBA_ConstantDef_Remote_Proxy_Broker::~_TAO_CORBA_ConstantDef_Remote_Proxy
 
 _TAO_CORBA_ConstantDef_Proxy_Impl&
 _TAO_CORBA_ConstantDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ConstantDef *,
-  CORBA::Environment &
+  ::CORBA_ConstantDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -5063,25 +5011,25 @@ void CORBA_ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_ConstantDef_ptr CORBA_ConstantDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ConstantDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
       if (is_a == 0)
         return CORBA_ConstantDef::_nil ();
     }
-  return CORBA_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ConstantDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr CORBA_ConstantDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -5136,7 +5084,7 @@ CORBA_ConstantDef::_duplicate (CORBA_ConstantDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
@@ -5145,7 +5093,7 @@ CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Enviro
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ConstantDef::_tao_QueryInterface (ptr_arith_t type)
@@ -5194,91 +5142,91 @@ const char* CORBA_ConstantDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_ConstantDef::type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_ConstantDef::type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ConstantDef::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
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.type_def (
       this,
-      type_def,
-      ACE_TRY_ENV
+      type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Any * CORBA_ConstantDef::value (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.value (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ConstantDef::value (
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.value (
       this,
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -5314,11 +5262,11 @@ tao_CORBA_StructDef_nil (
 
 CORBA_StructDef_ptr
 tao_CORBA_StructDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_StructDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_StructDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5441,11 +5389,11 @@ CORBA_StructDef_var::tao_nil (void)
 
 ::CORBA_StructDef_ptr
 CORBA_StructDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_StructDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_StructDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5522,27 +5470,23 @@ class TAO_ClientRequestInfo_CORBA_StructDef_members_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_StructDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_StructMemberSeq * result);
@@ -5556,31 +5500,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::TAO_ClientRequestInfo_CORBA_StructDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5588,13 +5532,13 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5616,27 +5560,23 @@ public:
   TAO_ClientRequestInfo_CORBA_StructDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -5650,20 +5590,20 @@ private:
 TAO_ClientRequestInfo_CORBA_StructDef_members_set::TAO_ClientRequestInfo_CORBA_StructDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5679,12 +5619,12 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5692,13 +5632,13 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5719,8 +5659,8 @@ _TAO_CORBA_StructDef_Remote_Proxy_Impl::_TAO_CORBA_StructDef_Remote_Proxy_Impl (
 // Remote Implementation of the IDL interface methods
 
 CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_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
@@ -5763,8 +5703,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StructDef_members_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -5779,8 +5719,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5792,17 +5732,17 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5818,8 +5758,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -5846,8 +5786,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5856,13 +5796,13 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -5873,7 +5813,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -5889,8 +5829,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_StructDef_Remote_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
@@ -5932,8 +5872,8 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_StructDef_members_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -5948,8 +5888,8 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5961,12 +5901,12 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -5979,7 +5919,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5994,8 +5934,8 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6008,8 +5948,8 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6018,13 +5958,13 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6035,7 +5975,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6089,8 +6029,8 @@ _TAO_CORBA_StructDef_Remote_Proxy_Broker::~_TAO_CORBA_StructDef_Remote_Proxy_Bro
 
 _TAO_CORBA_StructDef_Proxy_Impl&
 _TAO_CORBA_StructDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_StructDef *,
-  CORBA::Environment &
+  ::CORBA_StructDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -6134,25 +6074,25 @@ void CORBA_StructDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_StructDef_ptr CORBA_StructDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_StructDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
       if (is_a == 0)
         return CORBA_StructDef::_nil ();
     }
-  return CORBA_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_StructDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr CORBA_StructDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -6207,7 +6147,7 @@ CORBA_StructDef::_duplicate (CORBA_StructDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
@@ -6219,7 +6159,7 @@ CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_StructDef::_tao_QueryInterface (ptr_arith_t type)
@@ -6304,38 +6244,38 @@ const char* CORBA_StructDef::_interface_repository_id (void) const
 }
 
 CORBA_StructMemberSeq * CORBA_StructDef::members (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StructDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_StructDef::members (
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StructDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -6365,11 +6305,11 @@ tao_CORBA_UnionDef_nil (
 
 CORBA_UnionDef_ptr
 tao_CORBA_UnionDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_UnionDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_UnionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6492,11 +6432,11 @@ CORBA_UnionDef_var::tao_nil (void)
 
 ::CORBA_UnionDef_ptr
 CORBA_UnionDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_UnionDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_UnionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6573,27 +6513,23 @@ class TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get : public TAO_C
 public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -6607,31 +6543,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6639,13 +6575,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (CORBA::
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6666,27 +6602,23 @@ class TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get : public T
 public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -6700,31 +6632,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6732,13 +6664,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (COR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6760,27 +6692,23 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -6794,20 +6722,20 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     discriminator_type_def_ (discriminator_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6823,12 +6751,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORB
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6836,13 +6764,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (COR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6853,27 +6781,23 @@ class TAO_ClientRequestInfo_CORBA_UnionDef_members_get : public TAO_ClientReques
 public:
   TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_UnionMemberSeq * result);
@@ -6887,31 +6811,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6919,13 +6843,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6947,27 +6871,23 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -6981,20 +6901,20 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_members_set::TAO_ClientRequestInfo_CORBA_UnionDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -7010,12 +6930,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -7023,13 +6943,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -7050,8 +6970,8 @@ _TAO_CORBA_UnionDef_Remote_Proxy_Impl::_TAO_CORBA_UnionDef_Remote_Proxy_Impl (vo
 // Remote Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_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
@@ -7093,8 +7013,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -7109,8 +7029,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7122,17 +7042,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7148,8 +7068,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7176,8 +7096,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7186,13 +7106,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7203,7 +7123,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7218,8 +7138,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_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
@@ -7261,8 +7181,8 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -7277,8 +7197,8 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7290,17 +7210,17 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7316,8 +7236,8 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7344,8 +7264,8 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7354,13 +7274,13 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7371,7 +7291,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7387,8 +7307,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_UnionDef_Remote_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
@@ -7430,8 +7350,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        discriminator_type_def,
-        ACE_TRY_ENV
+        discriminator_type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7446,8 +7366,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7459,12 +7379,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7477,7 +7397,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7492,8 +7412,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7506,8 +7426,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7516,13 +7436,13 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7533,7 +7453,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7548,8 +7468,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
 }
 
 CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_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
@@ -7592,8 +7512,8 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_UnionDef_members_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -7608,8 +7528,8 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7621,17 +7541,17 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7647,8 +7567,8 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7675,8 +7595,8 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7685,13 +7605,13 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7702,7 +7622,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7718,8 +7638,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_UnionDef_Remote_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
@@ -7761,8 +7681,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_UnionDef_members_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7777,8 +7697,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7790,12 +7710,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7808,7 +7728,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7823,8 +7743,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7837,8 +7757,8 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7847,13 +7767,13 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7864,7 +7784,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7918,8 +7838,8 @@ _TAO_CORBA_UnionDef_Remote_Proxy_Broker::~_TAO_CORBA_UnionDef_Remote_Proxy_Broke
 
 _TAO_CORBA_UnionDef_Proxy_Impl&
 _TAO_CORBA_UnionDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_UnionDef *,
-  CORBA::Environment &
+  ::CORBA_UnionDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -7963,25 +7883,25 @@ void CORBA_UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_UnionDef_ptr CORBA_UnionDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_UnionDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
       if (is_a == 0)
         return CORBA_UnionDef::_nil ();
     }
-  return CORBA_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_UnionDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr CORBA_UnionDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -8036,7 +7956,7 @@ CORBA_UnionDef::_duplicate (CORBA_UnionDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
@@ -8048,7 +7968,7 @@ CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environme
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_UnionDef::_tao_QueryInterface (ptr_arith_t type)
@@ -8133,91 +8053,91 @@ const char* CORBA_UnionDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_UnionDef::discriminator_type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.discriminator_type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_UnionDef::discriminator_type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.discriminator_type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_UnionDef::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_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.discriminator_type_def (
       this,
-      discriminator_type_def,
-      ACE_TRY_ENV
+      discriminator_type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_UnionMemberSeq * CORBA_UnionDef::members (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_UnionDef::members (
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -8247,11 +8167,11 @@ tao_CORBA_EnumDef_nil (
 
 CORBA_EnumDef_ptr
 tao_CORBA_EnumDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_EnumDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_EnumDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8374,11 +8294,11 @@ CORBA_EnumDef_var::tao_nil (void)
 
 ::CORBA_EnumDef_ptr
 CORBA_EnumDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_EnumDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_EnumDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8455,27 +8375,23 @@ class TAO_ClientRequestInfo_CORBA_EnumDef_members_get : public TAO_ClientRequest
 public:
   TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_EnumMemberSeq * result);
@@ -8489,31 +8405,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -8521,13 +8437,13 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -8549,27 +8465,23 @@ public:
   TAO_ClientRequestInfo_CORBA_EnumDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -8583,20 +8495,20 @@ private:
 TAO_ClientRequestInfo_CORBA_EnumDef_members_set::TAO_ClientRequestInfo_CORBA_EnumDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -8612,12 +8524,12 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -8625,13 +8537,13 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -8652,8 +8564,8 @@ _TAO_CORBA_EnumDef_Remote_Proxy_Impl::_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void
 // Remote Implementation of the IDL interface methods
 
 CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_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
@@ -8696,8 +8608,8 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_EnumDef_members_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8712,8 +8624,8 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8725,17 +8637,17 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8751,8 +8663,8 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8779,8 +8691,8 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8789,13 +8701,13 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8806,7 +8718,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8822,8 +8734,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_EnumDef_Remote_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
@@ -8865,8 +8777,8 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_EnumDef_members_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -8881,8 +8793,8 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8894,12 +8806,12 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -8912,7 +8824,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8927,8 +8839,8 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8941,8 +8853,8 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8951,13 +8863,13 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8968,7 +8880,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9022,8 +8934,8 @@ _TAO_CORBA_EnumDef_Remote_Proxy_Broker::~_TAO_CORBA_EnumDef_Remote_Proxy_Broker
 
 _TAO_CORBA_EnumDef_Proxy_Impl&
 _TAO_CORBA_EnumDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_EnumDef *,
-  CORBA::Environment &
+  ::CORBA_EnumDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -9065,25 +8977,25 @@ void CORBA_EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_EnumDef_ptr CORBA_EnumDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_EnumDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
       if (is_a == 0)
         return CORBA_EnumDef::_nil ();
     }
-  return CORBA_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_EnumDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr CORBA_EnumDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -9138,7 +9050,7 @@ CORBA_EnumDef::_duplicate (CORBA_EnumDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
@@ -9149,7 +9061,7 @@ CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environmen
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_EnumDef::_tao_QueryInterface (ptr_arith_t type)
@@ -9222,38 +9134,38 @@ const char* CORBA_EnumDef::_interface_repository_id (void) const
 }
 
 CORBA_EnumMemberSeq * CORBA_EnumDef::members (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_EnumDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_EnumDef::members (
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_EnumDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -9283,11 +9195,11 @@ tao_CORBA_AliasDef_nil (
 
 CORBA_AliasDef_ptr
 tao_CORBA_AliasDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_AliasDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_AliasDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -9410,11 +9322,11 @@ CORBA_AliasDef_var::tao_nil (void)
 
 ::CORBA_AliasDef_ptr
 CORBA_AliasDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_AliasDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_AliasDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -9491,27 +9403,23 @@ class TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get : public TAO_Cl
 public:
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -9525,31 +9433,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9557,13 +9465,13 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (CORBA::E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9585,27 +9493,23 @@ public:
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -9619,20 +9523,20 @@ private:
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     original_type_def_ (original_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9648,12 +9552,12 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::En
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9661,13 +9565,13 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (CORBA::E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9688,8 +9592,8 @@ _TAO_CORBA_AliasDef_Remote_Proxy_Impl::_TAO_CORBA_AliasDef_Remote_Proxy_Impl (vo
 // Remote Implementation of the IDL interface methods
 
 CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_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
@@ -9731,8 +9635,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9747,8 +9651,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9760,17 +9664,17 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9786,8 +9690,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9814,8 +9718,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9824,13 +9728,13 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -9841,7 +9745,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9857,8 +9761,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_AliasDef_Remote_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
@@ -9900,8 +9804,8 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -9916,8 +9820,8 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9929,12 +9833,12 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -9947,7 +9851,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9962,8 +9866,8 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9976,8 +9880,8 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9986,13 +9890,13 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -10003,7 +9907,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10057,8 +9961,8 @@ _TAO_CORBA_AliasDef_Remote_Proxy_Broker::~_TAO_CORBA_AliasDef_Remote_Proxy_Broke
 
 _TAO_CORBA_AliasDef_Proxy_Impl&
 _TAO_CORBA_AliasDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_AliasDef *,
-  CORBA::Environment &
+  ::CORBA_AliasDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -10100,25 +10004,25 @@ void CORBA_AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_AliasDef_ptr CORBA_AliasDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_AliasDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
       if (is_a == 0)
         return CORBA_AliasDef::_nil ();
     }
-  return CORBA_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_AliasDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr CORBA_AliasDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -10173,7 +10077,7 @@ CORBA_AliasDef::_duplicate (CORBA_AliasDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
@@ -10184,7 +10088,7 @@ CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environme
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_AliasDef::_tao_QueryInterface (ptr_arith_t type)
@@ -10257,38 +10161,38 @@ const char* CORBA_AliasDef::_interface_repository_id (void) const
 }
 
 CORBA_IDLType_ptr CORBA_AliasDef::original_type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AliasDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.original_type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_AliasDef::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
   ))
 {
   _TAO_CORBA_AliasDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.original_type_def (
       this,
-      original_type_def,
-      ACE_TRY_ENV
+      original_type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -10318,11 +10222,11 @@ tao_CORBA_NativeDef_nil (
 
 CORBA_NativeDef_ptr
 tao_CORBA_NativeDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_NativeDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_NativeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10445,11 +10349,11 @@ CORBA_NativeDef_var::tao_nil (void)
 
 ::CORBA_NativeDef_ptr
 CORBA_NativeDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_NativeDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_NativeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10575,8 +10479,8 @@ _TAO_CORBA_NativeDef_Remote_Proxy_Broker::~_TAO_CORBA_NativeDef_Remote_Proxy_Bro
 
 _TAO_CORBA_NativeDef_Proxy_Impl&
 _TAO_CORBA_NativeDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_NativeDef *,
-  CORBA::Environment &
+  ::CORBA_NativeDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -10618,25 +10522,25 @@ void CORBA_NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_NativeDef_ptr CORBA_NativeDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_NativeDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
       if (is_a == 0)
         return CORBA_NativeDef::_nil ();
     }
-  return CORBA_NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_NativeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr CORBA_NativeDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -10691,7 +10595,7 @@ CORBA_NativeDef::_duplicate (CORBA_NativeDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
@@ -10702,7 +10606,7 @@ CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_NativeDef::_tao_QueryInterface (ptr_arith_t type)
@@ -10800,11 +10704,11 @@ tao_CORBA_PrimitiveDef_nil (
 
 CORBA_PrimitiveDef_ptr
 tao_CORBA_PrimitiveDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_PrimitiveDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_PrimitiveDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10927,11 +10831,11 @@ CORBA_PrimitiveDef_var::tao_nil (void)
 
 ::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PrimitiveDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_PrimitiveDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11008,27 +10912,23 @@ class TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::PrimitiveKind result);
@@ -11042,31 +10942,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11074,13 +10974,13 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11111,8 +11011,8 @@ _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::_TAO_CORBA_PrimitiveDef_Remote_Proxy_
 // Remote Implementation of the IDL interface methods
 
 CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_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
@@ -11153,8 +11053,8 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -11169,8 +11069,8 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11182,17 +11082,17 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11208,8 +11108,8 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11235,8 +11135,8 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11245,13 +11145,13 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11262,7 +11162,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11316,8 +11216,8 @@ _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Remote_Pro
 
 _TAO_CORBA_PrimitiveDef_Proxy_Impl&
 _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_PrimitiveDef *,
-  CORBA::Environment &
+  ::CORBA_PrimitiveDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -11359,25 +11259,25 @@ void CORBA_PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_PrimitiveDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ());
       if (is_a == 0)
         return CORBA_PrimitiveDef::_nil ();
     }
-  return CORBA_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_PrimitiveDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -11432,7 +11332,7 @@ CORBA_PrimitiveDef::_duplicate (CORBA_PrimitiveDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
@@ -11441,7 +11341,7 @@ CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Envir
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
@@ -11490,19 +11390,19 @@ const char* CORBA_PrimitiveDef::_interface_repository_id (void) const
 }
 
 CORBA::PrimitiveKind CORBA_PrimitiveDef::kind (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_PrimitiveDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::PrimitiveKind)0);
 
   return proxy.kind (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -11532,11 +11432,11 @@ tao_CORBA_StringDef_nil (
 
 CORBA_StringDef_ptr
 tao_CORBA_StringDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_StringDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_StringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11659,11 +11559,11 @@ CORBA_StringDef_var::tao_nil (void)
 
 ::CORBA_StringDef_ptr
 CORBA_StringDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_StringDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_StringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11740,27 +11640,23 @@ class TAO_ClientRequestInfo_CORBA_StringDef_bound_get : public TAO_ClientRequest
 public:
   TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::ULong result);
@@ -11774,31 +11670,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_StringDef_bound_get::TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11806,13 +11702,13 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11834,27 +11730,23 @@ public:
   TAO_ClientRequestInfo_CORBA_StringDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -11868,20 +11760,20 @@ private:
 TAO_ClientRequestInfo_CORBA_StringDef_bound_set::TAO_ClientRequestInfo_CORBA_StringDef_bound_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11897,12 +11789,12 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11910,13 +11802,13 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11937,8 +11829,8 @@ _TAO_CORBA_StringDef_Remote_Proxy_Impl::_TAO_CORBA_StringDef_Remote_Proxy_Impl (
 // Remote Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_StringDef_Remote_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
@@ -11979,8 +11871,8 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_StringDef_bound_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -11995,8 +11887,8 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12008,17 +11900,17 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12034,8 +11926,8 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12061,8 +11953,8 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12071,13 +11963,13 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -12088,7 +11980,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12104,8 +11996,8 @@ return _tao_retval;
 
 void _TAO_CORBA_StringDef_Remote_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
@@ -12147,8 +12039,8 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       TAO_ClientRequestInfo_CORBA_StringDef_bound_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -12163,8 +12055,8 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12176,12 +12068,12 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -12194,7 +12086,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12209,8 +12101,8 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12223,8 +12115,8 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12233,13 +12125,13 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -12250,7 +12142,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12304,8 +12196,8 @@ _TAO_CORBA_StringDef_Remote_Proxy_Broker::~_TAO_CORBA_StringDef_Remote_Proxy_Bro
 
 _TAO_CORBA_StringDef_Proxy_Impl&
 _TAO_CORBA_StringDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_StringDef *,
-  CORBA::Environment &
+  ::CORBA_StringDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -12347,25 +12239,25 @@ void CORBA_StringDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_StringDef_ptr CORBA_StringDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_StringDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_StringDef::_nil ());
       if (is_a == 0)
         return CORBA_StringDef::_nil ();
     }
-  return CORBA_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_StringDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr CORBA_StringDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -12420,7 +12312,7 @@ CORBA_StringDef::_duplicate (CORBA_StringDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
@@ -12429,7 +12321,7 @@ CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_StringDef::_tao_QueryInterface (ptr_arith_t type)
@@ -12478,38 +12370,38 @@ const char* CORBA_StringDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_StringDef::bound (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.bound (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_StringDef::bound (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.bound (
       this,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12539,11 +12431,11 @@ tao_CORBA_WstringDef_nil (
 
 CORBA_WstringDef_ptr
 tao_CORBA_WstringDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_WstringDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_WstringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12666,11 +12558,11 @@ CORBA_WstringDef_var::tao_nil (void)
 
 ::CORBA_WstringDef_ptr
 CORBA_WstringDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_WstringDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_WstringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12747,27 +12639,23 @@ class TAO_ClientRequestInfo_CORBA_WstringDef_bound_get : public TAO_ClientReques
 public:
   TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::ULong result);
@@ -12781,31 +12669,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -12813,13 +12701,13 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -12841,27 +12729,23 @@ public:
   TAO_ClientRequestInfo_CORBA_WstringDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -12875,20 +12759,20 @@ private:
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::TAO_ClientRequestInfo_CORBA_WstringDef_bound_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -12904,12 +12788,12 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -12917,13 +12801,13 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -12944,8 +12828,8 @@ _TAO_CORBA_WstringDef_Remote_Proxy_Impl::_TAO_CORBA_WstringDef_Remote_Proxy_Impl
 // Remote Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_WstringDef_Remote_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
@@ -12986,8 +12870,8 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_WstringDef_bound_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -13002,8 +12886,8 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -13015,17 +12899,17 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -13041,8 +12925,8 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -13068,8 +12952,8 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -13078,13 +12962,13 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -13095,7 +12979,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -13111,8 +12995,8 @@ return _tao_retval;
 
 void _TAO_CORBA_WstringDef_Remote_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
@@ -13154,8 +13038,8 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       TAO_ClientRequestInfo_CORBA_WstringDef_bound_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -13170,8 +13054,8 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -13183,12 +13067,12 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -13201,7 +13085,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -13216,8 +13100,8 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -13230,8 +13114,8 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -13240,13 +13124,13 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -13257,7 +13141,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -13311,8 +13195,8 @@ _TAO_CORBA_WstringDef_Remote_Proxy_Broker::~_TAO_CORBA_WstringDef_Remote_Proxy_B
 
 _TAO_CORBA_WstringDef_Proxy_Impl&
 _TAO_CORBA_WstringDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_WstringDef *,
-  CORBA::Environment &
+  ::CORBA_WstringDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -13354,25 +13238,25 @@ void CORBA_WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_WstringDef_ptr CORBA_WstringDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_WstringDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_WstringDef::_nil ());
       if (is_a == 0)
         return CORBA_WstringDef::_nil ();
     }
-  return CORBA_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_WstringDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr CORBA_WstringDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -13427,7 +13311,7 @@ CORBA_WstringDef::_duplicate (CORBA_WstringDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
@@ -13436,7 +13320,7 @@ CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environ
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_WstringDef::_tao_QueryInterface (ptr_arith_t type)
@@ -13485,38 +13369,38 @@ const char* CORBA_WstringDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_WstringDef::bound (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_WstringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.bound (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_WstringDef::bound (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_WstringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.bound (
       this,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -13546,11 +13430,11 @@ tao_CORBA_SequenceDef_nil (
 
 CORBA_SequenceDef_ptr
 tao_CORBA_SequenceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_SequenceDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_SequenceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13673,11 +13557,11 @@ CORBA_SequenceDef_var::tao_nil (void)
 
 ::CORBA_SequenceDef_ptr
 CORBA_SequenceDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_SequenceDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_SequenceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13754,27 +13638,23 @@ class TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::ULong result);
@@ -13788,31 +13668,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -13820,13 +13700,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -13848,27 +13728,23 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -13882,20 +13758,20 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -13911,12 +13787,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -13924,13 +13800,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -13941,27 +13817,23 @@ class TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_Clie
 public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -13975,31 +13847,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14007,13 +13879,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (CORBA::Env
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14034,27 +13906,23 @@ class TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get : public TAO_
 public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -14068,31 +13936,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14100,13 +13968,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (CORBA:
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14128,27 +13996,23 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -14162,20 +14026,20 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     element_type_def_ (element_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14191,12 +14055,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14204,13 +14068,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (CORBA:
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14231,8 +14095,8 @@ _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::_TAO_CORBA_SequenceDef_Remote_Proxy_Im
 // Remote Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_SequenceDef_Remote_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
@@ -14273,8 +14137,8 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -14289,8 +14153,8 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14302,17 +14166,17 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14328,8 +14192,8 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14355,8 +14219,8 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14365,13 +14229,13 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -14382,7 +14246,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14398,8 +14262,8 @@ return _tao_retval;
 
 void _TAO_CORBA_SequenceDef_Remote_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
@@ -14441,8 +14305,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -14457,8 +14321,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14470,12 +14334,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -14488,7 +14352,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14503,8 +14367,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14517,8 +14381,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14527,13 +14391,13 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -14544,7 +14408,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14559,8 +14423,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_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
@@ -14602,8 +14466,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -14618,8 +14482,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14631,17 +14495,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14657,8 +14521,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14685,8 +14549,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14695,13 +14559,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -14712,7 +14576,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14727,8 +14591,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_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
@@ -14770,8 +14634,8 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -14786,8 +14650,8 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14799,17 +14663,17 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14825,8 +14689,8 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14853,8 +14717,8 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14863,13 +14727,13 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -14880,7 +14744,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14896,8 +14760,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_SequenceDef_Remote_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
@@ -14939,8 +14803,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        element_type_def,
-        ACE_TRY_ENV
+        element_type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -14955,8 +14819,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14968,12 +14832,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -14986,7 +14850,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -15001,8 +14865,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -15015,8 +14879,8 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -15025,13 +14889,13 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -15042,7 +14906,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -15096,8 +14960,8 @@ _TAO_CORBA_SequenceDef_Remote_Proxy_Broker::~_TAO_CORBA_SequenceDef_Remote_Proxy
 
 _TAO_CORBA_SequenceDef_Proxy_Impl&
 _TAO_CORBA_SequenceDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_SequenceDef *,
-  CORBA::Environment &
+  ::CORBA_SequenceDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -15139,25 +15003,25 @@ void CORBA_SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_SequenceDef_ptr CORBA_SequenceDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_SequenceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
       if (is_a == 0)
         return CORBA_SequenceDef::_nil ();
     }
-  return CORBA_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_SequenceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr CORBA_SequenceDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -15212,7 +15076,7 @@ CORBA_SequenceDef::_duplicate (CORBA_SequenceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
@@ -15221,7 +15085,7 @@ CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Enviro
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_SequenceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -15270,91 +15134,91 @@ const char* CORBA_SequenceDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_SequenceDef::bound (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.bound (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_SequenceDef::bound (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.bound (
       this,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::TypeCode_ptr CORBA_SequenceDef::element_type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_SequenceDef::element_type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_SequenceDef::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
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.element_type_def (
       this,
-      element_type_def,
-      ACE_TRY_ENV
+      element_type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -15384,11 +15248,11 @@ tao_CORBA_ArrayDef_nil (
 
 CORBA_ArrayDef_ptr
 tao_CORBA_ArrayDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ArrayDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ArrayDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15511,11 +15375,11 @@ CORBA_ArrayDef_var::tao_nil (void)
 
 ::CORBA_ArrayDef_ptr
 CORBA_ArrayDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ArrayDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ArrayDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15592,27 +15456,23 @@ class TAO_ClientRequestInfo_CORBA_ArrayDef_length_get : public TAO_ClientRequest
 public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::ULong result);
@@ -15626,31 +15486,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15658,13 +15518,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15686,27 +15546,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_length_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -15720,20 +15576,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::TAO_ClientRequestInfo_CORBA_ArrayDef_length_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & length,
-    CORBA::Environment &
+    const CORBA::ULong & length
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     length_ (length)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15749,12 +15605,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15762,13 +15618,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15779,27 +15635,23 @@ class TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ClientR
 public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -15813,31 +15665,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15845,13 +15697,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15872,27 +15724,23 @@ class TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get : public TAO_Cli
 public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -15906,31 +15754,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15938,13 +15786,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (CORBA::En
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -15966,27 +15814,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -16000,20 +15844,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     element_type_def_ (element_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -16029,12 +15873,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -16042,13 +15886,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (CORBA::En
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -16069,8 +15913,8 @@ _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (vo
 // Remote Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_ArrayDef_Remote_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
@@ -16111,8 +15955,8 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_length_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -16127,8 +15971,8 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16140,17 +15984,17 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16166,8 +16010,8 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16193,8 +16037,8 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16203,13 +16047,13 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -16220,7 +16064,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16236,8 +16080,8 @@ return _tao_retval;
 
 void _TAO_CORBA_ArrayDef_Remote_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
@@ -16279,8 +16123,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       TAO_ClientRequestInfo_CORBA_ArrayDef_length_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        length,
-        ACE_TRY_ENV
+        length
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -16295,8 +16139,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16308,12 +16152,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -16326,7 +16170,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16341,8 +16185,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16355,8 +16199,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16365,13 +16209,13 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -16382,7 +16226,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16397,8 +16241,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_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
@@ -16440,8 +16284,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -16456,8 +16300,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16469,17 +16313,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16495,8 +16339,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16523,8 +16367,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16533,13 +16377,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -16550,7 +16394,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16565,8 +16409,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_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
@@ -16608,8 +16452,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -16624,8 +16468,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16637,17 +16481,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16663,8 +16507,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16691,8 +16535,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16701,13 +16545,13 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -16718,7 +16562,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16734,8 +16578,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ArrayDef_Remote_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
@@ -16777,8 +16621,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        element_type_def,
-        ACE_TRY_ENV
+        element_type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -16793,8 +16637,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16806,12 +16650,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -16824,7 +16668,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16839,8 +16683,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16853,8 +16697,8 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16863,13 +16707,13 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -16880,7 +16724,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16934,8 +16778,8 @@ _TAO_CORBA_ArrayDef_Remote_Proxy_Broker::~_TAO_CORBA_ArrayDef_Remote_Proxy_Broke
 
 _TAO_CORBA_ArrayDef_Proxy_Impl&
 _TAO_CORBA_ArrayDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ArrayDef *,
-  CORBA::Environment &
+  ::CORBA_ArrayDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -16977,25 +16821,25 @@ void CORBA_ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_ArrayDef_ptr CORBA_ArrayDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ArrayDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
       if (is_a == 0)
         return CORBA_ArrayDef::_nil ();
     }
-  return CORBA_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ArrayDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr CORBA_ArrayDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -17050,7 +16894,7 @@ CORBA_ArrayDef::_duplicate (CORBA_ArrayDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
@@ -17059,7 +16903,7 @@ CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environme
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ArrayDef::_tao_QueryInterface (ptr_arith_t type)
@@ -17108,91 +16952,91 @@ const char* CORBA_ArrayDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_ArrayDef::length (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.length (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ArrayDef::length (
-    CORBA::ULong length,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong length
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.length (
       this,
-      length,
-      ACE_TRY_ENV
+      length
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::TypeCode_ptr CORBA_ArrayDef::element_type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_ArrayDef::element_type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ArrayDef::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
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.element_type_def (
       this,
-      element_type_def,
-      ACE_TRY_ENV
+      element_type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -17222,11 +17066,11 @@ tao_CORBA_ExceptionDef_nil (
 
 CORBA_ExceptionDef_ptr
 tao_CORBA_ExceptionDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ExceptionDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ExceptionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -17349,11 +17193,11 @@ CORBA_ExceptionDef_var::tao_nil (void)
 
 ::CORBA_ExceptionDef_ptr
 CORBA_ExceptionDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ExceptionDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ExceptionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -17430,27 +17274,23 @@ class TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -17464,31 +17304,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17496,13 +17336,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17523,27 +17363,23 @@ class TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get : public TAO_ClientRe
 public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_StructMemberSeq * result);
@@ -17557,31 +17393,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17589,13 +17425,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17617,27 +17453,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -17651,20 +17483,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17680,12 +17512,12 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17693,13 +17525,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17720,8 +17552,8 @@ _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::_TAO_CORBA_ExceptionDef_Remote_Proxy_
 // Remote Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_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
@@ -17763,8 +17595,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17779,8 +17611,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17792,17 +17624,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17818,8 +17650,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -17846,8 +17678,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17856,13 +17688,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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,7 +17705,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -17888,8 +17720,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_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
@@ -17932,8 +17764,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17948,8 +17780,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17961,17 +17793,17 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17987,8 +17819,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18015,8 +17847,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18025,13 +17857,13 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18042,7 +17874,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18058,8 +17890,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ExceptionDef_Remote_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
@@ -18101,8 +17933,8 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -18117,8 +17949,8 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18130,12 +17962,12 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -18148,7 +17980,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18163,8 +17995,8 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18177,8 +18009,8 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18187,13 +18019,13 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18204,7 +18036,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18258,8 +18090,8 @@ _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Remote_Pro
 
 _TAO_CORBA_ExceptionDef_Proxy_Impl&
 _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ExceptionDef *,
-  CORBA::Environment &
+  ::CORBA_ExceptionDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -18303,25 +18135,25 @@ void CORBA_ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ExceptionDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
       if (is_a == 0)
         return CORBA_ExceptionDef::_nil ();
     }
-  return CORBA_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ExceptionDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -18376,7 +18208,7 @@ CORBA_ExceptionDef::_duplicate (CORBA_ExceptionDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
@@ -18386,7 +18218,7 @@ CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Envir
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
@@ -18447,55 +18279,55 @@ const char* CORBA_ExceptionDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_ExceptionDef::type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_StructMemberSeq * CORBA_ExceptionDef::members (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ExceptionDef::members (
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -18578,12 +18410,12 @@ _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_shrink_buffer (CORBA::ULo
 void
 _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, target);
-  *tmp = CORBA_ExceptionDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = CORBA_ExceptionDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -18767,11 +18599,11 @@ tao_CORBA_AttributeDef_nil (
 
 CORBA_AttributeDef_ptr
 tao_CORBA_AttributeDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_AttributeDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_AttributeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -18894,11 +18726,11 @@ CORBA_AttributeDef_var::tao_nil (void)
 
 ::CORBA_AttributeDef_ptr
 CORBA_AttributeDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_AttributeDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_AttributeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -18975,27 +18807,23 @@ class TAO_ClientRequestInfo_CORBA_AttributeDef_type_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -19009,31 +18837,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19041,13 +18869,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19068,27 +18896,23 @@ class TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get : public TAO_ClientR
 public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -19102,31 +18926,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19134,13 +18958,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19162,27 +18986,23 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -19196,20 +19016,20 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     type_def_ (type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19225,12 +19045,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19238,13 +19058,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19255,27 +19075,23 @@ class TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::AttributeMode result);
@@ -19289,31 +19105,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19321,13 +19137,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19349,27 +19165,23 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -19383,20 +19195,20 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     mode_ (mode)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19412,12 +19224,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19425,13 +19237,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -19452,8 +19264,8 @@ _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::_TAO_CORBA_AttributeDef_Remote_Proxy_
 // Remote Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_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
@@ -19495,8 +19307,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -19511,8 +19323,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19524,17 +19336,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19550,8 +19362,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19578,8 +19390,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19588,13 +19400,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -19605,7 +19417,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19620,8 +19432,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_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
@@ -19663,8 +19475,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -19679,8 +19491,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19692,17 +19504,17 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19718,8 +19530,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19746,8 +19558,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19756,13 +19568,13 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -19773,7 +19585,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19789,8 +19601,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_AttributeDef_Remote_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
@@ -19832,8 +19644,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -19848,8 +19660,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19861,12 +19673,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -19879,7 +19691,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19894,8 +19706,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19908,8 +19720,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19918,13 +19730,13 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -19935,7 +19747,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19950,8 +19762,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 }
 
 CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_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
@@ -19992,8 +19804,8 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -20008,8 +19820,8 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -20021,17 +19833,17 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -20047,8 +19859,8 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -20074,8 +19886,8 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -20084,13 +19896,13 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -20101,7 +19913,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -20117,8 +19929,8 @@ return _tao_retval;
 
 void _TAO_CORBA_AttributeDef_Remote_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
@@ -20160,8 +19972,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -20176,8 +19988,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -20189,12 +20001,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -20207,7 +20019,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -20222,8 +20034,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -20236,8 +20048,8 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -20246,13 +20058,13 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -20263,7 +20075,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -20317,8 +20129,8 @@ _TAO_CORBA_AttributeDef_Remote_Proxy_Broker::~_TAO_CORBA_AttributeDef_Remote_Pro
 
 _TAO_CORBA_AttributeDef_Proxy_Impl&
 _TAO_CORBA_AttributeDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_AttributeDef *,
-  CORBA::Environment &
+  ::CORBA_AttributeDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -20360,25 +20172,25 @@ void CORBA_AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_AttributeDef_ptr CORBA_AttributeDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_AttributeDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
       if (is_a == 0)
         return CORBA_AttributeDef::_nil ();
     }
-  return CORBA_AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_AttributeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AttributeDef_ptr CORBA_AttributeDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -20433,7 +20245,7 @@ CORBA_AttributeDef::_duplicate (CORBA_AttributeDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
@@ -20442,7 +20254,7 @@ CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Envir
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_AttributeDef::_tao_QueryInterface (ptr_arith_t type)
@@ -20491,91 +20303,91 @@ const char* CORBA_AttributeDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_AttributeDef::type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_AttributeDef::type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_AttributeDef::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
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.type_def (
       this,
-      type_def,
-      ACE_TRY_ENV
+      type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::AttributeMode CORBA_AttributeDef::mode (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::AttributeMode)0);
 
   return proxy.mode (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_AttributeDef::mode (
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.mode (
       this,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -20761,11 +20573,11 @@ tao_CORBA_OperationDef_nil (
 
 CORBA_OperationDef_ptr
 tao_CORBA_OperationDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_OperationDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_OperationDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -20888,11 +20700,11 @@ CORBA_OperationDef_var::tao_nil (void)
 
 ::CORBA_OperationDef_ptr
 CORBA_OperationDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_OperationDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_OperationDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -20969,27 +20781,23 @@ class TAO_ClientRequestInfo_CORBA_OperationDef_result_get : public TAO_ClientReq
 public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -21003,31 +20811,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_OperationDef_result_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21035,13 +20843,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21062,27 +20870,23 @@ class TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get : public TAO_Clien
 public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -21096,31 +20900,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21128,13 +20932,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21156,27 +20960,23 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -21190,20 +20990,20 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     result_def_ (result_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21219,12 +21019,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21232,13 +21032,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21249,27 +21049,23 @@ class TAO_ClientRequestInfo_CORBA_OperationDef_params_get : public TAO_ClientReq
 public:
   TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ParDescriptionSeq * result);
@@ -21283,31 +21079,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21315,13 +21111,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21343,27 +21139,23 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_params_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -21377,20 +21169,20 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_params_set::TAO_ClientRequestInfo_CORBA_OperationDef_params_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     params_ (params)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21406,12 +21198,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21419,13 +21211,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21436,27 +21228,23 @@ class TAO_ClientRequestInfo_CORBA_OperationDef_mode_get : public TAO_ClientReque
 public:
   TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::OperationMode result);
@@ -21470,31 +21258,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21502,13 +21290,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21530,27 +21318,23 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_mode_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -21564,20 +21348,20 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::TAO_ClientRequestInfo_CORBA_OperationDef_mode_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::OperationMode & mode,
-    CORBA::Environment &
+    CORBA::OperationMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     mode_ (mode)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21593,12 +21377,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21606,13 +21390,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21623,27 +21407,23 @@ class TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ClientR
 public:
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ContextIdSeq * result);
@@ -21657,31 +21437,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21689,13 +21469,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21717,27 +21497,23 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -21751,20 +21527,20 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     contexts_ (contexts)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21780,12 +21556,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21793,13 +21569,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21810,27 +21586,23 @@ class TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_Clien
 public:
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ExceptionDefSeq * result);
@@ -21844,31 +21616,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21876,13 +21648,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21904,27 +21676,23 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -21938,20 +21706,20 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     exceptions_ (exceptions)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21967,12 +21735,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -21980,13 +21748,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -22007,8 +21775,8 @@ _TAO_CORBA_OperationDef_Remote_Proxy_Impl::_TAO_CORBA_OperationDef_Remote_Proxy_
 // Remote Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_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
@@ -22050,8 +21818,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -22066,8 +21834,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22079,17 +21847,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22105,8 +21873,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22133,8 +21901,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22143,13 +21911,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -22160,7 +21928,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22175,8 +21943,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_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
@@ -22218,8 +21986,8 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -22234,8 +22002,8 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22247,17 +22015,17 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22273,8 +22041,8 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22301,8 +22069,8 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22311,13 +22079,13 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -22328,7 +22096,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22344,8 +22112,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_OperationDef_Remote_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
@@ -22387,8 +22155,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        result_def,
-        ACE_TRY_ENV
+        result_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -22403,8 +22171,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22416,12 +22184,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -22434,7 +22202,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22449,8 +22217,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22463,8 +22231,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22473,13 +22241,13 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -22490,7 +22258,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22505,8 +22273,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 }
 
 CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_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
@@ -22549,8 +22317,8 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_params_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -22565,8 +22333,8 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22578,17 +22346,17 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22604,8 +22372,8 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22632,8 +22400,8 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22642,13 +22410,13 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -22659,7 +22427,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22675,8 +22443,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_OperationDef_Remote_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
@@ -22718,8 +22486,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       TAO_ClientRequestInfo_CORBA_OperationDef_params_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        params,
-        ACE_TRY_ENV
+        params
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -22734,8 +22502,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22747,12 +22515,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -22765,7 +22533,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22780,8 +22548,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22794,8 +22562,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22804,13 +22572,13 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -22821,7 +22589,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22836,8 +22604,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 }
 
 CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_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
@@ -22878,8 +22646,8 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_mode_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -22894,8 +22662,8 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22907,17 +22675,17 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22933,8 +22701,8 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22960,8 +22728,8 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22970,13 +22738,13 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -22987,7 +22755,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23003,8 +22771,8 @@ return _tao_retval;
 
 void _TAO_CORBA_OperationDef_Remote_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
@@ -23046,8 +22814,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       TAO_ClientRequestInfo_CORBA_OperationDef_mode_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -23062,8 +22830,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23075,12 +22843,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -23093,7 +22861,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23108,8 +22876,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23122,8 +22890,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23132,13 +22900,13 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -23149,7 +22917,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23164,8 +22932,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 }
 
 CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_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
@@ -23208,8 +22976,8 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -23224,8 +22992,8 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23237,17 +23005,17 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23263,8 +23031,8 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23291,8 +23059,8 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23301,13 +23069,13 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -23318,7 +23086,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23334,8 +23102,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_OperationDef_Remote_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
@@ -23377,8 +23145,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -23393,8 +23161,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23406,12 +23174,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -23424,7 +23192,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23439,8 +23207,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23453,8 +23221,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23463,13 +23231,13 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -23480,7 +23248,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23495,8 +23263,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 }
 
 CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_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
@@ -23539,8 +23307,8 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -23555,8 +23323,8 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23568,17 +23336,17 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23594,8 +23362,8 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23622,8 +23390,8 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23632,13 +23400,13 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -23649,7 +23417,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23665,8 +23433,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_OperationDef_Remote_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
@@ -23708,8 +23476,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -23724,8 +23492,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23737,12 +23505,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -23755,7 +23523,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23770,8 +23538,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23784,8 +23552,8 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23794,13 +23562,13 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -23811,7 +23579,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23865,8 +23633,8 @@ _TAO_CORBA_OperationDef_Remote_Proxy_Broker::~_TAO_CORBA_OperationDef_Remote_Pro
 
 _TAO_CORBA_OperationDef_Proxy_Impl&
 _TAO_CORBA_OperationDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_OperationDef *,
-  CORBA::Environment &
+  ::CORBA_OperationDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -23908,25 +23676,25 @@ void CORBA_OperationDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_OperationDef_ptr CORBA_OperationDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_OperationDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
       if (is_a == 0)
         return CORBA_OperationDef::_nil ();
     }
-  return CORBA_OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_OperationDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_OperationDef_ptr CORBA_OperationDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -23981,7 +23749,7 @@ CORBA_OperationDef::_duplicate (CORBA_OperationDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
@@ -23990,7 +23758,7 @@ CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value, CORBA::Envir
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_OperationDef::_tao_QueryInterface (ptr_arith_t type)
@@ -24039,199 +23807,199 @@ const char* CORBA_OperationDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_OperationDef::result (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.result (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_OperationDef::result_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.result_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::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
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.result_def (
       this,
-      result_def,
-      ACE_TRY_ENV
+      result_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ParDescriptionSeq * CORBA_OperationDef::params (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.params (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::params (
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.params (
       this,
-      params,
-      ACE_TRY_ENV
+      params
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::OperationMode CORBA_OperationDef::mode (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::OperationMode)0);
 
   return proxy.mode (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::mode (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.mode (
       this,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ContextIdSeq * CORBA_OperationDef::contexts (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.contexts (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::contexts (
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.contexts (
       this,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ExceptionDefSeq * CORBA_OperationDef::exceptions (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.exceptions (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::exceptions (
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.exceptions (
       this,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -24509,11 +24277,11 @@ tao_CORBA_InterfaceDef_nil (
 
 CORBA_InterfaceDef_ptr
 tao_CORBA_InterfaceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_InterfaceDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_InterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -24636,11 +24404,11 @@ CORBA_InterfaceDef_var::tao_nil (void)
 
 ::CORBA_InterfaceDef_ptr
 CORBA_InterfaceDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_InterfaceDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_InterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -24717,27 +24485,23 @@ class TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get : public TAO_
 public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -24751,31 +24515,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -24783,13 +24547,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (CORBA:
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -24811,27 +24575,23 @@ public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -24845,20 +24605,20 @@ private:
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     base_interfaces_ (base_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -24874,12 +24634,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -24887,13 +24647,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (CORBA:
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -24905,27 +24665,23 @@ public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA::Boolean result);
@@ -24941,20 +24697,20 @@ private:
 TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * interface_id,
-    CORBA::Environment &
+    const char * interface_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     interface_id_ (interface_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -24970,12 +24726,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &AC
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -24983,13 +24739,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (CORBA::Environment &A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25010,27 +24766,23 @@ class TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface : public TAO_C
 public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_InterfaceDef::FullInterfaceDescription * result);
@@ -25044,31 +24796,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25076,13 +24828,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (CORBA::
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25108,27 +24860,23 @@ 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));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -25152,8 +24900,8 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -25164,12 +24912,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25197,12 +24945,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25210,13 +24958,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (CORBA::En
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25245,27 +24993,23 @@ 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));
 
   void result (CORBA_OperationDef_ptr result);
@@ -25295,8 +25039,8 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -25310,12 +25054,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25352,12 +25096,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25365,13 +25109,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (CORBA::En
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -25402,8 +25146,8 @@ _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_InterfaceDef_Remote_Proxy_
 // Remote Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_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
@@ -25446,8 +25190,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -25462,8 +25206,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25475,17 +25219,17 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25501,8 +25245,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25529,8 +25273,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25539,13 +25283,13 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -25556,7 +25300,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -25572,8 +25316,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_InterfaceDef_Remote_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
@@ -25615,8 +25359,8 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -25631,8 +25375,8 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25644,12 +25388,12 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -25662,7 +25406,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25677,8 +25421,8 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25691,8 +25435,8 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25701,13 +25445,13 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -25718,7 +25462,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -25734,8 +25478,8 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
 
 CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_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
@@ -25777,8 +25521,8 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
       TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a ri (
         &_tao_call,
         _collocated_tao_target_,
-        interface_id,
-        ACE_TRY_ENV
+        interface_id
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -25793,8 +25537,8 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25806,12 +25550,12 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -25825,7 +25569,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25841,8 +25585,8 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25868,8 +25612,8 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25878,13 +25622,13 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -25895,7 +25639,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -25910,8 +25654,8 @@ return _tao_retval;
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_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
@@ -25953,8 +25697,8 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -25969,8 +25713,8 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25982,17 +25726,17 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -26008,8 +25752,8 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -26036,8 +25780,8 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -26046,13 +25790,13 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -26063,7 +25807,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -26083,8 +25827,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
     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
@@ -26131,8 +25875,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
         name,
         version,
         type,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -26147,8 +25891,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -26160,12 +25904,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -26183,7 +25927,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -26199,8 +25943,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -26227,8 +25971,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -26237,13 +25981,13 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -26254,7 +25998,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -26277,8 +26021,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
     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
@@ -26328,8 +26072,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
         mode,
         params,
         exceptions,
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -26344,8 +26088,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -26357,12 +26101,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -26383,7 +26127,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -26399,8 +26143,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -26427,8 +26171,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -26437,13 +26181,13 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -26454,7 +26198,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -26508,8 +26252,8 @@ _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Remote_Pro
 
 _TAO_CORBA_InterfaceDef_Proxy_Impl&
 _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_InterfaceDef *,
-  CORBA::Environment &
+  ::CORBA_InterfaceDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -26555,25 +26299,25 @@ void CORBA_InterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_InterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
       if (is_a == 0)
         return CORBA_InterfaceDef::_nil ();
     }
-  return CORBA_InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_InterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -26628,7 +26372,7 @@ CORBA_InterfaceDef::_duplicate (CORBA_InterfaceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
@@ -26639,7 +26383,7 @@ CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Envir
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -26712,57 +26456,57 @@ const char* CORBA_InterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDefSeq * CORBA_InterfaceDef::base_interfaces (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_interfaces (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_InterfaceDef::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
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.base_interfaces (
       this,
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_InterfaceDef::is_a (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
-      interface_id,
-      ACE_TRY_ENV
+      interface_id
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -27693,19 +27437,19 @@ void CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_t
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription * CORBA_InterfaceDef::describe_interface (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.describe_interface (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -27714,15 +27458,15 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::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
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_attribute (
@@ -27731,8 +27475,8 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute (
       name,
       version,
       type,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -27744,15 +27488,15 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::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
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_operation (
@@ -27764,8 +27508,8 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
       mode,
       params,
       exceptions,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -27801,11 +27545,11 @@ tao_CORBA_AbstractInterfaceDef_nil (
 
 CORBA_AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_AbstractInterfaceDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_AbstractInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -27928,11 +27672,11 @@ CORBA_AbstractInterfaceDef_var::tao_nil (void)
 
 ::CORBA_AbstractInterfaceDef_ptr
 CORBA_AbstractInterfaceDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_AbstractInterfaceDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_AbstractInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -28058,8 +27802,8 @@ _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_AbstractInterfa
 
 _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl&
 _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_AbstractInterfaceDef *,
-  CORBA::Environment &
+  ::CORBA_AbstractInterfaceDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -28101,25 +27845,25 @@ void CORBA_AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_AbstractInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
       if (is_a == 0)
         return CORBA_AbstractInterfaceDef::_nil ();
     }
-  return CORBA_AbstractInterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_AbstractInterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -28174,7 +27918,7 @@ CORBA_AbstractInterfaceDef::_duplicate (CORBA_AbstractInterfaceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
@@ -28186,7 +27930,7 @@ CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value, CORB
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -28296,11 +28040,11 @@ tao_CORBA_LocalInterfaceDef_nil (
 
 CORBA_LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_LocalInterfaceDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_LocalInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -28423,11 +28167,11 @@ CORBA_LocalInterfaceDef_var::tao_nil (void)
 
 ::CORBA_LocalInterfaceDef_ptr
 CORBA_LocalInterfaceDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_LocalInterfaceDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_LocalInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -28553,8 +28297,8 @@ _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_LocalInterfaceDef_
 
 _TAO_CORBA_LocalInterfaceDef_Proxy_Impl&
 _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_LocalInterfaceDef *,
-  CORBA::Environment &
+  ::CORBA_LocalInterfaceDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -28596,25 +28340,25 @@ void CORBA_LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_LocalInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
       if (is_a == 0)
         return CORBA_LocalInterfaceDef::_nil ();
     }
-  return CORBA_LocalInterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_LocalInterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -28669,7 +28413,7 @@ CORBA_LocalInterfaceDef::_duplicate (CORBA_LocalInterfaceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
@@ -28681,7 +28425,7 @@ CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value, CORBA::
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -28782,7 +28526,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28828,7 +28572,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Repository_ptr &_t
     _tao_elem = CORBA_Repository::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28889,7 +28633,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ModuleDef_ptr &_ta
     _tao_elem = CORBA_ModuleDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28964,7 +28708,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ModuleDescri
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29033,7 +28777,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstantDef_ptr &_
     _tao_elem = CORBA_ConstantDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29108,7 +28852,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ConstantDesc
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29177,7 +28921,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StructDef_ptr &_ta
     _tao_elem = CORBA_StructDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29238,7 +28982,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_UnionDef_ptr &_tao
     _tao_elem = CORBA_UnionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29299,7 +29043,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_EnumDef_ptr &_tao_
     _tao_elem = CORBA_EnumDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29360,7 +29104,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AliasDef_ptr &_tao
     _tao_elem = CORBA_AliasDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29421,7 +29165,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_NativeDef_ptr &_ta
     _tao_elem = CORBA_NativeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29482,7 +29226,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PrimitiveDef_ptr &
     _tao_elem = CORBA_PrimitiveDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29543,7 +29287,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringDef_ptr &_ta
     _tao_elem = CORBA_StringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29604,7 +29348,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WstringDef_ptr &_t
     _tao_elem = CORBA_WstringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29665,7 +29409,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_SequenceDef_ptr &_
     _tao_elem = CORBA_SequenceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29726,7 +29470,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ArrayDef_ptr &_tao
     _tao_elem = CORBA_ArrayDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29787,7 +29531,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExceptionDef_ptr &
     _tao_elem = CORBA_ExceptionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29862,7 +29606,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29953,7 +29697,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDef
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30044,7 +29788,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExcDescripti
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30107,7 +29851,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30153,7 +29897,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AttributeDef_ptr &
     _tao_elem = CORBA_AttributeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30228,7 +29972,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttributeDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30291,7 +30035,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30331,7 +30075,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30391,7 +30135,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParameterDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30482,7 +30226,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParDescripti
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30573,7 +30317,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContextIdSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30642,7 +30386,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OperationDef_ptr &
     _tao_elem = CORBA_OperationDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30717,7 +30461,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OperationDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30808,7 +30552,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_RepositoryId
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30899,7 +30643,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OpDescriptio
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30990,7 +30734,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttrDescript
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31059,7 +30803,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDef_ptr &
     _tao_elem = CORBA_InterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31134,7 +30878,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31217,7 +30961,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31286,7 +31030,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AbstractInterfaceD
     _tao_elem = CORBA_AbstractInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31347,7 +31091,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_LocalInterfaceDef_
     _tao_elem = CORBA_LocalInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31407,8 +31151,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_Repository::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31443,8 +31187,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ModuleDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31479,8 +31223,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ConstantDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31515,8 +31259,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_StructDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31551,8 +31295,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_UnionDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31587,8 +31331,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_EnumDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31623,8 +31367,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_AliasDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31659,8 +31403,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_NativeDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31695,8 +31439,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_PrimitiveDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31731,8 +31475,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_StringDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31767,8 +31511,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_WstringDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31803,8 +31547,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_SequenceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31839,8 +31583,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ArrayDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31875,8 +31619,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ExceptionDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31995,8 +31739,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_AttributeDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -32115,8 +31859,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_OperationDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -32277,8 +32021,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_InterfaceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -32313,8 +32057,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_AbstractInterfaceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -32349,8 +32093,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_LocalInterfaceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index aad9ad49194..992841af4ef 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -93,8 +93,8 @@ public:
   static void tao_release (CORBA_PrimitiveDef_ptr);
   static CORBA_PrimitiveDef_ptr tao_nil (void);
   static CORBA_PrimitiveDef_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -172,8 +172,8 @@ public:
   static void tao_release (CORBA_StringDef_ptr);
   static CORBA_StringDef_ptr tao_nil (void);
   static CORBA_StringDef_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -251,8 +251,8 @@ public:
   static void tao_release (CORBA_SequenceDef_ptr);
   static CORBA_SequenceDef_ptr tao_nil (void);
   static CORBA_SequenceDef_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -330,8 +330,8 @@ public:
   static void tao_release (CORBA_ArrayDef_ptr);
   static CORBA_ArrayDef_ptr tao_nil (void);
   static CORBA_ArrayDef_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -409,8 +409,8 @@ public:
   static void tao_release (CORBA_WstringDef_ptr);
   static CORBA_WstringDef_ptr tao_nil (void);
   static CORBA_WstringDef_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -488,8 +488,8 @@ public:
   static void tao_release (CORBA_FixedDef_ptr);
   static CORBA_FixedDef_ptr tao_nil (void);
   static CORBA_FixedDef_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -566,8 +566,8 @@ public:
   static void tao_release (CORBA_Repository_ptr);
   static CORBA_Repository_ptr tao_nil (void);
   static CORBA_Repository_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -630,16 +630,14 @@ public:
   static CORBA_Repository_ptr _duplicate (CORBA_Repository_ptr obj);
 
   static CORBA_Repository_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_Repository_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_Repository_ptr _nil (void)
     {
@@ -649,85 +647,76 @@ public:
   static void _tao_any_destructor (void*);
 
   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
     ));
 
   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
     ));
 
   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
     ));
 
   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
     ));
 
   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
     ));
 
   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
     ));
 
   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
     ));
 
   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
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::Char *type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -776,8 +765,8 @@ public:
   virtual ~_TAO_CORBA_Repository_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
@@ -785,8 +774,8 @@ public:
 
   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
@@ -794,8 +783,8 @@ public:
 
   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
@@ -803,8 +792,8 @@ public:
 
   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
@@ -812,8 +801,8 @@ public:
 
   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
@@ -822,8 +811,8 @@ public:
   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
@@ -832,8 +821,8 @@ public:
   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
@@ -842,8 +831,8 @@ public:
   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
@@ -874,8 +863,8 @@ public:
   virtual ~_TAO_CORBA_Repository_Remote_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
@@ -883,8 +872,8 @@ public:
 
   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
@@ -892,8 +881,8 @@ public:
 
   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
@@ -901,8 +890,8 @@ public:
 
   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
@@ -910,8 +899,8 @@ public:
 
   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
@@ -920,8 +909,8 @@ public:
   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
@@ -930,8 +919,8 @@ public:
   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
@@ -940,8 +929,8 @@ public:
   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
@@ -969,8 +958,8 @@ class TAO_IFR_Client_Export _TAO_CORBA_Repository_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_Repository_Proxy_Broker (void);
   virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
-      CORBA_Repository *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      CORBA_Repository *object
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
 protected:
@@ -996,8 +985,8 @@ public:
   virtual ~_TAO_CORBA_Repository_Remote_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:
@@ -1057,8 +1046,8 @@ public:
     static void tao_release (CORBA_ModuleDef_ptr);
     static CORBA_ModuleDef_ptr tao_nil (void);
     static CORBA_ModuleDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1122,16 +1111,14 @@ public:
     static CORBA_ModuleDef_ptr _duplicate (CORBA_ModuleDef_ptr obj);
 
     static CORBA_ModuleDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static CORBA_ModuleDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static CORBA_ModuleDef_ptr _nil (void)
       {
@@ -1141,10 +1128,9 @@ public:
     static void _tao_any_destructor (void*);
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -1238,8 +1224,8 @@ public:
   public:
     virtual ~_TAO_CORBA_ModuleDef_Proxy_Broker (void);
     virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
-        CORBA_ModuleDef *object,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_ModuleDef *object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1265,8 +1251,8 @@ public:
     virtual ~_TAO_CORBA_ModuleDef_Remote_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:
@@ -1393,8 +1379,8 @@ public:
       static void tao_release (CORBA_ConstantDef_ptr);
       static CORBA_ConstantDef_ptr tao_nil (void);
       static CORBA_ConstantDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1457,16 +1443,14 @@ public:
       static CORBA_ConstantDef_ptr _duplicate (CORBA_ConstantDef_ptr obj);
 
       static CORBA_ConstantDef_ptr _narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       static CORBA_ConstantDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       static CORBA_ConstantDef_ptr _nil (void)
         {
@@ -1476,52 +1460,46 @@ public:
       static void _tao_any_destructor (void*);
 
       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_IDLType_ptr type_def (
-          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
         ));
 
       virtual CORBA::Any * value (
-          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
         ));
 
       virtual CORBA::Boolean _is_a (
-          const CORBA::Char *type_id,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          const CORBA::Char *type_id
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -1569,16 +1547,16 @@ public:
     public:
       virtual ~_TAO_CORBA_ConstantDef_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
         )) = 0;
 
       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
@@ -1586,16 +1564,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1603,8 +1581,8 @@ public:
 
       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
@@ -1634,16 +1612,16 @@ public:
 
       virtual ~_TAO_CORBA_ConstantDef_Remote_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
@@ -1651,16 +1629,16 @@ public:
 
       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
@@ -1668,8 +1646,8 @@ public:
 
       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
@@ -1697,8 +1675,8 @@ public:
     public:
       virtual ~_TAO_CORBA_ConstantDef_Proxy_Broker (void);
       virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
-          CORBA_ConstantDef *object,
-          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          CORBA_ConstantDef *object
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
 
     protected:
@@ -1724,8 +1702,8 @@ public:
       virtual ~_TAO_CORBA_ConstantDef_Remote_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:
@@ -1856,8 +1834,8 @@ public:
         static void tao_release (CORBA_StructDef_ptr);
         static CORBA_StructDef_ptr tao_nil (void);
         static CORBA_StructDef_ptr tao_narrow (
-            CORBA::Object *,
-            CORBA::Environment &
+            CORBA::Object *
+            TAO_ENV_ARG_DECL_NOT_USED
           );
         static CORBA::Object * tao_upcast (void *);
 
@@ -1921,16 +1899,14 @@ public:
         static CORBA_StructDef_ptr _duplicate (CORBA_StructDef_ptr obj);
 
         static CORBA_StructDef_ptr _narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         static CORBA_StructDef_ptr _unchecked_narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         static CORBA_StructDef_ptr _nil (void)
           {
@@ -1940,27 +1916,24 @@ public:
         static void _tao_any_destructor (void*);
 
         virtual CORBA_StructMemberSeq * members (
-            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
           ));
 
         virtual CORBA::Boolean _is_a (
-            const CORBA::Char *type_id,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            const CORBA::Char *type_id
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -2009,8 +1982,8 @@ public:
       public:
         virtual ~_TAO_CORBA_StructDef_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
@@ -2018,8 +1991,8 @@ public:
 
         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
@@ -2050,8 +2023,8 @@ public:
 
         virtual ~_TAO_CORBA_StructDef_Remote_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
@@ -2059,8 +2032,8 @@ public:
 
         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
@@ -2088,8 +2061,8 @@ public:
       public:
         virtual ~_TAO_CORBA_StructDef_Proxy_Broker (void);
         virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
-            CORBA_StructDef *object,
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+            CORBA_StructDef *object
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
 
       protected:
@@ -2115,8 +2088,8 @@ public:
         virtual ~_TAO_CORBA_StructDef_Remote_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:
@@ -2177,8 +2150,8 @@ public:
           static void tao_release (CORBA_UnionDef_ptr);
           static CORBA_UnionDef_ptr tao_nil (void);
           static CORBA_UnionDef_ptr tao_narrow (
-              CORBA::Object *,
-              CORBA::Environment &
+              CORBA::Object *
+              TAO_ENV_ARG_DECL_NOT_USED
             );
           static CORBA::Object * tao_upcast (void *);
 
@@ -2242,16 +2215,14 @@ public:
           static CORBA_UnionDef_ptr _duplicate (CORBA_UnionDef_ptr obj);
 
           static CORBA_UnionDef_ptr _narrow (
-              CORBA::Object_ptr obj,
-              CORBA::Environment &ACE_TRY_ENV =
-                TAO_default_environment ()
-            );
+              CORBA::Object_ptr obj
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
           static CORBA_UnionDef_ptr _unchecked_narrow (
-              CORBA::Object_ptr obj,
-              CORBA::Environment &ACE_TRY_ENV =
-                TAO_default_environment ()
-            );
+              CORBA::Object_ptr obj
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
           static CORBA_UnionDef_ptr _nil (void)
             {
@@ -2261,52 +2232,46 @@ public:
           static void _tao_any_destructor (void*);
 
           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
             ));
 
           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
             ));
 
           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
             ));
 
           virtual CORBA_UnionMemberSeq * members (
-              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
             ));
 
           virtual CORBA::Boolean _is_a (
-              const CORBA::Char *type_id,
-              CORBA::Environment &ACE_TRY_ENV =
-                TAO_default_environment ()
-            );
+              const CORBA::Char *type_id
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
           virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -2355,16 +2320,16 @@ public:
         public:
           virtual ~_TAO_CORBA_UnionDef_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
             )) = 0;
 
           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
@@ -2372,16 +2337,16 @@ public:
 
           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
             )) = 0;
 
           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
@@ -2389,8 +2354,8 @@ public:
 
           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
@@ -2421,16 +2386,16 @@ public:
 
           virtual ~_TAO_CORBA_UnionDef_Remote_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
@@ -2438,16 +2403,16 @@ public:
 
           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
@@ -2455,8 +2420,8 @@ public:
 
           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
@@ -2484,8 +2449,8 @@ public:
         public:
           virtual ~_TAO_CORBA_UnionDef_Proxy_Broker (void);
           virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
-              CORBA_UnionDef *object,
-              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+              CORBA_UnionDef *object
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS
             ) = 0;
 
         protected:
@@ -2511,8 +2476,8 @@ public:
           virtual ~_TAO_CORBA_UnionDef_Remote_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:
@@ -2573,8 +2538,8 @@ public:
             static void tao_release (CORBA_EnumDef_ptr);
             static CORBA_EnumDef_ptr tao_nil (void);
             static CORBA_EnumDef_ptr tao_narrow (
-                CORBA::Object *,
-                CORBA::Environment &
+                CORBA::Object *
+                TAO_ENV_ARG_DECL_NOT_USED
               );
             static CORBA::Object * tao_upcast (void *);
 
@@ -2637,16 +2602,14 @@ public:
             static CORBA_EnumDef_ptr _duplicate (CORBA_EnumDef_ptr obj);
 
             static CORBA_EnumDef_ptr _narrow (
-                CORBA::Object_ptr obj,
-                CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ()
-              );
+                CORBA::Object_ptr obj
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
             static CORBA_EnumDef_ptr _unchecked_narrow (
-                CORBA::Object_ptr obj,
-                CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ()
-              );
+                CORBA::Object_ptr obj
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
             static CORBA_EnumDef_ptr _nil (void)
               {
@@ -2656,27 +2619,24 @@ public:
             static void _tao_any_destructor (void*);
 
             virtual CORBA_EnumMemberSeq * members (
-                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
               ));
 
             virtual CORBA::Boolean _is_a (
-                const CORBA::Char *type_id,
-                CORBA::Environment &ACE_TRY_ENV =
-                  TAO_default_environment ()
-              );
+                const CORBA::Char *type_id
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
             virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -2724,8 +2684,8 @@ public:
           public:
             virtual ~_TAO_CORBA_EnumDef_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
@@ -2733,8 +2693,8 @@ public:
 
             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
@@ -2764,8 +2724,8 @@ public:
 
             virtual ~_TAO_CORBA_EnumDef_Remote_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
@@ -2773,8 +2733,8 @@ public:
 
             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
@@ -2802,8 +2762,8 @@ public:
           public:
             virtual ~_TAO_CORBA_EnumDef_Proxy_Broker (void);
             virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
-                CORBA_EnumDef *object,
-                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                CORBA_EnumDef *object
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS
               ) = 0;
 
           protected:
@@ -2829,8 +2789,8 @@ public:
             virtual ~_TAO_CORBA_EnumDef_Remote_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:
@@ -2891,8 +2851,8 @@ public:
               static void tao_release (CORBA_AliasDef_ptr);
               static CORBA_AliasDef_ptr tao_nil (void);
               static CORBA_AliasDef_ptr tao_narrow (
-                  CORBA::Object *,
-                  CORBA::Environment &
+                  CORBA::Object *
+                  TAO_ENV_ARG_DECL_NOT_USED
                 );
               static CORBA::Object * tao_upcast (void *);
 
@@ -2955,16 +2915,14 @@ public:
               static CORBA_AliasDef_ptr _duplicate (CORBA_AliasDef_ptr obj);
 
               static CORBA_AliasDef_ptr _narrow (
-                  CORBA::Object_ptr obj,
-                  CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ()
-                );
+                  CORBA::Object_ptr obj
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
               static CORBA_AliasDef_ptr _unchecked_narrow (
-                  CORBA::Object_ptr obj,
-                  CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ()
-                );
+                  CORBA::Object_ptr obj
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
               static CORBA_AliasDef_ptr _nil (void)
                 {
@@ -2974,27 +2932,24 @@ public:
               static void _tao_any_destructor (void*);
 
               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
                 ));
 
               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
                 ));
 
               virtual CORBA::Boolean _is_a (
-                  const CORBA::Char *type_id,
-                  CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ()
-                );
+                  const CORBA::Char *type_id
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
               virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -3042,8 +2997,8 @@ public:
             public:
               virtual ~_TAO_CORBA_AliasDef_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
@@ -3051,8 +3006,8 @@ public:
 
               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
@@ -3082,8 +3037,8 @@ public:
 
               virtual ~_TAO_CORBA_AliasDef_Remote_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
@@ -3091,8 +3046,8 @@ public:
 
               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
@@ -3120,8 +3075,8 @@ public:
             public:
               virtual ~_TAO_CORBA_AliasDef_Proxy_Broker (void);
               virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
-                  CORBA_AliasDef *object,
-                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                  CORBA_AliasDef *object
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS
                 ) = 0;
 
             protected:
@@ -3147,8 +3102,8 @@ public:
               virtual ~_TAO_CORBA_AliasDef_Remote_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:
@@ -3209,8 +3164,8 @@ public:
                 static void tao_release (CORBA_NativeDef_ptr);
                 static CORBA_NativeDef_ptr tao_nil (void);
                 static CORBA_NativeDef_ptr tao_narrow (
-                    CORBA::Object *,
-                    CORBA::Environment &
+                    CORBA::Object *
+                    TAO_ENV_ARG_DECL_NOT_USED
                   );
                 static CORBA::Object * tao_upcast (void *);
 
@@ -3273,16 +3228,14 @@ public:
                 static CORBA_NativeDef_ptr _duplicate (CORBA_NativeDef_ptr obj);
 
                 static CORBA_NativeDef_ptr _narrow (
-                    CORBA::Object_ptr obj,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ()
-                  );
+                    CORBA::Object_ptr obj
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                 static CORBA_NativeDef_ptr _unchecked_narrow (
-                    CORBA::Object_ptr obj,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ()
-                  );
+                    CORBA::Object_ptr obj
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                 static CORBA_NativeDef_ptr _nil (void)
                   {
@@ -3292,10 +3245,9 @@ public:
                 static void _tao_any_destructor (void*);
 
                 virtual CORBA::Boolean _is_a (
-                    const CORBA::Char *type_id,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ()
-                  );
+                    const CORBA::Char *type_id
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                 virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -3387,8 +3339,8 @@ public:
               public:
                 virtual ~_TAO_CORBA_NativeDef_Proxy_Broker (void);
                 virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
-                    CORBA_NativeDef *object,
-                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                    CORBA_NativeDef *object
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS
                   ) = 0;
 
               protected:
@@ -3414,8 +3366,8 @@ public:
                 virtual ~_TAO_CORBA_NativeDef_Remote_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:
@@ -3461,16 +3413,14 @@ public:
                   static CORBA_PrimitiveDef_ptr _duplicate (CORBA_PrimitiveDef_ptr obj);
 
                   static CORBA_PrimitiveDef_ptr _narrow (
-                      CORBA::Object_ptr obj,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ()
-                    );
+                      CORBA::Object_ptr obj
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                   static CORBA_PrimitiveDef_ptr _unchecked_narrow (
-                      CORBA::Object_ptr obj,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ()
-                    );
+                      CORBA::Object_ptr obj
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                   static CORBA_PrimitiveDef_ptr _nil (void)
                     {
@@ -3480,18 +3430,16 @@ public:
                   static void _tao_any_destructor (void*);
 
                   virtual CORBA::PrimitiveKind kind (
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ()
-                    )
+                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual CORBA::Boolean _is_a (
-                      const CORBA::Char *type_id,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ()
-                    );
+                      const CORBA::Char *type_id
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -3539,8 +3487,8 @@ public:
                 public:
                   virtual ~_TAO_CORBA_PrimitiveDef_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
@@ -3570,8 +3518,8 @@ public:
 
                   virtual ~_TAO_CORBA_PrimitiveDef_Remote_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
@@ -3599,8 +3547,8 @@ public:
                 public:
                   virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
                   virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
-                      CORBA_PrimitiveDef *object,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                      CORBA_PrimitiveDef *object
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS
                     ) = 0;
 
                 protected:
@@ -3626,8 +3574,8 @@ public:
                   virtual ~_TAO_CORBA_PrimitiveDef_Remote_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:
@@ -3673,16 +3621,14 @@ public:
                     static CORBA_StringDef_ptr _duplicate (CORBA_StringDef_ptr obj);
 
                     static CORBA_StringDef_ptr _narrow (
-                        CORBA::Object_ptr obj,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ()
-                      );
+                        CORBA::Object_ptr obj
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                     static CORBA_StringDef_ptr _unchecked_narrow (
-                        CORBA::Object_ptr obj,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ()
-                      );
+                        CORBA::Object_ptr obj
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                     static CORBA_StringDef_ptr _nil (void)
                       {
@@ -3692,27 +3638,24 @@ public:
                     static void _tao_any_destructor (void*);
 
                     virtual CORBA::ULong bound (
-                        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
                       ));
 
                     virtual CORBA::Boolean _is_a (
-                        const CORBA::Char *type_id,
-                        CORBA::Environment &ACE_TRY_ENV =
-                          TAO_default_environment ()
-                      );
+                        const CORBA::Char *type_id
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -3760,8 +3703,8 @@ public:
                   public:
                     virtual ~_TAO_CORBA_StringDef_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
@@ -3769,8 +3712,8 @@ public:
 
                     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
@@ -3800,8 +3743,8 @@ public:
 
                     virtual ~_TAO_CORBA_StringDef_Remote_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
@@ -3809,8 +3752,8 @@ public:
 
                     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
@@ -3838,8 +3781,8 @@ public:
                   public:
                     virtual ~_TAO_CORBA_StringDef_Proxy_Broker (void);
                     virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
-                        CORBA_StringDef *object,
-                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                        CORBA_StringDef *object
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS
                       ) = 0;
 
                   protected:
@@ -3865,8 +3808,8 @@ public:
                     virtual ~_TAO_CORBA_StringDef_Remote_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:
@@ -3912,16 +3855,14 @@ public:
                       static CORBA_WstringDef_ptr _duplicate (CORBA_WstringDef_ptr obj);
 
                       static CORBA_WstringDef_ptr _narrow (
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()
-                        );
+                          CORBA::Object_ptr obj
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                       static CORBA_WstringDef_ptr _unchecked_narrow (
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()
-                        );
+                          CORBA::Object_ptr obj
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                       static CORBA_WstringDef_ptr _nil (void)
                         {
@@ -3931,27 +3872,24 @@ public:
                       static void _tao_any_destructor (void*);
 
                       virtual CORBA::ULong bound (
-                          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
                         ));
 
                       virtual CORBA::Boolean _is_a (
-                          const CORBA::Char *type_id,
-                          CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()
-                        );
+                          const CORBA::Char *type_id
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                       virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -3999,8 +3937,8 @@ public:
                     public:
                       virtual ~_TAO_CORBA_WstringDef_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
@@ -4008,8 +3946,8 @@ public:
 
                       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
@@ -4039,8 +3977,8 @@ public:
 
                       virtual ~_TAO_CORBA_WstringDef_Remote_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
@@ -4048,8 +3986,8 @@ public:
 
                       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
@@ -4077,8 +4015,8 @@ public:
                     public:
                       virtual ~_TAO_CORBA_WstringDef_Proxy_Broker (void);
                       virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
-                          CORBA_WstringDef *object,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          CORBA_WstringDef *object
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
                         ) = 0;
 
                     protected:
@@ -4104,8 +4042,8 @@ public:
                       virtual ~_TAO_CORBA_WstringDef_Remote_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:
@@ -4151,16 +4089,14 @@ public:
                         static CORBA_SequenceDef_ptr _duplicate (CORBA_SequenceDef_ptr obj);
 
                         static CORBA_SequenceDef_ptr _narrow (
-                            CORBA::Object_ptr obj,
-                            CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ()
-                          );
+                            CORBA::Object_ptr obj
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                         static CORBA_SequenceDef_ptr _unchecked_narrow (
-                            CORBA::Object_ptr obj,
-                            CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ()
-                          );
+                            CORBA::Object_ptr obj
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                         static CORBA_SequenceDef_ptr _nil (void)
                           {
@@ -4170,52 +4106,46 @@ public:
                         static void _tao_any_destructor (void*);
 
                         virtual CORBA::ULong bound (
-                            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
                           ));
 
                         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
                           ));
 
                         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
                           ));
 
                         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
                           ));
 
                         virtual CORBA::Boolean _is_a (
-                            const CORBA::Char *type_id,
-                            CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ()
-                          );
+                            const CORBA::Char *type_id
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                         virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -4263,8 +4193,8 @@ public:
                       public:
                         virtual ~_TAO_CORBA_SequenceDef_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
@@ -4272,24 +4202,24 @@ public:
 
                         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
                           )) = 0;
 
                         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
                           )) = 0;
 
                         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
@@ -4297,8 +4227,8 @@ public:
 
                         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
@@ -4328,8 +4258,8 @@ public:
 
                         virtual ~_TAO_CORBA_SequenceDef_Remote_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
@@ -4337,24 +4267,24 @@ public:
 
                         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
@@ -4362,8 +4292,8 @@ public:
 
                         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
@@ -4391,8 +4321,8 @@ public:
                       public:
                         virtual ~_TAO_CORBA_SequenceDef_Proxy_Broker (void);
                         virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
-                            CORBA_SequenceDef *object,
-                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                            CORBA_SequenceDef *object
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS
                           ) = 0;
 
                       protected:
@@ -4418,8 +4348,8 @@ public:
                         virtual ~_TAO_CORBA_SequenceDef_Remote_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:
@@ -4465,16 +4395,14 @@ public:
                           static CORBA_ArrayDef_ptr _duplicate (CORBA_ArrayDef_ptr obj);
 
                           static CORBA_ArrayDef_ptr _narrow (
-                              CORBA::Object_ptr obj,
-                              CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()
-                            );
+                              CORBA::Object_ptr obj
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                           static CORBA_ArrayDef_ptr _unchecked_narrow (
-                              CORBA::Object_ptr obj,
-                              CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()
-                            );
+                              CORBA::Object_ptr obj
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                           static CORBA_ArrayDef_ptr _nil (void)
                             {
@@ -4484,52 +4412,46 @@ public:
                           static void _tao_any_destructor (void*);
 
                           virtual CORBA::ULong length (
-                              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
                             ));
 
                           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
                             ));
 
                           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
                             ));
 
                           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
                             ));
 
                           virtual CORBA::Boolean _is_a (
-                              const CORBA::Char *type_id,
-                              CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()
-                            );
+                              const CORBA::Char *type_id
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                           virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -4577,8 +4499,8 @@ public:
                         public:
                           virtual ~_TAO_CORBA_ArrayDef_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
@@ -4586,24 +4508,24 @@ public:
 
                           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
                             )) = 0;
 
                           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
                             )) = 0;
 
                           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
@@ -4611,8 +4533,8 @@ public:
 
                           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
@@ -4642,8 +4564,8 @@ public:
 
                           virtual ~_TAO_CORBA_ArrayDef_Remote_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
@@ -4651,24 +4573,24 @@ public:
 
                           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
@@ -4676,8 +4598,8 @@ public:
 
                           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
@@ -4705,8 +4627,8 @@ public:
                         public:
                           virtual ~_TAO_CORBA_ArrayDef_Proxy_Broker (void);
                           virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
-                              CORBA_ArrayDef *object,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                              CORBA_ArrayDef *object
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS
                             ) = 0;
 
                         protected:
@@ -4732,8 +4654,8 @@ public:
                           virtual ~_TAO_CORBA_ArrayDef_Remote_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:
@@ -4793,8 +4715,8 @@ public:
                             static void tao_release (CORBA_ExceptionDef_ptr);
                             static CORBA_ExceptionDef_ptr tao_nil (void);
                             static CORBA_ExceptionDef_ptr tao_narrow (
-                                CORBA::Object *,
-                                CORBA::Environment &
+                                CORBA::Object *
+                                TAO_ENV_ARG_DECL_NOT_USED
                               );
                             static CORBA::Object * tao_upcast (void *);
 
@@ -4858,16 +4780,14 @@ public:
                             static CORBA_ExceptionDef_ptr _duplicate (CORBA_ExceptionDef_ptr obj);
 
                             static CORBA_ExceptionDef_ptr _narrow (
-                                CORBA::Object_ptr obj,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()
-                              );
+                                CORBA::Object_ptr obj
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                             static CORBA_ExceptionDef_ptr _unchecked_narrow (
-                                CORBA::Object_ptr obj,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()
-                              );
+                                CORBA::Object_ptr obj
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                             static CORBA_ExceptionDef_ptr _nil (void)
                               {
@@ -4877,35 +4797,31 @@ public:
                             static void _tao_any_destructor (void*);
 
                             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_StructMemberSeq * members (
-                                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
                               ));
 
                             virtual CORBA::Boolean _is_a (
-                                const CORBA::Char *type_id,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()
-                              );
+                                const CORBA::Char *type_id
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                             virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -4954,16 +4870,16 @@ public:
                           public:
                             virtual ~_TAO_CORBA_ExceptionDef_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
                               )) = 0;
 
                             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
@@ -4971,8 +4887,8 @@ public:
 
                             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
@@ -5003,16 +4919,16 @@ public:
 
                             virtual ~_TAO_CORBA_ExceptionDef_Remote_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
@@ -5020,8 +4936,8 @@ public:
 
                             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
@@ -5049,8 +4965,8 @@ public:
                           public:
                             virtual ~_TAO_CORBA_ExceptionDef_Proxy_Broker (void);
                             virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
-                                CORBA_ExceptionDef *object,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                CORBA_ExceptionDef *object
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS
                               ) = 0;
 
                           protected:
@@ -5076,8 +4992,8 @@ public:
                             virtual ~_TAO_CORBA_ExceptionDef_Remote_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:
@@ -5213,10 +5129,9 @@ public:
 
                               virtual void _downcast (
                                   void* target,
-                                  CORBA_Object *src,
-                                  CORBA_Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ()
-                                );
+                                  CORBA_Object *src
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
                               virtual CORBA_Object* _upcast (void *src) const;
                             };
 
@@ -5535,8 +5450,8 @@ public:
                               static void tao_release (CORBA_AttributeDef_ptr);
                               static CORBA_AttributeDef_ptr tao_nil (void);
                               static CORBA_AttributeDef_ptr tao_narrow (
-                                  CORBA::Object *,
-                                  CORBA::Environment &
+                                  CORBA::Object *
+                                  TAO_ENV_ARG_DECL_NOT_USED
                                 );
                               static CORBA::Object * tao_upcast (void *);
 
@@ -5599,16 +5514,14 @@ public:
                               static CORBA_AttributeDef_ptr _duplicate (CORBA_AttributeDef_ptr obj);
 
                               static CORBA_AttributeDef_ptr _narrow (
-                                  CORBA::Object_ptr obj,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ()
-                                );
+                                  CORBA::Object_ptr obj
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                               static CORBA_AttributeDef_ptr _unchecked_narrow (
-                                  CORBA::Object_ptr obj,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ()
-                                );
+                                  CORBA::Object_ptr obj
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                               static CORBA_AttributeDef_ptr _nil (void)
                                 {
@@ -5618,52 +5531,46 @@ public:
                               static void _tao_any_destructor (void*);
 
                               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_IDLType_ptr type_def (
-                                  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
                                 ));
 
                               virtual CORBA::AttributeMode mode (
-                                  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
                                 ));
 
                               virtual CORBA::Boolean _is_a (
-                                  const CORBA::Char *type_id,
-                                  CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ()
-                                );
+                                  const CORBA::Char *type_id
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                               virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -5711,16 +5618,16 @@ public:
                             public:
                               virtual ~_TAO_CORBA_AttributeDef_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
                                 )) = 0;
 
                               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
@@ -5728,16 +5635,16 @@ public:
 
                               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
                                 )) = 0;
 
                               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
@@ -5745,8 +5652,8 @@ public:
 
                               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
@@ -5776,16 +5683,16 @@ public:
 
                               virtual ~_TAO_CORBA_AttributeDef_Remote_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
@@ -5793,16 +5700,16 @@ public:
 
                               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
@@ -5810,8 +5717,8 @@ public:
 
                               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
@@ -5839,8 +5746,8 @@ public:
                             public:
                               virtual ~_TAO_CORBA_AttributeDef_Proxy_Broker (void);
                               virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
-                                  CORBA_AttributeDef *object,
-                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                  CORBA_AttributeDef *object
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                 ) = 0;
 
                             protected:
@@ -5866,8 +5773,8 @@ public:
                               virtual ~_TAO_CORBA_AttributeDef_Remote_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:
@@ -6339,8 +6246,8 @@ public:
                                 static void tao_release (CORBA_OperationDef_ptr);
                                 static CORBA_OperationDef_ptr tao_nil (void);
                                 static CORBA_OperationDef_ptr tao_narrow (
-                                    CORBA::Object *,
-                                    CORBA::Environment &
+                                    CORBA::Object *
+                                    TAO_ENV_ARG_DECL_NOT_USED
                                   );
                                 static CORBA::Object * tao_upcast (void *);
 
@@ -6403,16 +6310,14 @@ public:
                                 static CORBA_OperationDef_ptr _duplicate (CORBA_OperationDef_ptr obj);
 
                                 static CORBA_OperationDef_ptr _narrow (
-                                    CORBA::Object_ptr obj,
-                                    CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()
-                                  );
+                                    CORBA::Object_ptr obj
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                 static CORBA_OperationDef_ptr _unchecked_narrow (
-                                    CORBA::Object_ptr obj,
-                                    CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()
-                                  );
+                                    CORBA::Object_ptr obj
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                 static CORBA_OperationDef_ptr _nil (void)
                                   {
@@ -6422,103 +6327,91 @@ public:
                                 static void _tao_any_destructor (void*);
 
                                 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
                                   ));
 
                                 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
                                   ));
 
                                 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
                                   ));
 
                                 virtual CORBA_ParDescriptionSeq * params (
-                                    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
                                   ));
 
                                 virtual CORBA::OperationMode mode (
-                                    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
                                   ));
 
                                 virtual CORBA_ContextIdSeq * contexts (
-                                    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
                                   ));
 
                                 virtual CORBA_ExceptionDefSeq * exceptions (
-                                    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
                                   ));
 
                                 virtual CORBA::Boolean _is_a (
-                                    const CORBA::Char *type_id,
-                                    CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()
-                                  );
+                                    const CORBA::Char *type_id
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                 virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -6566,16 +6459,16 @@ public:
                               public:
                                 virtual ~_TAO_CORBA_OperationDef_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
                                   )) = 0;
 
                                 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
@@ -6583,16 +6476,16 @@ public:
 
                                 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
                                   )) = 0;
 
                                 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
@@ -6600,16 +6493,16 @@ public:
 
                                 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
                                   )) = 0;
 
                                 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
@@ -6617,16 +6510,16 @@ public:
 
                                 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
                                   )) = 0;
 
                                 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
@@ -6634,16 +6527,16 @@ public:
 
                                 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
                                   )) = 0;
 
                                 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
@@ -6651,8 +6544,8 @@ public:
 
                                 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
@@ -6682,16 +6575,16 @@ public:
 
                                 virtual ~_TAO_CORBA_OperationDef_Remote_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
@@ -6699,16 +6592,16 @@ public:
 
                                 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
@@ -6716,16 +6609,16 @@ public:
 
                                 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
@@ -6733,16 +6626,16 @@ public:
 
                                 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
@@ -6750,16 +6643,16 @@ public:
 
                                 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
@@ -6767,8 +6660,8 @@ public:
 
                                 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
@@ -6796,8 +6689,8 @@ public:
                               public:
                                 virtual ~_TAO_CORBA_OperationDef_Proxy_Broker (void);
                                 virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
-                                    CORBA_OperationDef *object,
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                    CORBA_OperationDef *object
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                   ) = 0;
 
                               protected:
@@ -6823,8 +6716,8 @@ public:
                                 virtual ~_TAO_CORBA_OperationDef_Remote_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:
@@ -7389,8 +7282,8 @@ public:
                                   static void tao_release (CORBA_InterfaceDef_ptr);
                                   static CORBA_InterfaceDef_ptr tao_nil (void);
                                   static CORBA_InterfaceDef_ptr tao_narrow (
-                                      CORBA::Object *,
-                                      CORBA::Environment &
+                                      CORBA::Object *
+                                      TAO_ENV_ARG_DECL_NOT_USED
                                     );
                                   static CORBA::Object * tao_upcast (void *);
 
@@ -7455,16 +7348,14 @@ public:
                                   static CORBA_InterfaceDef_ptr _duplicate (CORBA_InterfaceDef_ptr obj);
 
                                   static CORBA_InterfaceDef_ptr _narrow (
-                                      CORBA::Object_ptr obj,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()
-                                    );
+                                      CORBA::Object_ptr obj
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                   static CORBA_InterfaceDef_ptr _unchecked_narrow (
-                                      CORBA::Object_ptr obj,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()
-                                    );
+                                      CORBA::Object_ptr obj
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                   static CORBA_InterfaceDef_ptr _nil (void)
                                     {
@@ -7474,27 +7365,24 @@ public:
                                   static void _tao_any_destructor (void*);
 
                                   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
                                     ));
 
                                   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
                                     ));
 
                                   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
                                     ));
@@ -7574,9 +7462,8 @@ public:
                                   static CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
 
                                   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
                                     ));
@@ -7586,10 +7473,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
                                     ));
@@ -7602,19 +7488,17 @@ 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
                                     ));
 
                                   virtual CORBA::Boolean _is_a (
-                                      const CORBA::Char *type_id,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()
-                                    );
+                                      const CORBA::Char *type_id
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -7664,8 +7548,8 @@ public:
                                 public:
                                   virtual ~_TAO_CORBA_InterfaceDef_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
@@ -7673,8 +7557,8 @@ public:
 
                                   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
@@ -7682,16 +7566,16 @@ public:
 
                                   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
                                     )) = 0;
 
                                   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
@@ -7703,8 +7587,8 @@ public:
                                       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
@@ -7719,8 +7603,8 @@ 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
@@ -7752,8 +7636,8 @@ public:
 
                                   virtual ~_TAO_CORBA_InterfaceDef_Remote_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
@@ -7761,8 +7645,8 @@ public:
 
                                   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
@@ -7770,16 +7654,16 @@ public:
 
                                   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
@@ -7791,8 +7675,8 @@ public:
                                       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
@@ -7807,8 +7691,8 @@ 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
@@ -7836,8 +7720,8 @@ public:
                                 public:
                                   virtual ~_TAO_CORBA_InterfaceDef_Proxy_Broker (void);
                                   virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
-                                      CORBA_InterfaceDef *object,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                      CORBA_InterfaceDef *object
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                     ) = 0;
 
                                 protected:
@@ -7863,8 +7747,8 @@ public:
                                   virtual ~_TAO_CORBA_InterfaceDef_Remote_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:
@@ -7994,8 +7878,8 @@ public:
                                     static void tao_release (CORBA_AbstractInterfaceDef_ptr);
                                     static CORBA_AbstractInterfaceDef_ptr tao_nil (void);
                                     static CORBA_AbstractInterfaceDef_ptr tao_narrow (
-                                        CORBA::Object *,
-                                        CORBA::Environment &
+                                        CORBA::Object *
+                                        TAO_ENV_ARG_DECL_NOT_USED
                                       );
                                     static CORBA::Object * tao_upcast (void *);
 
@@ -8058,16 +7942,14 @@ public:
                                     static CORBA_AbstractInterfaceDef_ptr _duplicate (CORBA_AbstractInterfaceDef_ptr obj);
 
                                     static CORBA_AbstractInterfaceDef_ptr _narrow (
-                                        CORBA::Object_ptr obj,
-                                        CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ()
-                                      );
+                                        CORBA::Object_ptr obj
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                     static CORBA_AbstractInterfaceDef_ptr _unchecked_narrow (
-                                        CORBA::Object_ptr obj,
-                                        CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ()
-                                      );
+                                        CORBA::Object_ptr obj
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                     static CORBA_AbstractInterfaceDef_ptr _nil (void)
                                       {
@@ -8077,10 +7959,9 @@ public:
                                     static void _tao_any_destructor (void*);
 
                                     virtual CORBA::Boolean _is_a (
-                                        const CORBA::Char *type_id,
-                                        CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ()
-                                      );
+                                        const CORBA::Char *type_id
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -8172,8 +8053,8 @@ public:
                                   public:
                                     virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
                                     virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
-                                        CORBA_AbstractInterfaceDef *object,
-                                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                        CORBA_AbstractInterfaceDef *object
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                       ) = 0;
 
                                   protected:
@@ -8199,8 +8080,8 @@ public:
                                     virtual ~_TAO_CORBA_AbstractInterfaceDef_Remote_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:
@@ -8261,8 +8142,8 @@ public:
                                       static void tao_release (CORBA_LocalInterfaceDef_ptr);
                                       static CORBA_LocalInterfaceDef_ptr tao_nil (void);
                                       static CORBA_LocalInterfaceDef_ptr tao_narrow (
-                                          CORBA::Object *,
-                                          CORBA::Environment &
+                                          CORBA::Object *
+                                          TAO_ENV_ARG_DECL_NOT_USED
                                         );
                                       static CORBA::Object * tao_upcast (void *);
 
@@ -8325,16 +8206,14 @@ public:
                                       static CORBA_LocalInterfaceDef_ptr _duplicate (CORBA_LocalInterfaceDef_ptr obj);
 
                                       static CORBA_LocalInterfaceDef_ptr _narrow (
-                                          CORBA::Object_ptr obj,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ()
-                                        );
+                                          CORBA::Object_ptr obj
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                       static CORBA_LocalInterfaceDef_ptr _unchecked_narrow (
-                                          CORBA::Object_ptr obj,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ()
-                                        );
+                                          CORBA::Object_ptr obj
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                       static CORBA_LocalInterfaceDef_ptr _nil (void)
                                         {
@@ -8344,10 +8223,9 @@ public:
                                       static void _tao_any_destructor (void*);
 
                                       virtual CORBA::Boolean _is_a (
-                                          const CORBA::Char *type_id,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ()
-                                        );
+                                          const CORBA::Char *type_id
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
                                       virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -8439,8 +8317,8 @@ public:
                                     public:
                                       virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
                                       virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
-                                          CORBA_LocalInterfaceDef *object,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                                          CORBA_LocalInterfaceDef *object
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                         ) = 0;
 
                                     protected:
@@ -8466,8 +8344,8 @@ public:
                                       virtual ~_TAO_CORBA_LocalInterfaceDef_Remote_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:
@@ -8624,8 +8502,8 @@ public:
                                       TAO_IFR_Client_Export
                                       CORBA_FixedDef_ptr
                                       tao_CORBA_FixedDef_narrow (
-                                          CORBA::Object *,
-                                          CORBA::Environment &
+                                          CORBA::Object *
+                                          TAO_ENV_ARG_DECL_NOT_USED
                                         );
                                       TAO_IFR_Client_Export
                                       CORBA::Object *
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 99486039f72..da828bfc82d 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -40,13 +40,13 @@ TAO_IFR_Client_Adapter_Impl::dispose (
 CORBA_InterfaceDef_ptr
 TAO_IFR_Client_Adapter_Impl::get_interface (
     CORBA::ORB_ptr orb,
-    const char *repo_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *repo_id
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("InterfaceRepository",
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references ("InterfaceRepository"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (CORBA::is_nil (obj.in ()))
@@ -56,8 +56,8 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
     }
 
   CORBA_Repository_var repo =
-    CORBA_Repository::_narrow (obj.in (),
-                               ACE_TRY_ENV);
+    CORBA_Repository::_narrow (obj.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (CORBA::is_nil (repo.in ()))
@@ -66,8 +66,8 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
                         CORBA_InterfaceDef::_nil ());
     }
 
-  CORBA_Contained_var result = repo->lookup_id (repo_id,
-                                                ACE_TRY_ENV);
+  CORBA_Contained_var result = repo->lookup_id (repo_id
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (CORBA::is_nil (result.in ()))
@@ -76,15 +76,15 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
     }
   else
     {
-      return CORBA_InterfaceDef::_narrow (result.in (),
-                                          ACE_TRY_ENV);
+      return CORBA_InterfaceDef::_narrow (result.in ()
+                                          TAO_ENV_ARG_PARAMETER);
     }
 }
 
 CORBA_InterfaceDef_ptr
 TAO_IFR_Client_Adapter_Impl::get_interface_remote (
-    const CORBA::Object_ptr target,
-    CORBA_Environment &ACE_TRY_ENV
+    const CORBA::Object_ptr target
+    TAO_ENV_ARG_DECL
   )
 {
   CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil ();
@@ -112,17 +112,17 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
 
       for (;;)
         {
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
-          _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
-                                    ACE_TRY_ENV);
+          _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           int _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (_invoke_status == TAO_INVOKE_RESTART)
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index 917cf3c6562..d8f93d930bf 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -33,7 +33,7 @@
  * which use the Interface Repository. This is the derived class
  * that contains the actual implementations.
  */
-class TAO_IFR_Client_Export TAO_IFR_Client_Adapter_Impl 
+class TAO_IFR_Client_Export TAO_IFR_Client_Adapter_Impl
   : public TAO_IFR_Client_Adapter
 {
 public:
@@ -55,13 +55,13 @@ public:
 
   virtual CORBA_InterfaceDef_ptr get_interface (
       CORBA::ORB_ptr orb,
-      const char *repo_id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char *repo_id
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef_ptr get_interface_remote (
-      const CORBA::Object_ptr target,
-      CORBA_Environment &ACE_TRY_ENV
+      const CORBA::Object_ptr target
+      TAO_ENV_ARG_DECL
     );
 
   // Used to force the initialization of the ORB code.
@@ -76,13 +76,13 @@ ACE_FACTORY_DECLARE (TAO_IFR_Client, TAO_IFR_Client_Adapter_Impl)
 typedef int (*TAO_Module_Initializer) (void);
 
 static TAO_Module_Initializer
-TAO_Requires_IFR_Client_Initializer = 
+TAO_Requires_IFR_Client_Initializer =
   &TAO_IFR_Client_Adapter_Impl::Initializer;
 
 #else
 
 static int
-TAO_Requires_IFR_Client_Initializer = 
+TAO_Requires_IFR_Client_Initializer =
   TAO_IFR_Client_Adapter_Impl::Initializer ();
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index b31c3197ea7..844388bc2a4 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -349,12 +349,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::UL
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target);
-  *tmp = IR::ComponentDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::ComponentDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -546,12 +546,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULo
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target);
-  *tmp = IR::ProvidesDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::ProvidesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -742,12 +742,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong n
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target);
-  *tmp = IR::UsesDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::UsesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -934,12 +934,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong n
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target);
-  *tmp = IR::HomeDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::HomeDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1126,12 +1126,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target);
-  *tmp = IR::EmitsDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::EmitsDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1319,12 +1319,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::UL
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target);
-  *tmp = IR::PublishesDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::PublishesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1516,12 +1516,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULo
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target);
-  *tmp = IR::ConsumesDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::ConsumesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1712,12 +1712,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULon
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target);
-  *tmp = IR::FactoryDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::FactoryDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1908,12 +1908,12 @@ IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong
 void
 IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
     void* target,
-    CORBA_Object *src,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Object *src
+    TAO_ENV_ARG_DECL
   )
 {
   IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target);
-  *tmp = IR::FinderDef::_narrow (src, ACE_TRY_ENV);
+  *tmp = IR::FinderDef::_narrow (src TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -2056,11 +2056,11 @@ tao_IR_ComponentRepository_nil (
 
 IR::ComponentRepository_ptr
 tao_IR_ComponentRepository_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::ComponentRepository::_narrow (p, ACE_TRY_ENV);
+  return IR::ComponentRepository::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2183,11 +2183,11 @@ IR::ComponentRepository_var::tao_nil (void)
 
 ::IR::ComponentRepository_ptr
 IR::ComponentRepository_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::ComponentRepository::_narrow (p, ACE_TRY_ENV);
+  return ::IR::ComponentRepository::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2269,27 +2269,23 @@ 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));
 
   void result (IR::ComponentDef_ptr result);
@@ -2313,8 +2309,8 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -2325,12 +2321,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2358,12 +2354,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2371,13 +2367,13 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2404,27 +2400,23 @@ 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));
 
   void result (IR::HomeDef_ptr result);
@@ -2450,8 +2442,8 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -2463,12 +2455,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2499,12 +2491,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Envi
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2512,13 +2504,13 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Env
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2554,8 +2546,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
     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
@@ -2602,8 +2594,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
         name,
         version,
         base_component,
-        supports_interfaces,
-        ACE_TRY_ENV
+        supports_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2618,8 +2610,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2631,12 +2623,12 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2654,7 +2646,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2670,8 +2662,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2698,8 +2690,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2708,13 +2700,13 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2725,7 +2717,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2746,8 +2738,8 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_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
@@ -2795,8 +2787,8 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
         version,
         base_home,
         managed_component,
-        primary_key,
-        ACE_TRY_ENV
+        primary_key
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2811,8 +2803,8 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2824,12 +2816,12 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2848,7 +2840,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2864,8 +2856,8 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2892,8 +2884,8 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2902,13 +2894,13 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2919,7 +2911,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2973,8 +2965,8 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remo
 
 IR::_TAO_ComponentRepository_Proxy_Impl&
 IR::_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
-  ::IR::ComponentRepository *,
-  CORBA::Environment &
+  ::IR::ComponentRepository *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3016,25 +3008,25 @@ void IR::ComponentRepository::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::ComponentRepository_ptr IR::ComponentRepository::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ComponentRepository::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ComponentRepository::_nil ());
       if (is_a == 0)
         return ComponentRepository::_nil ();
     }
-  return ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ComponentRepository::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3089,7 +3081,7 @@ IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
@@ -3099,7 +3091,7 @@ CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value, CORBA::
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
@@ -3164,15 +3156,15 @@ IR::ComponentDef_ptr IR::ComponentRepository::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
   ))
 {
   _TAO_ComponentRepository_Proxy_Impl &proxy =
-    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_component (
@@ -3181,8 +3173,8 @@ IR::ComponentDef_ptr IR::ComponentRepository::create_component (
       name,
       version,
       base_component,
-      supports_interfaces,
-      ACE_TRY_ENV
+      supports_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -3192,15 +3184,15 @@ IR::HomeDef_ptr IR::ComponentRepository::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
   ))
 {
   _TAO_ComponentRepository_Proxy_Impl &proxy =
-    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_home (
@@ -3210,8 +3202,8 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home (
       version,
       base_home,
       managed_component,
-      primary_key,
-      ACE_TRY_ENV
+      primary_key
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -3276,11 +3268,11 @@ tao_IR_ProvidesDef_nil (
 
 IR::ProvidesDef_ptr
 tao_IR_ProvidesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::ProvidesDef::_narrow (p, ACE_TRY_ENV);
+  return IR::ProvidesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3403,11 +3395,11 @@ IR::ProvidesDef_var::tao_nil (void)
 
 ::IR::ProvidesDef_ptr
 IR::ProvidesDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::ProvidesDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::ProvidesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3484,27 +3476,23 @@ class TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_Clien
 public:
   TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -3518,31 +3506,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3550,13 +3538,13 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3587,8 +3575,8 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
 // Remote Implementation of the IDL interface methods
 
 CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_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
@@ -3630,8 +3618,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -3646,8 +3634,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3659,17 +3647,17 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3685,8 +3673,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3713,8 +3701,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3723,13 +3711,13 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -3740,7 +3728,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3794,8 +3782,8 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker
 
 IR::_TAO_ProvidesDef_Proxy_Impl&
 IR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::ProvidesDef *,
-  CORBA::Environment &
+  ::IR::ProvidesDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3837,25 +3825,25 @@ void IR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::ProvidesDef_ptr IR::ProvidesDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ProvidesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ProvidesDef::_nil ());
       if (is_a == 0)
         return ProvidesDef::_nil ();
     }
-  return ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ProvidesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3910,7 +3898,7 @@ IR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
@@ -3919,7 +3907,7 @@ CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -3968,19 +3956,19 @@ const char* IR::ProvidesDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDef_ptr IR::ProvidesDef::interface_type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ProvidesDef_Proxy_Impl &proxy =
-    this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.interface_type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -4197,11 +4185,11 @@ tao_IR_UsesDef_nil (
 
 IR::UsesDef_ptr
 tao_IR_UsesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::UsesDef::_narrow (p, ACE_TRY_ENV);
+  return IR::UsesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4324,11 +4312,11 @@ IR::UsesDef_var::tao_nil (void)
 
 ::IR::UsesDef_ptr
 IR::UsesDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::UsesDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::UsesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4405,27 +4393,23 @@ class TAO_ClientRequestInfo_IR_UsesDef_interface_type_get : public TAO_ClientReq
 public:
   TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -4439,31 +4423,31 @@ private:
 
 TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4471,13 +4455,13 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4498,27 +4482,23 @@ class TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ClientReques
 public:
   TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Boolean result);
@@ -4532,31 +4512,31 @@ private:
 
 TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4564,13 +4544,13 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4601,8 +4581,8 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_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
@@ -4644,8 +4624,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4660,8 +4640,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4673,17 +4653,17 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4699,8 +4679,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4727,8 +4707,8 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4737,13 +4717,13 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -4754,7 +4734,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4769,8 +4749,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA::Boolean IR::_TAO_UsesDef_Remote_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
@@ -4811,8 +4791,8 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -4827,8 +4807,8 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4840,17 +4820,17 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4866,8 +4846,8 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4893,8 +4873,8 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4903,13 +4883,13 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -4920,7 +4900,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4974,8 +4954,8 @@ IR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
 
 IR::_TAO_UsesDef_Proxy_Impl&
 IR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::UsesDef *,
-  CORBA::Environment &
+  ::IR::UsesDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -5017,25 +4997,25 @@ void IR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::UsesDef_ptr IR::UsesDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return UsesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (UsesDef::_nil ());
       if (is_a == 0)
         return UsesDef::_nil ();
     }
-  return UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return UsesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::UsesDef_ptr IR::UsesDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -5090,7 +5070,7 @@ IR::UsesDef::_duplicate (UsesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
@@ -5099,7 +5079,7 @@ CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -5148,36 +5128,36 @@ const char* IR::UsesDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDef_ptr IR::UsesDef::interface_type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_UsesDef_Proxy_Impl &proxy =
-    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.interface_type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean IR::UsesDef::is_multiple (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_UsesDef_Proxy_Impl &proxy =
-    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_multiple (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -5938,11 +5918,11 @@ tao_IR_EventDef_nil (
 
 IR::EventDef_ptr
 tao_IR_EventDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::EventDef::_narrow (p, ACE_TRY_ENV);
+  return IR::EventDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6065,11 +6045,11 @@ IR::EventDef_var::tao_nil (void)
 
 ::IR::EventDef_ptr
 IR::EventDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::EventDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::EventDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6147,27 +6127,23 @@ public:
   TAO_ClientRequestInfo_IR_EventDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA::Boolean result);
@@ -6183,20 +6159,20 @@ private:
 TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * event_id,
-    CORBA::Environment &
+    const char * event_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     event_id_ (event_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6212,12 +6188,12 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_E
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6225,13 +6201,13 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6252,27 +6228,23 @@ class TAO_ClientRequestInfo_IR_EventDef_event_get : public TAO_ClientRequestInfo
 public:
   TAO_ClientRequestInfo_IR_EventDef_event_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ValueDef_ptr result);
@@ -6286,31 +6258,31 @@ private:
 
 TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6318,13 +6290,13 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -6356,8 +6328,8 @@ IR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
 
 CORBA::Boolean IR::_TAO_EventDef_Remote_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
@@ -6399,8 +6371,8 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
       TAO_ClientRequestInfo_IR_EventDef_is_a ri (
         &_tao_call,
         _collocated_tao_target_,
-        event_id,
-        ACE_TRY_ENV
+        event_id
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -6415,8 +6387,8 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6428,12 +6400,12 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -6447,7 +6419,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6463,8 +6435,8 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6490,8 +6462,8 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6500,13 +6472,13 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6517,7 +6489,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6532,8 +6504,8 @@ return _tao_retval;
 }
 
 CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_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
@@ -6575,8 +6547,8 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_EventDef_event_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -6591,8 +6563,8 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6604,17 +6576,17 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6630,8 +6602,8 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6658,8 +6630,8 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6668,13 +6640,13 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6685,7 +6657,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6739,8 +6711,8 @@ IR::_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
 
 IR::_TAO_EventDef_Proxy_Impl&
 IR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::EventDef *,
-  CORBA::Environment &
+  ::IR::EventDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -6782,25 +6754,25 @@ void IR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::EventDef_ptr IR::EventDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return EventDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (EventDef::_nil ());
       if (is_a == 0)
         return EventDef::_nil ();
     }
-  return EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return EventDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::EventDef_ptr IR::EventDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -6855,7 +6827,7 @@ IR::EventDef::_duplicate (EventDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
@@ -6864,7 +6836,7 @@ CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value, CORBA::Environment
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
@@ -6913,38 +6885,38 @@ const char* IR::EventDef::_interface_repository_id (void) const
 }
 
 CORBA::Boolean IR::EventDef::is_a (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_EventDef_Proxy_Impl &proxy =
-    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
-      event_id,
-      ACE_TRY_ENV
+      event_id
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDef_ptr IR::EventDef::event (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_EventDef_Proxy_Impl &proxy =
-    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.event (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -7155,11 +7127,11 @@ tao_IR_EmitsDef_nil (
 
 IR::EmitsDef_ptr
 tao_IR_EmitsDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::EmitsDef::_narrow (p, ACE_TRY_ENV);
+  return IR::EmitsDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7282,11 +7254,11 @@ IR::EmitsDef_var::tao_nil (void)
 
 ::IR::EmitsDef_ptr
 IR::EmitsDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::EmitsDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::EmitsDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7412,8 +7384,8 @@ IR::_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
 
 IR::_TAO_EmitsDef_Proxy_Impl&
 IR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::EmitsDef *,
-  CORBA::Environment &
+  ::IR::EmitsDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -7455,25 +7427,25 @@ void IR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::EmitsDef_ptr IR::EmitsDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return EmitsDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (EmitsDef::_nil ());
       if (is_a == 0)
         return EmitsDef::_nil ();
     }
-  return EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return EmitsDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -7528,7 +7500,7 @@ IR::EmitsDef::_duplicate (EmitsDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
@@ -7538,7 +7510,7 @@ CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
@@ -7654,11 +7626,11 @@ tao_IR_PublishesDef_nil (
 
 IR::PublishesDef_ptr
 tao_IR_PublishesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::PublishesDef::_narrow (p, ACE_TRY_ENV);
+  return IR::PublishesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7781,11 +7753,11 @@ IR::PublishesDef_var::tao_nil (void)
 
 ::IR::PublishesDef_ptr
 IR::PublishesDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::PublishesDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::PublishesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7911,8 +7883,8 @@ IR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broke
 
 IR::_TAO_PublishesDef_Proxy_Impl&
 IR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::PublishesDef *,
-  CORBA::Environment &
+  ::IR::PublishesDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -7954,25 +7926,25 @@ void IR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::PublishesDef_ptr IR::PublishesDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return PublishesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (PublishesDef::_nil ());
       if (is_a == 0)
         return PublishesDef::_nil ();
     }
-  return PublishesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PublishesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::PublishesDef_ptr IR::PublishesDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -8027,7 +7999,7 @@ IR::PublishesDef::_duplicate (PublishesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
@@ -8037,7 +8009,7 @@ CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environ
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -8155,11 +8127,11 @@ tao_IR_ConsumesDef_nil (
 
 IR::ConsumesDef_ptr
 tao_IR_ConsumesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::ConsumesDef::_narrow (p, ACE_TRY_ENV);
+  return IR::ConsumesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8282,11 +8254,11 @@ IR::ConsumesDef_var::tao_nil (void)
 
 ::IR::ConsumesDef_ptr
 IR::ConsumesDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::ConsumesDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::ConsumesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8412,8 +8384,8 @@ IR::_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker
 
 IR::_TAO_ConsumesDef_Proxy_Impl&
 IR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::ConsumesDef *,
-  CORBA::Environment &
+  ::IR::ConsumesDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -8455,25 +8427,25 @@ void IR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::ConsumesDef_ptr IR::ConsumesDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ConsumesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ConsumesDef::_nil ());
       if (is_a == 0)
         return ConsumesDef::_nil ();
     }
-  return ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ConsumesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -8528,7 +8500,7 @@ IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
@@ -8538,7 +8510,7 @@ CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environm
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -8655,11 +8627,11 @@ tao_IR_ComponentDef_nil (
 
 IR::ComponentDef_ptr
 tao_IR_ComponentDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::ComponentDef::_narrow (p, ACE_TRY_ENV);
+  return IR::ComponentDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8782,11 +8754,11 @@ IR::ComponentDef_var::tao_nil (void)
 
 ::IR::ComponentDef_ptr
 IR::ComponentDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::ComponentDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::ComponentDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8863,27 +8835,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get : public TA
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -8897,31 +8865,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -8929,13 +8897,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORB
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -8957,27 +8925,23 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -8991,20 +8955,20 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     supported_interfaces_ (supported_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9020,12 +8984,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9033,13 +8997,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORB
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9050,27 +9014,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_base_component_get : public TAO_Clie
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::ComponentDef_ptr result);
@@ -9084,31 +9044,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9116,13 +9076,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Env
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9143,27 +9103,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::ProvidesDefSeq * result);
@@ -9177,31 +9133,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9209,13 +9165,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9236,27 +9192,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_Cli
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::UsesDefSeq * result);
@@ -9270,31 +9222,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9302,13 +9254,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::En
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9329,27 +9281,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get : public TAO_Client
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::EmitsDefSeq * result);
@@ -9363,31 +9311,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9395,13 +9343,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Envir
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9422,27 +9370,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_Cl
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::PublishesDefSeq * result);
@@ -9456,31 +9400,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9488,13 +9432,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9515,27 +9459,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_Cli
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::ConsumesDefSeq * result);
@@ -9549,31 +9489,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9581,13 +9521,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::En
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9608,27 +9548,23 @@ class TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ClientRequ
 public:
   TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Boolean result);
@@ -9642,31 +9578,31 @@ private:
 
 TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9674,13 +9610,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environme
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9705,27 +9641,23 @@ 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));
 
   void result (IR::ProvidesDef_ptr result);
@@ -9747,8 +9679,8 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -9758,12 +9690,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9788,12 +9720,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9801,13 +9733,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9833,27 +9765,23 @@ 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));
 
   void result (IR::UsesDef_ptr result);
@@ -9877,8 +9805,8 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -9889,12 +9817,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_Comp
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9922,12 +9850,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9935,13 +9863,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environmen
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -9966,27 +9894,23 @@ 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));
 
   void result (IR::EmitsDef_ptr result);
@@ -10008,8 +9932,8 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -10019,12 +9943,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_Com
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10049,12 +9973,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10062,13 +9986,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environme
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10093,27 +10017,23 @@ 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));
 
   void result (IR::PublishesDef_ptr result);
@@ -10135,8 +10055,8 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -10146,12 +10066,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10176,12 +10096,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10189,13 +10109,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Envir
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10220,27 +10140,23 @@ 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));
 
   void result (IR::ConsumesDef_ptr result);
@@ -10262,8 +10178,8 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -10273,12 +10189,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10303,12 +10219,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10316,13 +10232,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -10353,8 +10269,8 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
 // Remote Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_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
@@ -10397,8 +10313,8 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10413,8 +10329,8 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10426,17 +10342,17 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10452,8 +10368,8 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10480,8 +10396,8 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10490,13 +10406,13 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -10507,7 +10423,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10523,8 +10439,8 @@ return _tao_safe_retval._retn ();
 
 void IR::_TAO_ComponentDef_Remote_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
@@ -10566,8 +10482,8 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
       TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        supported_interfaces,
-        ACE_TRY_ENV
+        supported_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -10582,8 +10498,8 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10595,12 +10511,12 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -10613,7 +10529,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10628,8 +10544,8 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10642,8 +10558,8 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10652,13 +10568,13 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -10669,7 +10585,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10684,8 +10600,8 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
 }
 
 IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_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
@@ -10727,8 +10643,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10743,8 +10659,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10756,17 +10672,17 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10782,8 +10698,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10810,8 +10726,8 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10820,13 +10736,13 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -10837,7 +10753,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10852,8 +10768,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_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
@@ -10896,8 +10812,8 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10912,8 +10828,8 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10925,17 +10841,17 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10951,8 +10867,8 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10979,8 +10895,8 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10989,13 +10905,13 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11006,7 +10922,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11021,8 +10937,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_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
@@ -11065,8 +10981,8 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11081,8 +10997,8 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11094,17 +11010,17 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11120,8 +11036,8 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11148,8 +11064,8 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11158,13 +11074,13 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11175,7 +11091,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11190,8 +11106,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_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
@@ -11234,8 +11150,8 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11250,8 +11166,8 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11263,17 +11179,17 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11289,8 +11205,8 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11317,8 +11233,8 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11327,13 +11243,13 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11344,7 +11260,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11359,8 +11275,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_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
@@ -11403,8 +11319,8 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11419,8 +11335,8 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11432,17 +11348,17 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11458,8 +11374,8 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11486,8 +11402,8 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11496,13 +11412,13 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11513,7 +11429,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11528,8 +11444,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_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
@@ -11572,8 +11488,8 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11588,8 +11504,8 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11601,17 +11517,17 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11627,8 +11543,8 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11655,8 +11571,8 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11665,13 +11581,13 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11682,7 +11598,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11697,8 +11613,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA::Boolean IR::_TAO_ComponentDef_Remote_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
@@ -11739,8 +11655,8 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -11755,8 +11671,8 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11768,17 +11684,17 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11794,8 +11710,8 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11821,8 +11737,8 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11831,13 +11747,13 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11848,7 +11764,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11867,8 +11783,8 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::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
@@ -11914,8 +11830,8 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
         id,
         name,
         version,
-        interface_type,
-        ACE_TRY_ENV
+        interface_type
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11930,8 +11846,8 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11943,12 +11859,12 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -11965,7 +11881,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11981,8 +11897,8 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12009,8 +11925,8 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12019,13 +11935,13 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -12036,7 +11952,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12056,8 +11972,8 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_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
@@ -12104,8 +12020,8 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
         name,
         version,
         interface_type,
-        is_multiple,
-        ACE_TRY_ENV
+        is_multiple
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12120,8 +12036,8 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12133,12 +12049,12 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12156,7 +12072,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12172,8 +12088,8 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12200,8 +12116,8 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12210,13 +12126,13 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -12227,7 +12143,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12246,8 +12162,8 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_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
@@ -12293,8 +12209,8 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12309,8 +12225,8 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12322,12 +12238,12 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12344,7 +12260,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12360,8 +12276,8 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12388,8 +12304,8 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12398,13 +12314,13 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -12415,7 +12331,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12434,8 +12350,8 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::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
@@ -12481,8 +12397,8 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12497,8 +12413,8 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12510,12 +12426,12 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12532,7 +12448,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12548,8 +12464,8 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12576,8 +12492,8 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12586,13 +12502,13 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -12603,7 +12519,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12622,8 +12538,8 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::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
@@ -12669,8 +12585,8 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12685,8 +12601,8 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12698,12 +12614,12 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12720,7 +12636,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12736,8 +12652,8 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12764,8 +12680,8 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12774,13 +12690,13 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -12791,7 +12707,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12845,8 +12761,8 @@ IR::_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broke
 
 IR::_TAO_ComponentDef_Proxy_Impl&
 IR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::ComponentDef *,
-  CORBA::Environment &
+  ::IR::ComponentDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -12888,25 +12804,25 @@ void IR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::ComponentDef_ptr IR::ComponentDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ComponentDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ComponentDef::_nil ());
       if (is_a == 0)
         return ComponentDef::_nil ();
     }
-  return ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ComponentDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -12961,7 +12877,7 @@ IR::ComponentDef::_duplicate (ComponentDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
@@ -12973,7 +12889,7 @@ CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environ
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
@@ -13058,157 +12974,157 @@ const char* IR::ComponentDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.supported_interfaces (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void IR::ComponentDef::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_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.supported_interfaces (
       this,
-      supported_interfaces,
-      ACE_TRY_ENV
+      supported_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::ComponentDef_ptr IR::ComponentDef::base_component (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_component (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.provides_interfaces (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.uses_interfaces (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::EmitsDefSeq * IR::ComponentDef::emits_events (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.emits_events (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.publishes_events (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.consumes_events (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean IR::ComponentDef::is_basic (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_basic (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -13216,15 +13132,15 @@ IR::ProvidesDef_ptr IR::ComponentDef::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
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_provides (
@@ -13232,8 +13148,8 @@ IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
       id,
       name,
       version,
-      interface_type,
-      ACE_TRY_ENV
+      interface_type
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -13242,15 +13158,15 @@ IR::UsesDef_ptr IR::ComponentDef::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
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_uses (
@@ -13259,8 +13175,8 @@ IR::UsesDef_ptr IR::ComponentDef::create_uses (
       name,
       version,
       interface_type,
-      is_multiple,
-      ACE_TRY_ENV
+      is_multiple
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -13268,15 +13184,15 @@ IR::EmitsDef_ptr IR::ComponentDef::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_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_emits (
@@ -13284,8 +13200,8 @@ IR::EmitsDef_ptr IR::ComponentDef::create_emits (
       id,
       name,
       version,
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -13293,15 +13209,15 @@ IR::PublishesDef_ptr IR::ComponentDef::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_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_publishes (
@@ -13309,8 +13225,8 @@ IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
       id,
       name,
       version,
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -13318,15 +13234,15 @@ IR::ConsumesDef_ptr IR::ComponentDef::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_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_consumes (
@@ -13334,8 +13250,8 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
       id,
       name,
       version,
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -14331,11 +14247,11 @@ tao_IR_PrimaryKeyDef_nil (
 
 IR::PrimaryKeyDef_ptr
 tao_IR_PrimaryKeyDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::PrimaryKeyDef::_narrow (p, ACE_TRY_ENV);
+  return IR::PrimaryKeyDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -14458,11 +14374,11 @@ IR::PrimaryKeyDef_var::tao_nil (void)
 
 ::IR::PrimaryKeyDef_ptr
 IR::PrimaryKeyDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::PrimaryKeyDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::PrimaryKeyDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -14540,27 +14456,23 @@ public:
   TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA::Boolean result);
@@ -14576,20 +14488,20 @@ private:
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * primary_key_id,
-    CORBA::Environment &
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     primary_key_id_ (primary_key_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14605,12 +14517,12 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14618,13 +14530,13 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14645,27 +14557,23 @@ class TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_Client
 public:
   TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ValueDef_ptr result);
@@ -14679,31 +14587,31 @@ private:
 
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14711,13 +14619,13 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Envir
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -14749,8 +14657,8 @@ IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (
 
 CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_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
@@ -14792,8 +14700,8 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
       TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
         &_tao_call,
         _collocated_tao_target_,
-        primary_key_id,
-        ACE_TRY_ENV
+        primary_key_id
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -14808,8 +14716,8 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14821,12 +14729,12 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -14840,7 +14748,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14856,8 +14764,8 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14883,8 +14791,8 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14893,13 +14801,13 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -14910,7 +14818,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14925,8 +14833,8 @@ return _tao_retval;
 }
 
 CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_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
@@ -14968,8 +14876,8 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -14984,8 +14892,8 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14997,17 +14905,17 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -15023,8 +14931,8 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -15051,8 +14959,8 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -15061,13 +14969,13 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -15078,7 +14986,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -15132,8 +15040,8 @@ IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Bro
 
 IR::_TAO_PrimaryKeyDef_Proxy_Impl&
 IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::PrimaryKeyDef *,
-  CORBA::Environment &
+  ::IR::PrimaryKeyDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -15175,25 +15083,25 @@ void IR::PrimaryKeyDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return PrimaryKeyDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (PrimaryKeyDef::_nil ());
       if (is_a == 0)
         return PrimaryKeyDef::_nil ();
     }
-  return PrimaryKeyDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PrimaryKeyDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -15248,7 +15156,7 @@ IR::PrimaryKeyDef::_duplicate (PrimaryKeyDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
@@ -15257,7 +15165,7 @@ CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Enviro
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
@@ -15306,38 +15214,38 @@ const char* IR::PrimaryKeyDef::_interface_repository_id (void) const
 }
 
 CORBA::Boolean IR::PrimaryKeyDef::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
   ))
 {
   _TAO_PrimaryKeyDef_Proxy_Impl &proxy =
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
-      primary_key_id,
-      ACE_TRY_ENV
+      primary_key_id
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDef_ptr IR::PrimaryKeyDef::primary_key (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_PrimaryKeyDef_Proxy_Impl &proxy =
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.primary_key (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -15555,11 +15463,11 @@ tao_IR_FactoryDef_nil (
 
 IR::FactoryDef_ptr
 tao_IR_FactoryDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::FactoryDef::_narrow (p, ACE_TRY_ENV);
+  return IR::FactoryDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15682,11 +15590,11 @@ IR::FactoryDef_var::tao_nil (void)
 
 ::IR::FactoryDef_ptr
 IR::FactoryDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::FactoryDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::FactoryDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15812,8 +15720,8 @@ IR::_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (v
 
 IR::_TAO_FactoryDef_Proxy_Impl&
 IR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::FactoryDef *,
-  CORBA::Environment &
+  ::IR::FactoryDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -15855,25 +15763,25 @@ void IR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::FactoryDef_ptr IR::FactoryDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return FactoryDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (FactoryDef::_nil ());
       if (is_a == 0)
         return FactoryDef::_nil ();
     }
-  return FactoryDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return FactoryDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::FactoryDef_ptr IR::FactoryDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -15928,7 +15836,7 @@ IR::FactoryDef::_duplicate (FactoryDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
@@ -15938,7 +15846,7 @@ CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environme
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
@@ -16055,11 +15963,11 @@ tao_IR_FinderDef_nil (
 
 IR::FinderDef_ptr
 tao_IR_FinderDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::FinderDef::_narrow (p, ACE_TRY_ENV);
+  return IR::FinderDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16182,11 +16090,11 @@ IR::FinderDef_var::tao_nil (void)
 
 ::IR::FinderDef_ptr
 IR::FinderDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::FinderDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::FinderDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16312,8 +16220,8 @@ IR::_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (voi
 
 IR::_TAO_FinderDef_Proxy_Impl&
 IR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::FinderDef *,
-  CORBA::Environment &
+  ::IR::FinderDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -16355,25 +16263,25 @@ void IR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::FinderDef_ptr IR::FinderDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return FinderDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (FinderDef::_nil ());
       if (is_a == 0)
         return FinderDef::_nil ();
     }
-  return FinderDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return FinderDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::FinderDef_ptr IR::FinderDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -16428,7 +16336,7 @@ IR::FinderDef::_duplicate (FinderDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
@@ -16438,7 +16346,7 @@ CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value, CORBA::Environmen
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
@@ -16555,11 +16463,11 @@ tao_IR_HomeDef_nil (
 
 IR::HomeDef_ptr
 tao_IR_HomeDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IR::HomeDef::_narrow (p, ACE_TRY_ENV);
+  return IR::HomeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16682,11 +16590,11 @@ IR::HomeDef_var::tao_nil (void)
 
 ::IR::HomeDef_ptr
 IR::HomeDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IR::HomeDef::_narrow (p, ACE_TRY_ENV);
+  return ::IR::HomeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16763,27 +16671,23 @@ class TAO_ClientRequestInfo_IR_HomeDef_base_home_get : public TAO_ClientRequestI
 public:
   TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::HomeDef_ptr result);
@@ -16797,31 +16701,31 @@ private:
 
 TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -16829,13 +16733,13 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -16856,27 +16760,23 @@ class TAO_ClientRequestInfo_IR_HomeDef_managed_component_get : public TAO_Client
 public:
   TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::ComponentDef_ptr result);
@@ -16890,31 +16790,31 @@ private:
 
 TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -16922,13 +16822,13 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Envir
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -16949,27 +16849,23 @@ class TAO_ClientRequestInfo_IR_HomeDef_primary_key_get : public TAO_ClientReques
 public:
   TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -16983,31 +16879,31 @@ private:
 
 TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17015,13 +16911,13 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17042,27 +16938,23 @@ class TAO_ClientRequestInfo_IR_HomeDef_factories_get : public TAO_ClientRequestI
 public:
   TAO_ClientRequestInfo_IR_HomeDef_factories_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::FactoryDefSeq * result);
@@ -17076,31 +16968,31 @@ private:
 
 TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17108,13 +17000,13 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17135,27 +17027,23 @@ class TAO_ClientRequestInfo_IR_HomeDef_finders_get : public TAO_ClientRequestInf
 public:
   TAO_ClientRequestInfo_IR_HomeDef_finders_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (IR::FinderDefSeq * result);
@@ -17169,31 +17057,31 @@ private:
 
 TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17201,13 +17089,13 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &AC
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17228,27 +17116,23 @@ class TAO_ClientRequestInfo_IR_HomeDef_is_basic_get : public TAO_ClientRequestIn
 public:
   TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Boolean result);
@@ -17262,31 +17146,31 @@ private:
 
 TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17294,13 +17178,13 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17325,27 +17209,23 @@ 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));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -17367,8 +17247,8 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -17378,12 +17258,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_Ho
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17408,12 +17288,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17421,13 +17301,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17453,27 +17333,23 @@ 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));
 
   void result (IR::FactoryDef_ptr result);
@@ -17497,8 +17373,8 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -17509,12 +17385,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17542,12 +17418,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17555,13 +17431,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17587,27 +17463,23 @@ 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));
 
   void result (IR::FinderDef_ptr result);
@@ -17631,8 +17503,8 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -17643,12 +17515,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17676,12 +17548,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17689,13 +17561,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -17726,8 +17598,8 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_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
@@ -17769,8 +17641,8 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17785,8 +17657,8 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17798,17 +17670,17 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17824,8 +17696,8 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -17852,8 +17724,8 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17862,13 +17734,13 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -17879,7 +17751,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -17894,8 +17766,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_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
@@ -17937,8 +17809,8 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17953,8 +17825,8 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17966,17 +17838,17 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17992,8 +17864,8 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18020,8 +17892,8 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18030,13 +17902,13 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18047,7 +17919,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18062,8 +17934,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_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
@@ -18105,8 +17977,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18121,8 +17993,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18134,17 +18006,17 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18160,8 +18032,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18188,8 +18060,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18198,13 +18070,13 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18215,7 +18087,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18230,8 +18102,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_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
@@ -18274,8 +18146,8 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18290,8 +18162,8 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18303,17 +18175,17 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18329,8 +18201,8 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18357,8 +18229,8 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18367,13 +18239,13 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18384,7 +18256,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18399,8 +18271,8 @@ return _tao_safe_retval._retn ();
 }
 
 IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_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
@@ -18443,8 +18315,8 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18459,8 +18331,8 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18472,17 +18344,17 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18498,8 +18370,8 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18526,8 +18398,8 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18536,13 +18408,13 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18553,7 +18425,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18568,8 +18440,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA::Boolean IR::_TAO_HomeDef_Remote_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
@@ -18610,8 +18482,8 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -18626,8 +18498,8 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18639,17 +18511,17 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18665,8 +18537,8 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18692,8 +18564,8 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18702,13 +18574,13 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18719,7 +18591,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18738,8 +18610,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::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
@@ -18785,8 +18657,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
         id,
         name,
         version,
-        primary_key,
-        ACE_TRY_ENV
+        primary_key
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18801,8 +18673,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18814,12 +18686,12 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -18836,7 +18708,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18852,8 +18724,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18880,8 +18752,8 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18890,13 +18762,13 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -18907,7 +18779,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18927,8 +18799,8 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_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
@@ -18975,8 +18847,8 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
         name,
         version,
         params,
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18991,8 +18863,8 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19004,12 +18876,12 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -19027,7 +18899,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19043,8 +18915,8 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19071,8 +18943,8 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19081,13 +18953,13 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -19098,7 +18970,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19118,8 +18990,8 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_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
@@ -19166,8 +19038,8 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
         name,
         version,
         params,
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -19182,8 +19054,8 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19195,12 +19067,12 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -19218,7 +19090,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19234,8 +19106,8 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19262,8 +19134,8 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19272,13 +19144,13 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -19289,7 +19161,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19343,8 +19215,8 @@ IR::_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
 
 IR::_TAO_HomeDef_Proxy_Impl&
 IR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
-  ::IR::HomeDef *,
-  CORBA::Environment &
+  ::IR::HomeDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -19386,25 +19258,25 @@ void IR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 IR::HomeDef_ptr IR::HomeDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return HomeDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (HomeDef::_nil ());
       if (is_a == 0)
         return HomeDef::_nil ();
     }
-  return HomeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return HomeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IR::HomeDef_ptr IR::HomeDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -19459,7 +19331,7 @@ IR::HomeDef::_duplicate (HomeDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
@@ -19471,7 +19343,7 @@ CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
@@ -19556,104 +19428,104 @@ const char* IR::HomeDef::_interface_repository_id (void) const
 }
 
 IR::HomeDef_ptr IR::HomeDef::base_home (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_home (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::ComponentDef_ptr IR::HomeDef::managed_component (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.managed_component (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.primary_key (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::FactoryDefSeq * IR::HomeDef::factories (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.factories (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 IR::FinderDefSeq * IR::HomeDef::finders (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.finders (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean IR::HomeDef::is_basic (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_basic (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -19661,15 +19533,15 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::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_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_primary_key (
@@ -19677,8 +19549,8 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
       id,
       name,
       version,
-      primary_key,
-      ACE_TRY_ENV
+      primary_key
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -19687,15 +19559,15 @@ IR::FactoryDef_ptr IR::HomeDef::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
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_factory (
@@ -19704,8 +19576,8 @@ IR::FactoryDef_ptr IR::HomeDef::create_factory (
       name,
       version,
       params,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -19714,15 +19586,15 @@ IR::FinderDef_ptr IR::HomeDef::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
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_finder (
@@ -19731,8 +19603,8 @@ IR::FinderDef_ptr IR::HomeDef::create_finder (
       name,
       version,
       params,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -21145,7 +21017,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::RepositoryIdSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21236,7 +21108,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDefSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21327,7 +21199,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDefSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21418,7 +21290,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDefSeq *&_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21509,7 +21381,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDefSeq *&_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21600,7 +21472,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EmitsDefSeq *&
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21691,7 +21563,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PublishesDefSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21782,7 +21654,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConsumesDefSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21873,7 +21745,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FactoryDefSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21964,7 +21836,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FinderDefSeq *
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22033,7 +21905,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentRepository_
     _tao_elem = IR::ComponentRepository::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22094,7 +21966,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDef_ptr &_ta
     _tao_elem = IR::ProvidesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22169,7 +22041,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescri
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22238,7 +22110,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDef_ptr &_tao_el
     _tao_elem = IR::UsesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22313,7 +22185,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescriptio
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22404,7 +22276,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22495,7 +22367,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescSeq *&
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22564,7 +22436,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDef_ptr &_tao_e
     _tao_elem = IR::EventDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EventDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EventDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22639,7 +22511,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EventDescripti
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22708,7 +22580,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDef_ptr &_tao_e
     _tao_elem = IR::EmitsDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22769,7 +22641,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDef_ptr &_t
     _tao_elem = IR::PublishesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22830,7 +22702,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDef_ptr &_ta
     _tao_elem = IR::ConsumesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22891,7 +22763,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDef_ptr &_t
     _tao_elem = IR::ComponentDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22966,7 +22838,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDescr
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23035,7 +22907,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr &_
     _tao_elem = IR::PrimaryKeyDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23110,7 +22982,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PrimaryKeyDesc
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23179,7 +23051,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDef_ptr &_tao
     _tao_elem = IR::FactoryDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23240,7 +23112,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDef_ptr &_tao_
     _tao_elem = IR::FinderDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23301,7 +23173,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDef_ptr &_tao_el
     _tao_elem = IR::HomeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23376,7 +23248,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDescriptio
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23864,8 +23736,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::ComponentRepository::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -23900,8 +23772,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::ProvidesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -23936,8 +23808,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::UsesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24056,8 +23928,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::EventDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24092,8 +23964,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::EmitsDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24128,8 +24000,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::PublishesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24164,8 +24036,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::ConsumesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24200,8 +24072,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::ComponentDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24236,8 +24108,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::PrimaryKeyDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24272,8 +24144,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::FactoryDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24308,8 +24180,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::FinderDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24344,8 +24216,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       IR::HomeDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 0e983adad5a..86c1ce37159 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -60,65 +60,65 @@ TAO_NAMESPACE  IR
   typedef CORBA::String_var Identifier_var;
   typedef CORBA::String_out Identifier_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
-  
+
   typedef char * ScopedName;
   typedef CORBA::String_var ScopedName_var;
   typedef CORBA::String_out ScopedName_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
-  
+
   typedef char * RepositoryId;
   typedef CORBA::String_var RepositoryId_var;
   typedef CORBA::String_out RepositoryId_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
-  
-  
+
+
 #if !defined (_IR_REPOSITORYIDSEQ_CH_)
 #define _IR_REPOSITORYIDSEQ_CH_
-  
+
   class RepositoryIdSeq;
   class RepositoryIdSeq_var;
-  
+
   // *************************************************************
   // RepositoryIdSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export RepositoryIdSeq : public 
+
+  class TAO_IFR_Client_Export RepositoryIdSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     RepositoryIdSeq (void); // default ctor
     RepositoryIdSeq (CORBA::ULong max); // uses max size
     RepositoryIdSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        char * *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        char * *buffer,
         CORBA::Boolean release = 0
       );
     RepositoryIdSeq (const RepositoryIdSeq &); // copy ctor
     ~RepositoryIdSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef RepositoryIdSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_REPOSITORYIDSEQ___VAR_CH_)
 #define _IR_REPOSITORYIDSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::RepositoryIdSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export RepositoryIdSeq_var
   {
   public:
@@ -126,37 +126,37 @@ TAO_NAMESPACE  IR
     RepositoryIdSeq_var (RepositoryIdSeq *);
     RepositoryIdSeq_var (const RepositoryIdSeq_var &);
     ~RepositoryIdSeq_var (void);
-    
+
     RepositoryIdSeq_var &operator= (RepositoryIdSeq *);
     RepositoryIdSeq_var &operator= (const RepositoryIdSeq_var &);
     RepositoryIdSeq *operator-> (void);
     const RepositoryIdSeq *operator-> (void) const;
-    
+
     operator const RepositoryIdSeq &() const;
     operator RepositoryIdSeq &();
     operator RepositoryIdSeq &() const;
     operator RepositoryIdSeq *&(); // variable-size base types only
-    
+
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const RepositoryIdSeq &in (void) const;
     RepositoryIdSeq &inout (void);
     RepositoryIdSeq *&out (void);
     RepositoryIdSeq *_retn (void);
     RepositoryIdSeq *ptr (void) const;
-  
+
   private:
     RepositoryIdSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_REPOSITORYIDSEQ___OUT_CH_)
 #define _IR_REPOSITORYIDSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export RepositoryIdSeq_out
   {
   public:
@@ -169,68 +169,68 @@ TAO_NAMESPACE  IR
     RepositoryIdSeq *&ptr (void);
     RepositoryIdSeq *operator-> (void);
     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  
+
   private:
     RepositoryIdSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const RepositoryIdSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-  
+
   typedef char * VersionSpec;
   typedef CORBA::String_var VersionSpec_var;
   typedef CORBA::String_out VersionSpec_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
-  
+
   class ComponentDef;
-  
+
 #if !defined (_IR_COMPONENTDEF___PTR_CH_)
 #define _IR_COMPONENTDEF___PTR_CH_
-  
+
   typedef ComponentDef *ComponentDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTDEF___VAR_CH_)
 #define _IR_COMPONENTDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
   {
   public:
     ComponentDef_var (void); // default constructor
-    ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
+    ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {}
     ComponentDef_var (const ComponentDef_var &); // copy constructor
     ~ComponentDef_var (void); // destructor
-    
+
     ComponentDef_var &operator= (ComponentDef_ptr);
     ComponentDef_var &operator= (const ComponentDef_var &);
     ComponentDef_ptr operator-> (void) const;
-    
+
     operator const ComponentDef_ptr &() const;
     operator ComponentDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ComponentDef_ptr in (void) const;
     ComponentDef_ptr &inout (void);
     ComponentDef_ptr &out (void);
     ComponentDef_ptr _retn (void);
     ComponentDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ComponentDef_ptr tao_duplicate (ComponentDef_ptr);
     static void tao_release (ComponentDef_ptr);
     static ComponentDef_ptr tao_nil (void);
     static ComponentDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ComponentDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -240,11 +240,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTDEF___OUT_CH_)
 #define _IR_COMPONENTDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export ComponentDef_out
   {
   public:
@@ -257,20 +257,20 @@ TAO_NAMESPACE  IR
     operator ComponentDef_ptr &();
     ComponentDef_ptr &ptr (void);
     ComponentDef_ptr operator-> (void);
-  
+
   private:
     ComponentDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -291,14 +291,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static ComponentDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (ComponentDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -308,68 +308,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_COMPONENTDEFSEQ_CH_)
 #define _IR_COMPONENTDEFSEQ_CH_
-  
+
   class ComponentDefSeq;
   class ComponentDefSeq_var;
-  
+
   // *************************************************************
   // ComponentDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export ComponentDefSeq : public 
+
+  class TAO_IFR_Client_Export ComponentDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<ComponentDef,ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     ComponentDefSeq (void); // default ctor
     ComponentDefSeq (CORBA::ULong max); // uses max size
     ComponentDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ComponentDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ComponentDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     ComponentDefSeq (const ComponentDefSeq &); // copy ctor
     ~ComponentDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ComponentDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTDEFSEQ___VAR_CH_)
 #define _IR_COMPONENTDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::ComponentDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export ComponentDefSeq_var
   {
   public:
@@ -377,37 +376,37 @@ TAO_NAMESPACE  IR
     ComponentDefSeq_var (ComponentDefSeq *);
     ComponentDefSeq_var (const ComponentDefSeq_var &);
     ~ComponentDefSeq_var (void);
-    
+
     ComponentDefSeq_var &operator= (ComponentDefSeq *);
     ComponentDefSeq_var &operator= (const ComponentDefSeq_var &);
     ComponentDefSeq *operator-> (void);
     const ComponentDefSeq *operator-> (void) const;
-    
+
     operator const ComponentDefSeq &() const;
     operator ComponentDefSeq &();
     operator ComponentDefSeq &() const;
     operator ComponentDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const ComponentDefSeq &in (void) const;
     ComponentDefSeq &inout (void);
     ComponentDefSeq *&out (void);
     ComponentDefSeq *_retn (void);
     ComponentDefSeq *ptr (void) const;
-  
+
   private:
     ComponentDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTDEFSEQ___OUT_CH_)
 #define _IR_COMPONENTDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export ComponentDefSeq_out
   {
   public:
@@ -420,63 +419,63 @@ TAO_NAMESPACE  IR
     ComponentDefSeq *&ptr (void);
     ComponentDefSeq *operator-> (void);
     TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     ComponentDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ComponentDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDefSeq;
-  
+
   class ProvidesDef;
-  
+
 #if !defined (_IR_PROVIDESDEF___PTR_CH_)
 #define _IR_PROVIDESDEF___PTR_CH_
-  
+
   typedef ProvidesDef *ProvidesDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PROVIDESDEF___VAR_CH_)
 #define _IR_PROVIDESDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export ProvidesDef_var : public TAO_Base_var
   {
   public:
     ProvidesDef_var (void); // default constructor
-    ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {} 
+    ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {}
     ProvidesDef_var (const ProvidesDef_var &); // copy constructor
     ~ProvidesDef_var (void); // destructor
-    
+
     ProvidesDef_var &operator= (ProvidesDef_ptr);
     ProvidesDef_var &operator= (const ProvidesDef_var &);
     ProvidesDef_ptr operator-> (void) const;
-    
+
     operator const ProvidesDef_ptr &() const;
     operator ProvidesDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ProvidesDef_ptr in (void) const;
     ProvidesDef_ptr &inout (void);
     ProvidesDef_ptr &out (void);
     ProvidesDef_ptr _retn (void);
     ProvidesDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ProvidesDef_ptr tao_duplicate (ProvidesDef_ptr);
     static void tao_release (ProvidesDef_ptr);
     static ProvidesDef_ptr tao_nil (void);
     static ProvidesDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ProvidesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -486,11 +485,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PROVIDESDEF___OUT_CH_)
 #define _IR_PROVIDESDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export ProvidesDef_out
   {
   public:
@@ -503,20 +502,20 @@ TAO_NAMESPACE  IR
     operator ProvidesDef_ptr &();
     ProvidesDef_ptr &ptr (void);
     ProvidesDef_ptr operator-> (void);
-  
+
   private:
     ProvidesDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -537,14 +536,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static ProvidesDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (ProvidesDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -554,68 +553,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_PROVIDESDEFSEQ_CH_)
 #define _IR_PROVIDESDEFSEQ_CH_
-  
+
   class ProvidesDefSeq;
   class ProvidesDefSeq_var;
-  
+
   // *************************************************************
   // ProvidesDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export ProvidesDefSeq : public 
+
+  class TAO_IFR_Client_Export ProvidesDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<ProvidesDef,ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     ProvidesDefSeq (void); // default ctor
     ProvidesDefSeq (CORBA::ULong max); // uses max size
     ProvidesDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ProvidesDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ProvidesDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     ProvidesDefSeq (const ProvidesDefSeq &); // copy ctor
     ~ProvidesDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ProvidesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PROVIDESDEFSEQ___VAR_CH_)
 #define _IR_PROVIDESDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::ProvidesDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export ProvidesDefSeq_var
   {
   public:
@@ -623,37 +621,37 @@ TAO_NAMESPACE  IR
     ProvidesDefSeq_var (ProvidesDefSeq *);
     ProvidesDefSeq_var (const ProvidesDefSeq_var &);
     ~ProvidesDefSeq_var (void);
-    
+
     ProvidesDefSeq_var &operator= (ProvidesDefSeq *);
     ProvidesDefSeq_var &operator= (const ProvidesDefSeq_var &);
     ProvidesDefSeq *operator-> (void);
     const ProvidesDefSeq *operator-> (void) const;
-    
+
     operator const ProvidesDefSeq &() const;
     operator ProvidesDefSeq &();
     operator ProvidesDefSeq &() const;
     operator ProvidesDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const ProvidesDefSeq &in (void) const;
     ProvidesDefSeq &inout (void);
     ProvidesDefSeq *&out (void);
     ProvidesDefSeq *_retn (void);
     ProvidesDefSeq *ptr (void) const;
-  
+
   private:
     ProvidesDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PROVIDESDEFSEQ___OUT_CH_)
 #define _IR_PROVIDESDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export ProvidesDefSeq_out
   {
   public:
@@ -666,63 +664,63 @@ TAO_NAMESPACE  IR
     ProvidesDefSeq *&ptr (void);
     ProvidesDefSeq *operator-> (void);
     TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     ProvidesDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ProvidesDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDefSeq;
-  
+
   class UsesDef;
-  
+
 #if !defined (_IR_USESDEF___PTR_CH_)
 #define _IR_USESDEF___PTR_CH_
-  
+
   typedef UsesDef *UsesDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_USESDEF___VAR_CH_)
 #define _IR_USESDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
   {
   public:
     UsesDef_var (void); // default constructor
-    UsesDef_var (UsesDef_ptr p) : ptr_ (p) {} 
+    UsesDef_var (UsesDef_ptr p) : ptr_ (p) {}
     UsesDef_var (const UsesDef_var &); // copy constructor
     ~UsesDef_var (void); // destructor
-    
+
     UsesDef_var &operator= (UsesDef_ptr);
     UsesDef_var &operator= (const UsesDef_var &);
     UsesDef_ptr operator-> (void) const;
-    
+
     operator const UsesDef_ptr &() const;
     operator UsesDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     UsesDef_ptr in (void) const;
     UsesDef_ptr &inout (void);
     UsesDef_ptr &out (void);
     UsesDef_ptr _retn (void);
     UsesDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static UsesDef_ptr tao_duplicate (UsesDef_ptr);
     static void tao_release (UsesDef_ptr);
     static UsesDef_ptr tao_nil (void);
     static UsesDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     UsesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -732,11 +730,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_USESDEF___OUT_CH_)
 #define _IR_USESDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export UsesDef_out
   {
   public:
@@ -749,20 +747,20 @@ TAO_NAMESPACE  IR
     operator UsesDef_ptr &();
     UsesDef_ptr &ptr (void);
     UsesDef_ptr operator-> (void);
-  
+
   private:
     UsesDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -783,14 +781,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static UsesDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (UsesDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -800,68 +798,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_USESDEFSEQ_CH_)
 #define _IR_USESDEFSEQ_CH_
-  
+
   class UsesDefSeq;
   class UsesDefSeq_var;
-  
+
   // *************************************************************
   // UsesDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export UsesDefSeq : public 
+
+  class TAO_IFR_Client_Export UsesDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<UsesDef,UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     UsesDefSeq (void); // default ctor
     UsesDefSeq (CORBA::ULong max); // uses max size
     UsesDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        UsesDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        UsesDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     UsesDefSeq (const UsesDefSeq &); // copy ctor
     ~UsesDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef UsesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_USESDEFSEQ___VAR_CH_)
 #define _IR_USESDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::UsesDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export UsesDefSeq_var
   {
   public:
@@ -869,37 +866,37 @@ TAO_NAMESPACE  IR
     UsesDefSeq_var (UsesDefSeq *);
     UsesDefSeq_var (const UsesDefSeq_var &);
     ~UsesDefSeq_var (void);
-    
+
     UsesDefSeq_var &operator= (UsesDefSeq *);
     UsesDefSeq_var &operator= (const UsesDefSeq_var &);
     UsesDefSeq *operator-> (void);
     const UsesDefSeq *operator-> (void) const;
-    
+
     operator const UsesDefSeq &() const;
     operator UsesDefSeq &();
     operator UsesDefSeq &() const;
     operator UsesDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const UsesDefSeq &in (void) const;
     UsesDefSeq &inout (void);
     UsesDefSeq *&out (void);
     UsesDefSeq *_retn (void);
     UsesDefSeq *ptr (void) const;
-  
+
   private:
     UsesDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_USESDEFSEQ___OUT_CH_)
 #define _IR_USESDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export UsesDefSeq_out
   {
   public:
@@ -912,63 +909,63 @@ TAO_NAMESPACE  IR
     UsesDefSeq *&ptr (void);
     UsesDefSeq *operator-> (void);
     TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     UsesDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const UsesDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDefSeq;
-  
+
   class HomeDef;
-  
+
 #if !defined (_IR_HOMEDEF___PTR_CH_)
 #define _IR_HOMEDEF___PTR_CH_
-  
+
   typedef HomeDef *HomeDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_HOMEDEF___VAR_CH_)
 #define _IR_HOMEDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
   {
   public:
     HomeDef_var (void); // default constructor
-    HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
+    HomeDef_var (HomeDef_ptr p) : ptr_ (p) {}
     HomeDef_var (const HomeDef_var &); // copy constructor
     ~HomeDef_var (void); // destructor
-    
+
     HomeDef_var &operator= (HomeDef_ptr);
     HomeDef_var &operator= (const HomeDef_var &);
     HomeDef_ptr operator-> (void) const;
-    
+
     operator const HomeDef_ptr &() const;
     operator HomeDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     HomeDef_ptr in (void) const;
     HomeDef_ptr &inout (void);
     HomeDef_ptr &out (void);
     HomeDef_ptr _retn (void);
     HomeDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static HomeDef_ptr tao_duplicate (HomeDef_ptr);
     static void tao_release (HomeDef_ptr);
     static HomeDef_ptr tao_nil (void);
     static HomeDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     HomeDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -978,11 +975,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_HOMEDEF___OUT_CH_)
 #define _IR_HOMEDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export HomeDef_out
   {
   public:
@@ -995,20 +992,20 @@ TAO_NAMESPACE  IR
     operator HomeDef_ptr &();
     HomeDef_ptr &ptr (void);
     HomeDef_ptr operator-> (void);
-  
+
   private:
     HomeDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -1029,14 +1026,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static HomeDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (HomeDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -1046,68 +1043,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_HOMEDEFSEQ_CH_)
 #define _IR_HOMEDEFSEQ_CH_
-  
+
   class HomeDefSeq;
   class HomeDefSeq_var;
-  
+
   // *************************************************************
   // HomeDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export HomeDefSeq : public 
+
+  class TAO_IFR_Client_Export HomeDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<HomeDef,HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     HomeDefSeq (void); // default ctor
     HomeDefSeq (CORBA::ULong max); // uses max size
     HomeDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        HomeDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        HomeDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     HomeDefSeq (const HomeDefSeq &); // copy ctor
     ~HomeDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef HomeDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_HOMEDEFSEQ___VAR_CH_)
 #define _IR_HOMEDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::HomeDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export HomeDefSeq_var
   {
   public:
@@ -1115,37 +1111,37 @@ TAO_NAMESPACE  IR
     HomeDefSeq_var (HomeDefSeq *);
     HomeDefSeq_var (const HomeDefSeq_var &);
     ~HomeDefSeq_var (void);
-    
+
     HomeDefSeq_var &operator= (HomeDefSeq *);
     HomeDefSeq_var &operator= (const HomeDefSeq_var &);
     HomeDefSeq *operator-> (void);
     const HomeDefSeq *operator-> (void) const;
-    
+
     operator const HomeDefSeq &() const;
     operator HomeDefSeq &();
     operator HomeDefSeq &() const;
     operator HomeDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const HomeDefSeq &in (void) const;
     HomeDefSeq &inout (void);
     HomeDefSeq *&out (void);
     HomeDefSeq *_retn (void);
     HomeDefSeq *ptr (void) const;
-  
+
   private:
     HomeDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_HOMEDEFSEQ___OUT_CH_)
 #define _IR_HOMEDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export HomeDefSeq_out
   {
   public:
@@ -1158,63 +1154,63 @@ TAO_NAMESPACE  IR
     HomeDefSeq *&ptr (void);
     HomeDefSeq *operator-> (void);
     TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     HomeDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const HomeDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDefSeq;
-  
+
   class EventDef;
-  
+
 #if !defined (_IR_EVENTDEF___PTR_CH_)
 #define _IR_EVENTDEF___PTR_CH_
-  
+
   typedef EventDef *EventDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_EVENTDEF___VAR_CH_)
 #define _IR_EVENTDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
   {
   public:
     EventDef_var (void); // default constructor
-    EventDef_var (EventDef_ptr p) : ptr_ (p) {} 
+    EventDef_var (EventDef_ptr p) : ptr_ (p) {}
     EventDef_var (const EventDef_var &); // copy constructor
     ~EventDef_var (void); // destructor
-    
+
     EventDef_var &operator= (EventDef_ptr);
     EventDef_var &operator= (const EventDef_var &);
     EventDef_ptr operator-> (void) const;
-    
+
     operator const EventDef_ptr &() const;
     operator EventDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     EventDef_ptr in (void) const;
     EventDef_ptr &inout (void);
     EventDef_ptr &out (void);
     EventDef_ptr _retn (void);
     EventDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static EventDef_ptr tao_duplicate (EventDef_ptr);
     static void tao_release (EventDef_ptr);
     static EventDef_ptr tao_nil (void);
     static EventDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     EventDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1224,11 +1220,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_EVENTDEF___OUT_CH_)
 #define _IR_EVENTDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export EventDef_out
   {
   public:
@@ -1241,59 +1237,59 @@ TAO_NAMESPACE  IR
     operator EventDef_ptr &();
     EventDef_ptr &ptr (void);
     EventDef_ptr operator-> (void);
-  
+
   private:
     EventDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   class EmitsDef;
-  
+
 #if !defined (_IR_EMITSDEF___PTR_CH_)
 #define _IR_EMITSDEF___PTR_CH_
-  
+
   typedef EmitsDef *EmitsDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_EMITSDEF___VAR_CH_)
 #define _IR_EMITSDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export EmitsDef_var : public TAO_Base_var
   {
   public:
     EmitsDef_var (void); // default constructor
-    EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {} 
+    EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {}
     EmitsDef_var (const EmitsDef_var &); // copy constructor
     ~EmitsDef_var (void); // destructor
-    
+
     EmitsDef_var &operator= (EmitsDef_ptr);
     EmitsDef_var &operator= (const EmitsDef_var &);
     EmitsDef_ptr operator-> (void) const;
-    
+
     operator const EmitsDef_ptr &() const;
     operator EmitsDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     EmitsDef_ptr in (void) const;
     EmitsDef_ptr &inout (void);
     EmitsDef_ptr &out (void);
     EmitsDef_ptr _retn (void);
     EmitsDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static EmitsDef_ptr tao_duplicate (EmitsDef_ptr);
     static void tao_release (EmitsDef_ptr);
     static EmitsDef_ptr tao_nil (void);
     static EmitsDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     EmitsDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1303,11 +1299,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_EMITSDEF___OUT_CH_)
 #define _IR_EMITSDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export EmitsDef_out
   {
   public:
@@ -1320,20 +1316,20 @@ TAO_NAMESPACE  IR
     operator EmitsDef_ptr &();
     EmitsDef_ptr &ptr (void);
     EmitsDef_ptr operator-> (void);
-  
+
   private:
     EmitsDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -1354,14 +1350,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static EmitsDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (EmitsDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -1371,68 +1367,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_EMITSDEFSEQ_CH_)
 #define _IR_EMITSDEFSEQ_CH_
-  
+
   class EmitsDefSeq;
   class EmitsDefSeq_var;
-  
+
   // *************************************************************
   // EmitsDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export EmitsDefSeq : public 
+
+  class TAO_IFR_Client_Export EmitsDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<EmitsDef,EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     EmitsDefSeq (void); // default ctor
     EmitsDefSeq (CORBA::ULong max); // uses max size
     EmitsDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        EmitsDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        EmitsDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     EmitsDefSeq (const EmitsDefSeq &); // copy ctor
     ~EmitsDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef EmitsDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_EMITSDEFSEQ___VAR_CH_)
 #define _IR_EMITSDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::EmitsDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export EmitsDefSeq_var
   {
   public:
@@ -1440,37 +1435,37 @@ TAO_NAMESPACE  IR
     EmitsDefSeq_var (EmitsDefSeq *);
     EmitsDefSeq_var (const EmitsDefSeq_var &);
     ~EmitsDefSeq_var (void);
-    
+
     EmitsDefSeq_var &operator= (EmitsDefSeq *);
     EmitsDefSeq_var &operator= (const EmitsDefSeq_var &);
     EmitsDefSeq *operator-> (void);
     const EmitsDefSeq *operator-> (void) const;
-    
+
     operator const EmitsDefSeq &() const;
     operator EmitsDefSeq &();
     operator EmitsDefSeq &() const;
     operator EmitsDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const EmitsDefSeq &in (void) const;
     EmitsDefSeq &inout (void);
     EmitsDefSeq *&out (void);
     EmitsDefSeq *_retn (void);
     EmitsDefSeq *ptr (void) const;
-  
+
   private:
     EmitsDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_EMITSDEFSEQ___OUT_CH_)
 #define _IR_EMITSDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export EmitsDefSeq_out
   {
   public:
@@ -1483,63 +1478,63 @@ TAO_NAMESPACE  IR
     EmitsDefSeq *&ptr (void);
     EmitsDefSeq *operator-> (void);
     TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     EmitsDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const EmitsDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDefSeq;
-  
+
   class PublishesDef;
-  
+
 #if !defined (_IR_PUBLISHESDEF___PTR_CH_)
 #define _IR_PUBLISHESDEF___PTR_CH_
-  
+
   typedef PublishesDef *PublishesDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PUBLISHESDEF___VAR_CH_)
 #define _IR_PUBLISHESDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export PublishesDef_var : public TAO_Base_var
   {
   public:
     PublishesDef_var (void); // default constructor
-    PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {} 
+    PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {}
     PublishesDef_var (const PublishesDef_var &); // copy constructor
     ~PublishesDef_var (void); // destructor
-    
+
     PublishesDef_var &operator= (PublishesDef_ptr);
     PublishesDef_var &operator= (const PublishesDef_var &);
     PublishesDef_ptr operator-> (void) const;
-    
+
     operator const PublishesDef_ptr &() const;
     operator PublishesDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     PublishesDef_ptr in (void) const;
     PublishesDef_ptr &inout (void);
     PublishesDef_ptr &out (void);
     PublishesDef_ptr _retn (void);
     PublishesDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PublishesDef_ptr tao_duplicate (PublishesDef_ptr);
     static void tao_release (PublishesDef_ptr);
     static PublishesDef_ptr tao_nil (void);
     static PublishesDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     PublishesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1549,11 +1544,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PUBLISHESDEF___OUT_CH_)
 #define _IR_PUBLISHESDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export PublishesDef_out
   {
   public:
@@ -1566,20 +1561,20 @@ TAO_NAMESPACE  IR
     operator PublishesDef_ptr &();
     PublishesDef_ptr &ptr (void);
     PublishesDef_ptr operator-> (void);
-  
+
   private:
     PublishesDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -1600,14 +1595,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static PublishesDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (PublishesDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -1617,68 +1612,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_PUBLISHESDEFSEQ_CH_)
 #define _IR_PUBLISHESDEFSEQ_CH_
-  
+
   class PublishesDefSeq;
   class PublishesDefSeq_var;
-  
+
   // *************************************************************
   // PublishesDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export PublishesDefSeq : public 
+
+  class TAO_IFR_Client_Export PublishesDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<PublishesDef,PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     PublishesDefSeq (void); // default ctor
     PublishesDefSeq (CORBA::ULong max); // uses max size
     PublishesDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        PublishesDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        PublishesDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     PublishesDefSeq (const PublishesDefSeq &); // copy ctor
     ~PublishesDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef PublishesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PUBLISHESDEFSEQ___VAR_CH_)
 #define _IR_PUBLISHESDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::PublishesDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export PublishesDefSeq_var
   {
   public:
@@ -1686,37 +1680,37 @@ TAO_NAMESPACE  IR
     PublishesDefSeq_var (PublishesDefSeq *);
     PublishesDefSeq_var (const PublishesDefSeq_var &);
     ~PublishesDefSeq_var (void);
-    
+
     PublishesDefSeq_var &operator= (PublishesDefSeq *);
     PublishesDefSeq_var &operator= (const PublishesDefSeq_var &);
     PublishesDefSeq *operator-> (void);
     const PublishesDefSeq *operator-> (void) const;
-    
+
     operator const PublishesDefSeq &() const;
     operator PublishesDefSeq &();
     operator PublishesDefSeq &() const;
     operator PublishesDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const PublishesDefSeq &in (void) const;
     PublishesDefSeq &inout (void);
     PublishesDefSeq *&out (void);
     PublishesDefSeq *_retn (void);
     PublishesDefSeq *ptr (void) const;
-  
+
   private:
     PublishesDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PUBLISHESDEFSEQ___OUT_CH_)
 #define _IR_PUBLISHESDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export PublishesDefSeq_out
   {
   public:
@@ -1729,63 +1723,63 @@ TAO_NAMESPACE  IR
     PublishesDefSeq *&ptr (void);
     PublishesDefSeq *operator-> (void);
     TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     PublishesDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const PublishesDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDefSeq;
-  
+
   class ConsumesDef;
-  
+
 #if !defined (_IR_CONSUMESDEF___PTR_CH_)
 #define _IR_CONSUMESDEF___PTR_CH_
-  
+
   typedef ConsumesDef *ConsumesDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_CONSUMESDEF___VAR_CH_)
 #define _IR_CONSUMESDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
   {
   public:
     ConsumesDef_var (void); // default constructor
-    ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {} 
+    ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {}
     ConsumesDef_var (const ConsumesDef_var &); // copy constructor
     ~ConsumesDef_var (void); // destructor
-    
+
     ConsumesDef_var &operator= (ConsumesDef_ptr);
     ConsumesDef_var &operator= (const ConsumesDef_var &);
     ConsumesDef_ptr operator-> (void) const;
-    
+
     operator const ConsumesDef_ptr &() const;
     operator ConsumesDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ConsumesDef_ptr in (void) const;
     ConsumesDef_ptr &inout (void);
     ConsumesDef_ptr &out (void);
     ConsumesDef_ptr _retn (void);
     ConsumesDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ConsumesDef_ptr tao_duplicate (ConsumesDef_ptr);
     static void tao_release (ConsumesDef_ptr);
     static ConsumesDef_ptr tao_nil (void);
     static ConsumesDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ConsumesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1795,11 +1789,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_CONSUMESDEF___OUT_CH_)
 #define _IR_CONSUMESDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export ConsumesDef_out
   {
   public:
@@ -1812,20 +1806,20 @@ TAO_NAMESPACE  IR
     operator ConsumesDef_ptr &();
     ConsumesDef_ptr &ptr (void);
     ConsumesDef_ptr operator-> (void);
-  
+
   private:
     ConsumesDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -1846,14 +1840,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static ConsumesDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (ConsumesDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -1863,68 +1857,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_CONSUMESDEFSEQ_CH_)
 #define _IR_CONSUMESDEFSEQ_CH_
-  
+
   class ConsumesDefSeq;
   class ConsumesDefSeq_var;
-  
+
   // *************************************************************
   // ConsumesDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export ConsumesDefSeq : public 
+
+  class TAO_IFR_Client_Export ConsumesDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<ConsumesDef,ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     ConsumesDefSeq (void); // default ctor
     ConsumesDefSeq (CORBA::ULong max); // uses max size
     ConsumesDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ConsumesDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ConsumesDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     ConsumesDefSeq (const ConsumesDefSeq &); // copy ctor
     ~ConsumesDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ConsumesDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_CONSUMESDEFSEQ___VAR_CH_)
 #define _IR_CONSUMESDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::ConsumesDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export ConsumesDefSeq_var
   {
   public:
@@ -1932,37 +1925,37 @@ TAO_NAMESPACE  IR
     ConsumesDefSeq_var (ConsumesDefSeq *);
     ConsumesDefSeq_var (const ConsumesDefSeq_var &);
     ~ConsumesDefSeq_var (void);
-    
+
     ConsumesDefSeq_var &operator= (ConsumesDefSeq *);
     ConsumesDefSeq_var &operator= (const ConsumesDefSeq_var &);
     ConsumesDefSeq *operator-> (void);
     const ConsumesDefSeq *operator-> (void) const;
-    
+
     operator const ConsumesDefSeq &() const;
     operator ConsumesDefSeq &();
     operator ConsumesDefSeq &() const;
     operator ConsumesDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const ConsumesDefSeq &in (void) const;
     ConsumesDefSeq &inout (void);
     ConsumesDefSeq *&out (void);
     ConsumesDefSeq *_retn (void);
     ConsumesDefSeq *ptr (void) const;
-  
+
   private:
     ConsumesDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_CONSUMESDEFSEQ___OUT_CH_)
 #define _IR_CONSUMESDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export ConsumesDefSeq_out
   {
   public:
@@ -1975,63 +1968,63 @@ TAO_NAMESPACE  IR
     ConsumesDefSeq *&ptr (void);
     ConsumesDefSeq *operator-> (void);
     TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     ConsumesDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ConsumesDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDefSeq;
-  
+
   class FactoryDef;
-  
+
 #if !defined (_IR_FACTORYDEF___PTR_CH_)
 #define _IR_FACTORYDEF___PTR_CH_
-  
+
   typedef FactoryDef *FactoryDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FACTORYDEF___VAR_CH_)
 #define _IR_FACTORYDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export FactoryDef_var : public TAO_Base_var
   {
   public:
     FactoryDef_var (void); // default constructor
-    FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {} 
+    FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {}
     FactoryDef_var (const FactoryDef_var &); // copy constructor
     ~FactoryDef_var (void); // destructor
-    
+
     FactoryDef_var &operator= (FactoryDef_ptr);
     FactoryDef_var &operator= (const FactoryDef_var &);
     FactoryDef_ptr operator-> (void) const;
-    
+
     operator const FactoryDef_ptr &() const;
     operator FactoryDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     FactoryDef_ptr in (void) const;
     FactoryDef_ptr &inout (void);
     FactoryDef_ptr &out (void);
     FactoryDef_ptr _retn (void);
     FactoryDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static FactoryDef_ptr tao_duplicate (FactoryDef_ptr);
     static void tao_release (FactoryDef_ptr);
     static FactoryDef_ptr tao_nil (void);
     static FactoryDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     FactoryDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2041,11 +2034,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FACTORYDEF___OUT_CH_)
 #define _IR_FACTORYDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export FactoryDef_out
   {
   public:
@@ -2058,20 +2051,20 @@ TAO_NAMESPACE  IR
     operator FactoryDef_ptr &();
     FactoryDef_ptr &ptr (void);
     FactoryDef_ptr operator-> (void);
-  
+
   private:
     FactoryDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -2092,14 +2085,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static FactoryDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (FactoryDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -2109,68 +2102,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_FACTORYDEFSEQ_CH_)
 #define _IR_FACTORYDEFSEQ_CH_
-  
+
   class FactoryDefSeq;
   class FactoryDefSeq_var;
-  
+
   // *************************************************************
   // FactoryDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export FactoryDefSeq : public 
+
+  class TAO_IFR_Client_Export FactoryDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<FactoryDef,FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     FactoryDefSeq (void); // default ctor
     FactoryDefSeq (CORBA::ULong max); // uses max size
     FactoryDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        FactoryDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        FactoryDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     FactoryDefSeq (const FactoryDefSeq &); // copy ctor
     ~FactoryDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef FactoryDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FACTORYDEFSEQ___VAR_CH_)
 #define _IR_FACTORYDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::FactoryDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export FactoryDefSeq_var
   {
   public:
@@ -2178,37 +2170,37 @@ TAO_NAMESPACE  IR
     FactoryDefSeq_var (FactoryDefSeq *);
     FactoryDefSeq_var (const FactoryDefSeq_var &);
     ~FactoryDefSeq_var (void);
-    
+
     FactoryDefSeq_var &operator= (FactoryDefSeq *);
     FactoryDefSeq_var &operator= (const FactoryDefSeq_var &);
     FactoryDefSeq *operator-> (void);
     const FactoryDefSeq *operator-> (void) const;
-    
+
     operator const FactoryDefSeq &() const;
     operator FactoryDefSeq &();
     operator FactoryDefSeq &() const;
     operator FactoryDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const FactoryDefSeq &in (void) const;
     FactoryDefSeq &inout (void);
     FactoryDefSeq *&out (void);
     FactoryDefSeq *_retn (void);
     FactoryDefSeq *ptr (void) const;
-  
+
   private:
     FactoryDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FACTORYDEFSEQ___OUT_CH_)
 #define _IR_FACTORYDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export FactoryDefSeq_out
   {
   public:
@@ -2221,63 +2213,63 @@ TAO_NAMESPACE  IR
     FactoryDefSeq *&ptr (void);
     FactoryDefSeq *operator-> (void);
     TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     FactoryDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const FactoryDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDefSeq;
-  
+
   class FinderDef;
-  
+
 #if !defined (_IR_FINDERDEF___PTR_CH_)
 #define _IR_FINDERDEF___PTR_CH_
-  
+
   typedef FinderDef *FinderDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FINDERDEF___VAR_CH_)
 #define _IR_FINDERDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export FinderDef_var : public TAO_Base_var
   {
   public:
     FinderDef_var (void); // default constructor
-    FinderDef_var (FinderDef_ptr p) : ptr_ (p) {} 
+    FinderDef_var (FinderDef_ptr p) : ptr_ (p) {}
     FinderDef_var (const FinderDef_var &); // copy constructor
     ~FinderDef_var (void); // destructor
-    
+
     FinderDef_var &operator= (FinderDef_ptr);
     FinderDef_var &operator= (const FinderDef_var &);
     FinderDef_ptr operator-> (void) const;
-    
+
     operator const FinderDef_ptr &() const;
     operator FinderDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     FinderDef_ptr in (void) const;
     FinderDef_ptr &inout (void);
     FinderDef_ptr &out (void);
     FinderDef_ptr _retn (void);
     FinderDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static FinderDef_ptr tao_duplicate (FinderDef_ptr);
     static void tao_release (FinderDef_ptr);
     static FinderDef_ptr tao_nil (void);
     static FinderDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     FinderDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2287,11 +2279,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FINDERDEF___OUT_CH_)
 #define _IR_FINDERDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export FinderDef_out
   {
   public:
@@ -2304,20 +2296,20 @@ TAO_NAMESPACE  IR
     operator FinderDef_ptr &();
     FinderDef_ptr &ptr (void);
     FinderDef_ptr operator-> (void);
-  
+
   private:
     FinderDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_
-  
+
   class _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
     : public TAO_Unbounded_Base_Sequence
   {
@@ -2338,14 +2330,14 @@ TAO_NAMESPACE  IR
         const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs
       );
     virtual ~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
-    
+
     // = Accessors.
     TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> operator[] (CORBA::ULong index) const;
-    
+
     // = Static operations.
     static FinderDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (FinderDef **buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -2355,68 +2347,67 @@ TAO_NAMESPACE  IR
         CORBA::ULong nl,
         CORBA::ULong ol
       );
-    
+
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_FINDERDEFSEQ_CH_)
 #define _IR_FINDERDEFSEQ_CH_
-  
+
   class FinderDefSeq;
   class FinderDefSeq_var;
-  
+
   // *************************************************************
   // FinderDefSeq
   // *************************************************************
-  
-  class TAO_IFR_Client_Export FinderDefSeq : public 
+
+  class TAO_IFR_Client_Export FinderDefSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<FinderDef,FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     FinderDefSeq (void); // default ctor
     FinderDefSeq (CORBA::ULong max); // uses max size
     FinderDefSeq (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        FinderDef_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        FinderDef_ptr *buffer,
         CORBA::Boolean release = 0
       );
     FinderDefSeq (const FinderDefSeq &); // copy ctor
     ~FinderDefSeq (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef FinderDefSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FINDERDEFSEQ___VAR_CH_)
 #define _IR_FINDERDEFSEQ___VAR_CH_
-  
+
   // *************************************************************
   // class IR::FinderDefSeq_var
   // *************************************************************
-  
+
   class TAO_IFR_Client_Export FinderDefSeq_var
   {
   public:
@@ -2424,37 +2415,37 @@ TAO_NAMESPACE  IR
     FinderDefSeq_var (FinderDefSeq *);
     FinderDefSeq_var (const FinderDefSeq_var &);
     ~FinderDefSeq_var (void);
-    
+
     FinderDefSeq_var &operator= (FinderDefSeq *);
     FinderDefSeq_var &operator= (const FinderDefSeq_var &);
     FinderDefSeq *operator-> (void);
     const FinderDefSeq *operator-> (void) const;
-    
+
     operator const FinderDefSeq &() const;
     operator FinderDefSeq &();
     operator FinderDefSeq &() const;
     operator FinderDefSeq *&(); // variable-size base types only
-    
+
     TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const FinderDefSeq &in (void) const;
     FinderDefSeq &inout (void);
     FinderDefSeq *&out (void);
     FinderDefSeq *_retn (void);
     FinderDefSeq *ptr (void) const;
-  
+
   private:
     FinderDefSeq *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_FINDERDEFSEQ___OUT_CH_)
 #define _IR_FINDERDEFSEQ___OUT_CH_
-  
+
   class TAO_IFR_Client_Export FinderDefSeq_out
   {
   public:
@@ -2467,63 +2458,63 @@ TAO_NAMESPACE  IR
     FinderDefSeq *&ptr (void);
     FinderDefSeq *operator-> (void);
     TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
-  
+
   private:
     FinderDefSeq *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const FinderDefSeq_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDefSeq;
-  
+
   class PrimaryKeyDef;
-  
+
 #if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
 #define _IR_PRIMARYKEYDEF___PTR_CH_
-  
+
   typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PRIMARYKEYDEF___VAR_CH_)
 #define _IR_PRIMARYKEYDEF___VAR_CH_
-  
+
   class TAO_IFR_Client_Export PrimaryKeyDef_var : public TAO_Base_var
   {
   public:
     PrimaryKeyDef_var (void); // default constructor
-    PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {} 
+    PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {}
     PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
     ~PrimaryKeyDef_var (void); // destructor
-    
+
     PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
     PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
     PrimaryKeyDef_ptr operator-> (void) const;
-    
+
     operator const PrimaryKeyDef_ptr &() const;
     operator PrimaryKeyDef_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     PrimaryKeyDef_ptr in (void) const;
     PrimaryKeyDef_ptr &inout (void);
     PrimaryKeyDef_ptr &out (void);
     PrimaryKeyDef_ptr _retn (void);
     PrimaryKeyDef_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PrimaryKeyDef_ptr tao_duplicate (PrimaryKeyDef_ptr);
     static void tao_release (PrimaryKeyDef_ptr);
     static PrimaryKeyDef_ptr tao_nil (void);
     static PrimaryKeyDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     PrimaryKeyDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2533,11 +2524,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_PRIMARYKEYDEF___OUT_CH_)
 #define _IR_PRIMARYKEYDEF___OUT_CH_
-  
+
   class TAO_IFR_Client_Export PrimaryKeyDef_out
   {
   public:
@@ -2550,59 +2541,59 @@ TAO_NAMESPACE  IR
     operator PrimaryKeyDef_ptr &();
     PrimaryKeyDef_ptr &ptr (void);
     PrimaryKeyDef_ptr operator-> (void);
-  
+
   private:
     PrimaryKeyDef_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTREPOSITORY___PTR_CH_)
 #define _IR_COMPONENTREPOSITORY___PTR_CH_
-  
+
   class ComponentRepository;
   typedef ComponentRepository *ComponentRepository_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTREPOSITORY___VAR_CH_)
 #define _IR_COMPONENTREPOSITORY___VAR_CH_
-  
+
   class TAO_IFR_Client_Export ComponentRepository_var : public TAO_Base_var
   {
   public:
     ComponentRepository_var (void); // default constructor
-    ComponentRepository_var (ComponentRepository_ptr p) : ptr_ (p) {} 
+    ComponentRepository_var (ComponentRepository_ptr p) : ptr_ (p) {}
     ComponentRepository_var (const ComponentRepository_var &); // copy constructor
     ~ComponentRepository_var (void); // destructor
-    
+
     ComponentRepository_var &operator= (ComponentRepository_ptr);
     ComponentRepository_var &operator= (const ComponentRepository_var &);
     ComponentRepository_ptr operator-> (void) const;
-    
+
     operator const ComponentRepository_ptr &() const;
     operator ComponentRepository_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ComponentRepository_ptr in (void) const;
     ComponentRepository_ptr &inout (void);
     ComponentRepository_ptr &out (void);
     ComponentRepository_ptr _retn (void);
     ComponentRepository_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ComponentRepository_ptr tao_duplicate (ComponentRepository_ptr);
     static void tao_release (ComponentRepository_ptr);
     static ComponentRepository_ptr tao_nil (void);
     static ComponentRepository_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ComponentRepository_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2612,11 +2603,11 @@ TAO_NAMESPACE  IR
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTREPOSITORY___OUT_CH_)
 #define _IR_COMPONENTREPOSITORY___OUT_CH_
-  
+
   class TAO_IFR_Client_Export ComponentRepository_out
   {
   public:
@@ -2629,24 +2620,24 @@ TAO_NAMESPACE  IR
     operator ComponentRepository_ptr &();
     ComponentRepository_ptr &ptr (void);
     ComponentRepository_ptr operator-> (void);
-  
+
   private:
     ComponentRepository_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IR_COMPONENTREPOSITORY_CH_)
 #define _IR_COMPONENTREPOSITORY_CH_
-  
+
   // Forward Classes Declaration
   class _TAO_ComponentRepository_Proxy_Impl;
   class _TAO_ComponentRepository_Remote_Proxy_Impl;
   class _TAO_ComponentRepository_Proxy_Broker;
   class _TAO_ComponentRepository_Remote_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export ComponentRepository
     : public virtual CORBA_Repository
   {
@@ -2660,99 +2651,94 @@ TAO_NAMESPACE  IR
 
     // the static operations
     static ComponentRepository_ptr _duplicate (ComponentRepository_ptr obj);
-    
+
     static ComponentRepository_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ComponentRepository_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ComponentRepository_ptr _nil (void)
       {
         return (ComponentRepository_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void*);
-    
+
     virtual 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
       ));
-    
+
     virtual 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
       ));
-    
+
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   private:
     _TAO_ComponentRepository_Proxy_Broker *the_TAO_ComponentRepository_Proxy_Broker_;
-    
+
   protected:
     ComponentRepository (int collocated = 0);
-    
+
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void IR_ComponentRepository_setup_collocation (int collocated);
-    
+
     ComponentRepository (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
-    
+
     friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
     friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
     friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
-    
+
     virtual ~ComponentRepository (void);
-  
+
   private:
     ComponentRepository (const ComponentRepository &);
     void operator= (const ComponentRepository &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulate
   // an invocation logics.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl
     : public virtual _TAO_CORBA_Repository_Proxy_Impl
   {
@@ -2764,13 +2750,13 @@ TAO_NAMESPACE  IR
         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
       )) = 0;
-    
+
     virtual IR::HomeDef_ptr create_home (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
@@ -2778,27 +2764,27 @@ TAO_NAMESPACE  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
       )) = 0;
-    
-    
+
+
   protected:
     _TAO_ComponentRepository_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl
     : public virtual _TAO_ComponentRepository_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -2806,7 +2792,7 @@ TAO_NAMESPACE  IR
   {
   public:
     _TAO_ComponentRepository_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ComponentRepository_Remote_Proxy_Impl (void) { }
     virtual IR::ComponentDef_ptr create_component (
         CORBA_Object *_collocated_tao_target_,
@@ -2814,13 +2800,13 @@ TAO_NAMESPACE  IR
         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,
@@ -2828,95 +2814,95 @@ TAO_NAMESPACE  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
       ));
-    
-    
+
+
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
     class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker
   {
   public:
     virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
     virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-        ComponentRepository *object,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ComponentRepository *object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ComponentRepository_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Broker
     : public virtual _TAO_ComponentRepository_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ComponentRepository_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ComponentRepository_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-        ComponentRepository *object,
-        CORBA_Environment &ACE_TRY_ENV
+        ComponentRepository *object
+        TAO_ENV_ARG_DECL
       );
-    
+
     private:
       _TAO_ComponentRepository_Remote_Proxy_Impl remote_proxy_impl_;
-    
+
     public:
       // This member function is used to get an handle to the unique instance
       // of the Remote Proxy Broker that is available for a given
       // interface.
       static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
     };
-    
+
     //
-    //              End Remote Proxy Broker Declaration 
+    //              End Remote Proxy Broker Declaration
     ///////////////////////////////////////////////////////////////////////
-    
-    
+
+
 #endif /* end #if !defined */
-    
+
     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentRepository;
-    
-    
+
+
 #if !defined (_IR_PROVIDESDEF_CH_)
 #define _IR_PROVIDESDEF_CH_
-    
+
     // Forward Classes Declaration
     class _TAO_ProvidesDef_Proxy_Impl;
     class _TAO_ProvidesDef_Remote_Proxy_Impl;
     class _TAO_ProvidesDef_Proxy_Broker;
     class _TAO_ProvidesDef_Remote_Proxy_Broker;
-    
+
     class TAO_IFR_Client_Export ProvidesDef
       : public virtual CORBA_Contained
     {
@@ -2930,107 +2916,103 @@ TAO_NAMESPACE  IR
 
       // the static operations
       static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
-      
+
       static ProvidesDef_ptr _narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
       static ProvidesDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
       static ProvidesDef_ptr _nil (void)
         {
           return (ProvidesDef_ptr)0;
         }
-      
+
       static void _tao_any_destructor (void*);
-      
+
       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
         ));
-      
+
       virtual CORBA::Boolean _is_a (
-          const CORBA::Char *type_id, 
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-      
+          const CORBA::Char *type_id
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
       virtual void *_tao_QueryInterface (ptr_arith_t type);
-      
+
       virtual const char* _interface_repository_id (void) const;
 
     private:
       _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
-      
+
     protected:
       ProvidesDef (int collocated = 0);
-      
+
       // This methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode
       virtual void IR_ProvidesDef_setup_collocation (int collocated);
-      
+
       ProvidesDef (
-          TAO_Stub *objref, 
+          TAO_Stub *objref,
           CORBA::Boolean _tao_collocated = 0,
           TAO_Abstract_ServantBase *servant = 0
         );
-      
+
       friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
       friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
       friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
-      
+
       virtual ~ProvidesDef (void);
-    
+
     private:
       ProvidesDef (const ProvidesDef &);
       void operator= (const ProvidesDef &);
     };
-    
+
     // The Proxy Implementations are used by each interface to
     // perform a call. Each different implementation encapsulate
     // an invocation logics.
-    
-    
+
+
     ///////////////////////////////////////////////////////////////////////
     //                    Base Proxy Impl. Declaration
     //
-    
+
     class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl
       : public virtual _TAO_CORBA_Contained_Proxy_Impl
     {
     public:
       virtual ~_TAO_ProvidesDef_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
         )) = 0;
-      
-      
+
+
     protected:
       _TAO_ProvidesDef_Proxy_Impl (void);
     };
-    
+
     //
     //               End Base Proxy Impl. Declaration
     ///////////////////////////////////////////////////////////////////////
-    
-    
+
+
     ///////////////////////////////////////////////////////////////////////
     //                Remote Proxy Impl. Declaration
     //
-    
+
     class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl
       : public virtual _TAO_ProvidesDef_Proxy_Impl,
         public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3038,108 +3020,108 @@ TAO_NAMESPACE  IR
     {
     public:
       _TAO_ProvidesDef_Remote_Proxy_Impl (void);
-      
+
       virtual ~_TAO_ProvidesDef_Remote_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
         ));
-      
-      
+
+
     };
-    
+
     //
     //             End Remote Proxy Impl. Declaration
     ///////////////////////////////////////////////////////////////////////
-    
+
     // The Proxy Brokers are used by each interface to get
-    // the right proxy for performing a call. In the new 
+    // the right proxy for performing a call. In the new
     // collocation scheme, the proxy to be used can vary on
     // a call by call basis.
-    
-    
+
+
     ///////////////////////////////////////////////////////////////////////
-    //                 Base Proxy Broker Declaration 
+    //                 Base Proxy Broker Declaration
     //
-    
+
         class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker
     {
     public:
       virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
       virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-          ProvidesDef *object,
-          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          ProvidesDef *object
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
-      
+
     protected:
       _TAO_ProvidesDef_Proxy_Broker (void);
-      
+
     };
-    
+
     //
-    //              End Base Proxy Broker Declaration 
+    //              End Base Proxy Broker Declaration
     ///////////////////////////////////////////////////////////////////////
-    
-        
+
+
     ///////////////////////////////////////////////////////////////////////
-    //                 Remote Proxy Broker Declaration 
+    //                 Remote Proxy Broker Declaration
     //
-    
+
     class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Broker
       : public virtual _TAO_ProvidesDef_Proxy_Broker
     {
-    public: 
+    public:
       _TAO_ProvidesDef_Remote_Proxy_Broker (void);
-      
+
       virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
-      
+
       virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-          ProvidesDef *object,
-          CORBA_Environment &ACE_TRY_ENV
+          ProvidesDef *object
+          TAO_ENV_ARG_DECL
         );
-      
+
       private:
         _TAO_ProvidesDef_Remote_Proxy_Impl remote_proxy_impl_;
-      
+
       public:
         // This member function is used to get an handle to the unique instance
         // of the Remote Proxy Broker that is available for a given
         // interface.
         static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
       };
-      
+
       //
-      //              End Remote Proxy Broker Declaration 
+      //              End Remote Proxy Broker Declaration
       ///////////////////////////////////////////////////////////////////////
-      
-      
+
+
 #endif /* end #if !defined */
-      
+
       TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDef;
-      
+
       struct ProvidesDescription;
       class ProvidesDescription_var;
-      
+
       struct TAO_IFR_Client_Export ProvidesDescription
       {
-        
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
         typedef ProvidesDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
         static void _tao_any_destructor (void*);
-        
+
         TAO_String_Manager name;
         TAO_String_Manager id;
         TAO_String_Manager defined_in;
         TAO_String_Manager version;
         CORBA_InterfaceDef_var interface_type;
-        
+
       };
-      
+
       class TAO_IFR_Client_Export ProvidesDescription_var
       {
       public:
@@ -3147,29 +3129,29 @@ TAO_NAMESPACE  IR
         ProvidesDescription_var (ProvidesDescription *);
         ProvidesDescription_var (const ProvidesDescription_var &);
         ~ProvidesDescription_var (void);
-        
+
         ProvidesDescription_var &operator= (ProvidesDescription *);
         ProvidesDescription_var &operator= (const ProvidesDescription_var &);
         ProvidesDescription *operator-> (void);
         const ProvidesDescription *operator-> (void) const;
-        
+
         operator const ProvidesDescription &() const;
         operator ProvidesDescription &();
         operator ProvidesDescription &() const;
         // Variable-size types only.
         operator ProvidesDescription *&();
-        
-        // in, inout, out, _retn 
+
+        // in, inout, out, _retn
         const ProvidesDescription &in (void) const;
         ProvidesDescription &inout (void);
         ProvidesDescription *&out (void);
         ProvidesDescription *_retn (void);
         ProvidesDescription *ptr (void) const;
-      
+
       private:
         ProvidesDescription *ptr_;
       };
-      
+
       class TAO_IFR_Client_Export ProvidesDescription_out
       {
       public:
@@ -3181,25 +3163,25 @@ TAO_NAMESPACE  IR
         operator ProvidesDescription *&();
         ProvidesDescription *&ptr (void);
         ProvidesDescription *operator-> (void);
-        
+
       private:
         ProvidesDescription *&ptr_;
         // Assignment from T_var not allowed.
         void operator= (const ProvidesDescription_var &);
       };
-      
+
       TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescription;
-      
-      
+
+
 #if !defined (_IR_USESDEF_CH_)
 #define _IR_USESDEF_CH_
-      
+
       // Forward Classes Declaration
       class _TAO_UsesDef_Proxy_Impl;
       class _TAO_UsesDef_Remote_Proxy_Impl;
       class _TAO_UsesDef_Proxy_Broker;
       class _TAO_UsesDef_Remote_Proxy_Broker;
-      
+
       class TAO_IFR_Client_Export UsesDef
         : public virtual CORBA_Contained
       {
@@ -3213,123 +3195,118 @@ TAO_NAMESPACE  IR
 
         // the static operations
         static UsesDef_ptr _duplicate (UsesDef_ptr obj);
-        
+
         static UsesDef_ptr _narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV = 
-              TAO_default_environment ()
-          );
-        
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
         static UsesDef_ptr _unchecked_narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV = 
-              TAO_default_environment ()
-          );
-        
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
         static UsesDef_ptr _nil (void)
           {
             return (UsesDef_ptr)0;
           }
-        
+
         static void _tao_any_destructor (void*);
-        
+
         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
           ));
-        
+
         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
           ));
-        
+
         virtual CORBA::Boolean _is_a (
-            const CORBA::Char *type_id, 
-            CORBA::Environment &ACE_TRY_ENV = 
-              TAO_default_environment ()
-          );
-        
+            const CORBA::Char *type_id
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
         virtual void *_tao_QueryInterface (ptr_arith_t type);
-        
+
         virtual const char* _interface_repository_id (void) const;
 
       private:
         _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
-        
+
       protected:
         UsesDef (int collocated = 0);
-        
+
         // This methods travese the inheritance tree and set the
         // parents piece of the given class in the right mode
         virtual void IR_UsesDef_setup_collocation (int collocated);
-        
+
         UsesDef (
-            TAO_Stub *objref, 
+            TAO_Stub *objref,
             CORBA::Boolean _tao_collocated = 0,
             TAO_Abstract_ServantBase *servant = 0
           );
-        
+
         friend class _TAO_UsesDef_Remote_Proxy_Impl;
         friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
         friend class _TAO_UsesDef_Direct_Proxy_Impl;
-        
+
         virtual ~UsesDef (void);
-      
+
       private:
         UsesDef (const UsesDef &);
         void operator= (const UsesDef &);
       };
-      
+
       // The Proxy Implementations are used by each interface to
       // perform a call. Each different implementation encapsulate
       // an invocation logics.
-      
-      
+
+
       ///////////////////////////////////////////////////////////////////////
       //                    Base Proxy Impl. Declaration
       //
-      
+
       class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl
         : public virtual _TAO_CORBA_Contained_Proxy_Impl
       {
       public:
         virtual ~_TAO_UsesDef_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
           )) = 0;
-        
+
         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
           )) = 0;
-        
-        
+
+
       protected:
         _TAO_UsesDef_Proxy_Impl (void);
       };
-      
+
       //
       //               End Base Proxy Impl. Declaration
       ///////////////////////////////////////////////////////////////////////
-      
-      
+
+
       ///////////////////////////////////////////////////////////////////////
       //                Remote Proxy Impl. Declaration
       //
-      
+
       class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl
         : public virtual _TAO_UsesDef_Proxy_Impl,
           public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3337,117 +3314,117 @@ TAO_NAMESPACE  IR
       {
       public:
         _TAO_UsesDef_Remote_Proxy_Impl (void);
-        
+
         virtual ~_TAO_UsesDef_Remote_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
           ));
-        
-        
+
+
       };
-      
+
       //
       //             End Remote Proxy Impl. Declaration
       ///////////////////////////////////////////////////////////////////////
-      
+
       // The Proxy Brokers are used by each interface to get
-      // the right proxy for performing a call. In the new 
+      // the right proxy for performing a call. In the new
       // collocation scheme, the proxy to be used can vary on
       // a call by call basis.
-      
-      
+
+
       ///////////////////////////////////////////////////////////////////////
-      //                 Base Proxy Broker Declaration 
+      //                 Base Proxy Broker Declaration
       //
-      
+
             class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker
       {
       public:
         virtual ~_TAO_UsesDef_Proxy_Broker (void);
         virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-            UsesDef *object,
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+            UsesDef *object
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
-        
+
       protected:
         _TAO_UsesDef_Proxy_Broker (void);
-        
+
       };
-      
+
       //
-      //              End Base Proxy Broker Declaration 
+      //              End Base Proxy Broker Declaration
       ///////////////////////////////////////////////////////////////////////
-      
-            
+
+
       ///////////////////////////////////////////////////////////////////////
-      //                 Remote Proxy Broker Declaration 
+      //                 Remote Proxy Broker Declaration
       //
-      
+
       class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Broker
         : public virtual _TAO_UsesDef_Proxy_Broker
       {
-      public: 
+      public:
         _TAO_UsesDef_Remote_Proxy_Broker (void);
-        
+
         virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
-        
+
         virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-            UsesDef *object,
-            CORBA_Environment &ACE_TRY_ENV
+            UsesDef *object
+            TAO_ENV_ARG_DECL
           );
-        
+
         private:
           _TAO_UsesDef_Remote_Proxy_Impl remote_proxy_impl_;
-        
+
         public:
           // This member function is used to get an handle to the unique instance
           // of the Remote Proxy Broker that is available for a given
           // interface.
           static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
         };
-        
+
         //
-        //              End Remote Proxy Broker Declaration 
+        //              End Remote Proxy Broker Declaration
         ///////////////////////////////////////////////////////////////////////
-        
-        
+
+
 #endif /* end #if !defined */
-        
+
         TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDef;
-        
+
         struct UsesDescription;
         class UsesDescription_var;
-        
+
         struct TAO_IFR_Client_Export UsesDescription
         {
-          
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
           typedef UsesDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
           static void _tao_any_destructor (void*);
-          
+
           TAO_String_Manager name;
           TAO_String_Manager id;
           TAO_String_Manager defined_in;
           TAO_String_Manager version;
           CORBA_InterfaceDef_var interface_type;
           CORBA::Boolean is_multiple;
-          
+
         };
-        
+
         class TAO_IFR_Client_Export UsesDescription_var
         {
         public:
@@ -3455,29 +3432,29 @@ TAO_NAMESPACE  IR
           UsesDescription_var (UsesDescription *);
           UsesDescription_var (const UsesDescription_var &);
           ~UsesDescription_var (void);
-          
+
           UsesDescription_var &operator= (UsesDescription *);
           UsesDescription_var &operator= (const UsesDescription_var &);
           UsesDescription *operator-> (void);
           const UsesDescription *operator-> (void) const;
-          
+
           operator const UsesDescription &() const;
           operator UsesDescription &();
           operator UsesDescription &() const;
           // Variable-size types only.
           operator UsesDescription *&();
-          
-          // in, inout, out, _retn 
+
+          // in, inout, out, _retn
           const UsesDescription &in (void) const;
           UsesDescription &inout (void);
           UsesDescription *&out (void);
           UsesDescription *_retn (void);
           UsesDescription *ptr (void) const;
-        
+
         private:
           UsesDescription *ptr_;
         };
-        
+
         class TAO_IFR_Client_Export UsesDescription_out
         {
         public:
@@ -3489,28 +3466,28 @@ TAO_NAMESPACE  IR
           operator UsesDescription *&();
           UsesDescription *&ptr (void);
           UsesDescription *operator-> (void);
-          
+
         private:
           UsesDescription *&ptr_;
           // Assignment from T_var not allowed.
           void operator= (const UsesDescription_var &);
         };
-        
+
         TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescription;
-        
-        
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-        
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_
-        
+
         class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
           : public TAO_Unbounded_Base_Sequence
         {
         public:
           // = Initialization and termination methods.
           _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void);
-          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum); 
+          _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum);
           _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (
               CORBA::ULong maximum,
               CORBA::ULong length,
@@ -3524,15 +3501,15 @@ TAO_NAMESPACE  IR
               const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs
             );
           virtual ~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void);
-          
+
           // = Accessors.
           ProvidesDescription &operator[] (CORBA::ULong i);
           const ProvidesDescription &operator[] (CORBA::ULong i) const;
-          
+
           // = Static operations.
           static ProvidesDescription *allocbuf (CORBA::ULong size);
           static void freebuf (ProvidesDescription *buffer);
-          
+
           // Implement the TAO_Base_Sequence methods (see Sequence.h)
           virtual void _allocate_buffer (CORBA::ULong length);
           virtual void _deallocate_buffer (void);
@@ -3545,59 +3522,59 @@ TAO_NAMESPACE  IR
               CORBA::Boolean release
             );
         };
-        
+
 #endif /* end #if !defined */
-        
-        
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-        
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_PROVIDESDESCSEQ_CH_)
 #define _IR_PROVIDESDESCSEQ_CH_
-        
+
         class ProvidesDescSeq;
         class ProvidesDescSeq_var;
-        
+
         // *************************************************************
         // ProvidesDescSeq
         // *************************************************************
-        
-        class TAO_IFR_Client_Export ProvidesDescSeq : public 
+
+        class TAO_IFR_Client_Export ProvidesDescSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
         _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
         TAO_Unbounded_Sequence<ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
         {
         public:
           ProvidesDescSeq (void); // default ctor
           ProvidesDescSeq (CORBA::ULong max); // uses max size
           ProvidesDescSeq (
-              CORBA::ULong max, 
-              CORBA::ULong length, 
-              ProvidesDescription *buffer, 
+              CORBA::ULong max,
+              CORBA::ULong length,
+              ProvidesDescription *buffer,
               CORBA::Boolean release = 0
             );
           ProvidesDescSeq (const ProvidesDescSeq &); // copy ctor
           ~ProvidesDescSeq (void);
           static void _tao_any_destructor (void*);
-          
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
           typedef ProvidesDescSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-          
-          
+
+
         };
-        
+
 #endif /* end #if !defined */
-        
-        
+
+
 #if !defined (_IR_PROVIDESDESCSEQ___VAR_CH_)
 #define _IR_PROVIDESDESCSEQ___VAR_CH_
-        
+
         // *************************************************************
         // class IR::ProvidesDescSeq_var
         // *************************************************************
-        
+
         class TAO_IFR_Client_Export ProvidesDescSeq_var
         {
         public:
@@ -3605,38 +3582,38 @@ TAO_NAMESPACE  IR
           ProvidesDescSeq_var (ProvidesDescSeq *);
           ProvidesDescSeq_var (const ProvidesDescSeq_var &);
           ~ProvidesDescSeq_var (void);
-          
+
           ProvidesDescSeq_var &operator= (ProvidesDescSeq *);
           ProvidesDescSeq_var &operator= (const ProvidesDescSeq_var &);
           ProvidesDescSeq *operator-> (void);
           const ProvidesDescSeq *operator-> (void) const;
-          
+
           operator const ProvidesDescSeq &() const;
           operator ProvidesDescSeq &();
           operator ProvidesDescSeq &() const;
           operator ProvidesDescSeq *&(); // variable-size base types only
-          
+
           ProvidesDescription & operator[] (CORBA::ULong index);
           const ProvidesDescription & operator[] (CORBA::ULong index) const;
-          
-          // in, inout, out, _retn 
+
+          // in, inout, out, _retn
           const ProvidesDescSeq &in (void) const;
           ProvidesDescSeq &inout (void);
           ProvidesDescSeq *&out (void);
           ProvidesDescSeq *_retn (void);
           ProvidesDescSeq *ptr (void) const;
-        
+
         private:
           ProvidesDescSeq *ptr_;
         };
-        
-        
+
+
 #endif /* end #if !defined */
-        
-        
+
+
 #if !defined (_IR_PROVIDESDESCSEQ___OUT_CH_)
 #define _IR_PROVIDESDESCSEQ___OUT_CH_
-        
+
         class TAO_IFR_Client_Export ProvidesDescSeq_out
         {
         public:
@@ -3649,31 +3626,31 @@ TAO_NAMESPACE  IR
           ProvidesDescSeq *&ptr (void);
           ProvidesDescSeq *operator-> (void);
           ProvidesDescription & operator[] (CORBA::ULong index);
-        
+
         private:
           ProvidesDescSeq *&ptr_;
           // Assignment from T_var not allowed.
           void operator= (const ProvidesDescSeq_var &);
         };
-        
-        
+
+
 #endif /* end #if !defined */
-        
+
         TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescSeq;
-        
-        
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-        
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_
-        
+
         class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UsesDescSeq
           : public TAO_Unbounded_Base_Sequence
         {
         public:
           // = Initialization and termination methods.
           _TAO_Unbounded_Sequence_IR_UsesDescSeq (void);
-          _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum); 
+          _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum);
           _TAO_Unbounded_Sequence_IR_UsesDescSeq (
               CORBA::ULong maximum,
               CORBA::ULong length,
@@ -3687,15 +3664,15 @@ TAO_NAMESPACE  IR
               const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs
             );
           virtual ~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void);
-          
+
           // = Accessors.
           UsesDescription &operator[] (CORBA::ULong i);
           const UsesDescription &operator[] (CORBA::ULong i) const;
-          
+
           // = Static operations.
           static UsesDescription *allocbuf (CORBA::ULong size);
           static void freebuf (UsesDescription *buffer);
-          
+
           // Implement the TAO_Base_Sequence methods (see Sequence.h)
           virtual void _allocate_buffer (CORBA::ULong length);
           virtual void _deallocate_buffer (void);
@@ -3708,59 +3685,59 @@ TAO_NAMESPACE  IR
               CORBA::Boolean release
             );
         };
-        
+
 #endif /* end #if !defined */
-        
-        
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-        
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IR_USESDESCSEQ_CH_)
 #define _IR_USESDESCSEQ_CH_
-        
+
         class UsesDescSeq;
         class UsesDescSeq_var;
-        
+
         // *************************************************************
         // UsesDescSeq
         // *************************************************************
-        
-        class TAO_IFR_Client_Export UsesDescSeq : public 
+
+        class TAO_IFR_Client_Export UsesDescSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
         _TAO_Unbounded_Sequence_IR_UsesDescSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
         TAO_Unbounded_Sequence<UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
         {
         public:
           UsesDescSeq (void); // default ctor
           UsesDescSeq (CORBA::ULong max); // uses max size
           UsesDescSeq (
-              CORBA::ULong max, 
-              CORBA::ULong length, 
-              UsesDescription *buffer, 
+              CORBA::ULong max,
+              CORBA::ULong length,
+              UsesDescription *buffer,
               CORBA::Boolean release = 0
             );
           UsesDescSeq (const UsesDescSeq &); // copy ctor
           ~UsesDescSeq (void);
           static void _tao_any_destructor (void*);
-          
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
           typedef UsesDescSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-          
-          
+
+
         };
-        
+
 #endif /* end #if !defined */
-        
-        
+
+
 #if !defined (_IR_USESDESCSEQ___VAR_CH_)
 #define _IR_USESDESCSEQ___VAR_CH_
-        
+
         // *************************************************************
         // class IR::UsesDescSeq_var
         // *************************************************************
-        
+
         class TAO_IFR_Client_Export UsesDescSeq_var
         {
         public:
@@ -3768,38 +3745,38 @@ TAO_NAMESPACE  IR
           UsesDescSeq_var (UsesDescSeq *);
           UsesDescSeq_var (const UsesDescSeq_var &);
           ~UsesDescSeq_var (void);
-          
+
           UsesDescSeq_var &operator= (UsesDescSeq *);
           UsesDescSeq_var &operator= (const UsesDescSeq_var &);
           UsesDescSeq *operator-> (void);
           const UsesDescSeq *operator-> (void) const;
-          
+
           operator const UsesDescSeq &() const;
           operator UsesDescSeq &();
           operator UsesDescSeq &() const;
           operator UsesDescSeq *&(); // variable-size base types only
-          
+
           UsesDescription & operator[] (CORBA::ULong index);
           const UsesDescription & operator[] (CORBA::ULong index) const;
-          
-          // in, inout, out, _retn 
+
+          // in, inout, out, _retn
           const UsesDescSeq &in (void) const;
           UsesDescSeq &inout (void);
           UsesDescSeq *&out (void);
           UsesDescSeq *_retn (void);
           UsesDescSeq *ptr (void) const;
-        
+
         private:
           UsesDescSeq *ptr_;
         };
-        
-        
+
+
 #endif /* end #if !defined */
-        
-        
+
+
 #if !defined (_IR_USESDESCSEQ___OUT_CH_)
 #define _IR_USESDESCSEQ___OUT_CH_
-        
+
         class TAO_IFR_Client_Export UsesDescSeq_out
         {
         public:
@@ -3812,28 +3789,28 @@ TAO_NAMESPACE  IR
           UsesDescSeq *&ptr (void);
           UsesDescSeq *operator-> (void);
           UsesDescription & operator[] (CORBA::ULong index);
-        
+
         private:
           UsesDescSeq *&ptr_;
           // Assignment from T_var not allowed.
           void operator= (const UsesDescSeq_var &);
         };
-        
-        
+
+
 #endif /* end #if !defined */
-        
+
         TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescSeq;
-        
-        
+
+
 #if !defined (_IR_EVENTDEF_CH_)
 #define _IR_EVENTDEF_CH_
-        
+
         // Forward Classes Declaration
         class _TAO_EventDef_Proxy_Impl;
         class _TAO_EventDef_Remote_Proxy_Impl;
         class _TAO_EventDef_Proxy_Broker;
         class _TAO_EventDef_Remote_Proxy_Broker;
-        
+
         class TAO_IFR_Client_Export EventDef
           : public virtual CORBA_Contained
         {
@@ -3847,89 +3824,84 @@ TAO_NAMESPACE  IR
 
           // the static operations
           static EventDef_ptr _duplicate (EventDef_ptr obj);
-          
+
           static EventDef_ptr _narrow (
-              CORBA::Object_ptr obj,
-              CORBA::Environment &ACE_TRY_ENV = 
-                TAO_default_environment ()
-            );
-          
+              CORBA::Object_ptr obj
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
           static EventDef_ptr _unchecked_narrow (
-              CORBA::Object_ptr obj,
-              CORBA::Environment &ACE_TRY_ENV = 
-                TAO_default_environment ()
-            );
-          
+              CORBA::Object_ptr obj
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
           static EventDef_ptr _nil (void)
             {
               return (EventDef_ptr)0;
             }
-          
+
           static void _tao_any_destructor (void*);
-          
+
           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
             ));
-          
+
           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
             ));
-          
+
           virtual CORBA::Boolean _is_a (
-              const CORBA::Char *type_id, 
-              CORBA::Environment &ACE_TRY_ENV = 
-                TAO_default_environment ()
-            );
-          
+              const CORBA::Char *type_id
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
           virtual void *_tao_QueryInterface (ptr_arith_t type);
-          
+
           virtual const char* _interface_repository_id (void) const;
 
         private:
           _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
-          
+
         protected:
           EventDef (int collocated = 0);
-          
+
           // This methods travese the inheritance tree and set the
           // parents piece of the given class in the right mode
           virtual void IR_EventDef_setup_collocation (int collocated);
-          
+
           EventDef (
-              TAO_Stub *objref, 
+              TAO_Stub *objref,
               CORBA::Boolean _tao_collocated = 0,
               TAO_Abstract_ServantBase *servant = 0
             );
-          
+
           friend class _TAO_EventDef_Remote_Proxy_Impl;
           friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
           friend class _TAO_EventDef_Direct_Proxy_Impl;
-          
+
           virtual ~EventDef (void);
-        
+
         private:
           EventDef (const EventDef &);
           void operator= (const EventDef &);
         };
-        
+
         // The Proxy Implementations are used by each interface to
         // perform a call. Each different implementation encapsulate
         // an invocation logics.
-        
-        
+
+
         ///////////////////////////////////////////////////////////////////////
         //                    Base Proxy Impl. Declaration
         //
-        
+
         class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl
           : public virtual _TAO_CORBA_Contained_Proxy_Impl
         {
@@ -3937,35 +3909,35 @@ TAO_NAMESPACE  IR
           virtual ~_TAO_EventDef_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
             )) = 0;
-          
+
           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
             )) = 0;
-          
-          
+
+
         protected:
           _TAO_EventDef_Proxy_Impl (void);
         };
-        
+
         //
         //               End Base Proxy Impl. Declaration
         ///////////////////////////////////////////////////////////////////////
-        
-        
+
+
         ///////////////////////////////////////////////////////////////////////
         //                Remote Proxy Impl. Declaration
         //
-        
+
         class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl
           : public virtual _TAO_EventDef_Proxy_Impl,
             public virtual TAO_Remote_Object_Proxy_Impl,
@@ -3973,117 +3945,117 @@ TAO_NAMESPACE  IR
         {
         public:
           _TAO_EventDef_Remote_Proxy_Impl (void);
-          
+
           virtual ~_TAO_EventDef_Remote_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
             ));
-          
-          
+
+
         };
-        
+
         //
         //             End Remote Proxy Impl. Declaration
         ///////////////////////////////////////////////////////////////////////
-        
+
         // The Proxy Brokers are used by each interface to get
-        // the right proxy for performing a call. In the new 
+        // the right proxy for performing a call. In the new
         // collocation scheme, the proxy to be used can vary on
         // a call by call basis.
-        
-        
+
+
         ///////////////////////////////////////////////////////////////////////
-        //                 Base Proxy Broker Declaration 
+        //                 Base Proxy Broker Declaration
         //
-        
+
                 class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker
         {
         public:
           virtual ~_TAO_EventDef_Proxy_Broker (void);
           virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-              EventDef *object,
-              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+              EventDef *object
+              TAO_ENV_ARG_DECL_WITH_DEFAULTS
             ) = 0;
-          
+
         protected:
           _TAO_EventDef_Proxy_Broker (void);
-          
+
         };
-        
+
         //
-        //              End Base Proxy Broker Declaration 
+        //              End Base Proxy Broker Declaration
         ///////////////////////////////////////////////////////////////////////
-        
-                
+
+
         ///////////////////////////////////////////////////////////////////////
-        //                 Remote Proxy Broker Declaration 
+        //                 Remote Proxy Broker Declaration
         //
-        
+
         class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Broker
           : public virtual _TAO_EventDef_Proxy_Broker
         {
-        public: 
+        public:
           _TAO_EventDef_Remote_Proxy_Broker (void);
-          
+
           virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
-          
+
           virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-              EventDef *object,
-              CORBA_Environment &ACE_TRY_ENV
+              EventDef *object
+              TAO_ENV_ARG_DECL
             );
-          
+
           private:
             _TAO_EventDef_Remote_Proxy_Impl remote_proxy_impl_;
-          
+
           public:
             // This member function is used to get an handle to the unique instance
             // of the Remote Proxy Broker that is available for a given
             // interface.
             static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
           };
-          
+
           //
-          //              End Remote Proxy Broker Declaration 
+          //              End Remote Proxy Broker Declaration
           ///////////////////////////////////////////////////////////////////////
-          
-          
+
+
 #endif /* end #if !defined */
-          
+
           TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDef;
-          
+
           struct EventDescription;
           class EventDescription_var;
-          
+
           struct TAO_IFR_Client_Export EventDescription
           {
-            
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
             typedef EventDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
             static void _tao_any_destructor (void*);
-            
+
             TAO_String_Manager name;
             TAO_String_Manager id;
             TAO_String_Manager defined_in;
             TAO_String_Manager version;
             CORBA_ValueDef_var value;
-            
+
           };
-          
+
           class TAO_IFR_Client_Export EventDescription_var
           {
           public:
@@ -4091,29 +4063,29 @@ TAO_NAMESPACE  IR
             EventDescription_var (EventDescription *);
             EventDescription_var (const EventDescription_var &);
             ~EventDescription_var (void);
-            
+
             EventDescription_var &operator= (EventDescription *);
             EventDescription_var &operator= (const EventDescription_var &);
             EventDescription *operator-> (void);
             const EventDescription *operator-> (void) const;
-            
+
             operator const EventDescription &() const;
             operator EventDescription &();
             operator EventDescription &() const;
             // Variable-size types only.
             operator EventDescription *&();
-            
-            // in, inout, out, _retn 
+
+            // in, inout, out, _retn
             const EventDescription &in (void) const;
             EventDescription &inout (void);
             EventDescription *&out (void);
             EventDescription *_retn (void);
             EventDescription *ptr (void) const;
-          
+
           private:
             EventDescription *ptr_;
           };
-          
+
           class TAO_IFR_Client_Export EventDescription_out
           {
           public:
@@ -4125,25 +4097,25 @@ TAO_NAMESPACE  IR
             operator EventDescription *&();
             EventDescription *&ptr (void);
             EventDescription *operator-> (void);
-            
+
           private:
             EventDescription *&ptr_;
             // Assignment from T_var not allowed.
             void operator= (const EventDescription_var &);
           };
-          
+
           TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDescription;
-          
-          
+
+
 #if !defined (_IR_EMITSDEF_CH_)
 #define _IR_EMITSDEF_CH_
-          
+
           // Forward Classes Declaration
           class _TAO_EmitsDef_Proxy_Impl;
           class _TAO_EmitsDef_Remote_Proxy_Impl;
           class _TAO_EmitsDef_Proxy_Broker;
           class _TAO_EmitsDef_Remote_Proxy_Broker;
-          
+
           class TAO_IFR_Client_Export EmitsDef
             : public virtual EventDef
           {
@@ -4157,91 +4129,88 @@ TAO_NAMESPACE  IR
 
             // the static operations
             static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
-            
+
             static EmitsDef_ptr _narrow (
-                CORBA::Object_ptr obj,
-                CORBA::Environment &ACE_TRY_ENV = 
-                  TAO_default_environment ()
-              );
-            
+                CORBA::Object_ptr obj
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
             static EmitsDef_ptr _unchecked_narrow (
-                CORBA::Object_ptr obj,
-                CORBA::Environment &ACE_TRY_ENV = 
-                  TAO_default_environment ()
-              );
-            
+                CORBA::Object_ptr obj
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
             static EmitsDef_ptr _nil (void)
               {
                 return (EmitsDef_ptr)0;
               }
-            
+
             static void _tao_any_destructor (void*);
-            
+
             virtual CORBA::Boolean _is_a (
-                const CORBA::Char *type_id, 
-                CORBA::Environment &ACE_TRY_ENV = 
-                  TAO_default_environment ()
-              );
-            
+                const CORBA::Char *type_id
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
             virtual void *_tao_QueryInterface (ptr_arith_t type);
-            
+
             virtual const char* _interface_repository_id (void) const;
 
           private:
             _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
-            
+
           protected:
             EmitsDef (int collocated = 0);
-            
+
             // This methods travese the inheritance tree and set the
             // parents piece of the given class in the right mode
             virtual void IR_EmitsDef_setup_collocation (int collocated);
-            
+
             EmitsDef (
-                TAO_Stub *objref, 
+                TAO_Stub *objref,
                 CORBA::Boolean _tao_collocated = 0,
                 TAO_Abstract_ServantBase *servant = 0
               );
-            
+
             friend class _TAO_EmitsDef_Remote_Proxy_Impl;
             friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
             friend class _TAO_EmitsDef_Direct_Proxy_Impl;
-            
+
             virtual ~EmitsDef (void);
-          
+
           private:
             EmitsDef (const EmitsDef &);
             void operator= (const EmitsDef &);
           };
-          
+
           // The Proxy Implementations are used by each interface to
           // perform a call. Each different implementation encapsulate
           // an invocation logics.
-          
-          
+
+
           ///////////////////////////////////////////////////////////////////////
           //                    Base Proxy Impl. Declaration
           //
-          
+
           class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Impl
             : public virtual IR::_TAO_EventDef_Proxy_Impl
           {
           public:
             virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
-            
+
           protected:
             _TAO_EmitsDef_Proxy_Impl (void);
           };
-          
+
           //
           //               End Base Proxy Impl. Declaration
           ///////////////////////////////////////////////////////////////////////
-          
-          
+
+
           ///////////////////////////////////////////////////////////////////////
           //                Remote Proxy Impl. Declaration
           //
-          
+
           class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl
             : public virtual _TAO_EmitsDef_Proxy_Impl,
               public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4249,90 +4218,90 @@ TAO_NAMESPACE  IR
           {
           public:
             _TAO_EmitsDef_Remote_Proxy_Impl (void);
-            
+
             virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) { }
-            
+
           };
-          
+
           //
           //             End Remote Proxy Impl. Declaration
           ///////////////////////////////////////////////////////////////////////
-          
+
           // The Proxy Brokers are used by each interface to get
-          // the right proxy for performing a call. In the new 
+          // the right proxy for performing a call. In the new
           // collocation scheme, the proxy to be used can vary on
           // a call by call basis.
-          
-          
+
+
           ///////////////////////////////////////////////////////////////////////
-          //                 Base Proxy Broker Declaration 
+          //                 Base Proxy Broker Declaration
           //
-          
+
                     class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker
           {
           public:
             virtual ~_TAO_EmitsDef_Proxy_Broker (void);
             virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
-                EmitsDef *object,
-                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                EmitsDef *object
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS
               ) = 0;
-            
+
           protected:
             _TAO_EmitsDef_Proxy_Broker (void);
-            
+
           };
-          
+
           //
-          //              End Base Proxy Broker Declaration 
+          //              End Base Proxy Broker Declaration
           ///////////////////////////////////////////////////////////////////////
-          
-                    
+
+
           ///////////////////////////////////////////////////////////////////////
-          //                 Remote Proxy Broker Declaration 
+          //                 Remote Proxy Broker Declaration
           //
-          
+
           class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Broker
             : public virtual _TAO_EmitsDef_Proxy_Broker
           {
-          public: 
+          public:
             _TAO_EmitsDef_Remote_Proxy_Broker (void);
-            
+
             virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
-            
+
             virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
-                EmitsDef *object,
-                CORBA_Environment &ACE_TRY_ENV
+                EmitsDef *object
+                TAO_ENV_ARG_DECL
               );
-            
+
             private:
               _TAO_EmitsDef_Remote_Proxy_Impl remote_proxy_impl_;
-            
+
             public:
               // This member function is used to get an handle to the unique instance
               // of the Remote Proxy Broker that is available for a given
               // interface.
               static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
             };
-            
+
             //
-            //              End Remote Proxy Broker Declaration 
+            //              End Remote Proxy Broker Declaration
             ///////////////////////////////////////////////////////////////////////
-            
-            
+
+
 #endif /* end #if !defined */
-            
+
             TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDef;
-            
-            
+
+
 #if !defined (_IR_PUBLISHESDEF_CH_)
 #define _IR_PUBLISHESDEF_CH_
-            
+
             // Forward Classes Declaration
             class _TAO_PublishesDef_Proxy_Impl;
             class _TAO_PublishesDef_Remote_Proxy_Impl;
             class _TAO_PublishesDef_Proxy_Broker;
             class _TAO_PublishesDef_Remote_Proxy_Broker;
-            
+
             class TAO_IFR_Client_Export PublishesDef
               : public virtual EventDef
             {
@@ -4346,91 +4315,88 @@ TAO_NAMESPACE  IR
 
               // the static operations
               static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
-              
+
               static PublishesDef_ptr _narrow (
-                  CORBA::Object_ptr obj,
-                  CORBA::Environment &ACE_TRY_ENV = 
-                    TAO_default_environment ()
-                );
-              
+                  CORBA::Object_ptr obj
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
               static PublishesDef_ptr _unchecked_narrow (
-                  CORBA::Object_ptr obj,
-                  CORBA::Environment &ACE_TRY_ENV = 
-                    TAO_default_environment ()
-                );
-              
+                  CORBA::Object_ptr obj
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
               static PublishesDef_ptr _nil (void)
                 {
                   return (PublishesDef_ptr)0;
                 }
-              
+
               static void _tao_any_destructor (void*);
-              
+
               virtual CORBA::Boolean _is_a (
-                  const CORBA::Char *type_id, 
-                  CORBA::Environment &ACE_TRY_ENV = 
-                    TAO_default_environment ()
-                );
-              
+                  const CORBA::Char *type_id
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
               virtual void *_tao_QueryInterface (ptr_arith_t type);
-              
+
               virtual const char* _interface_repository_id (void) const;
 
             private:
               _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
-              
+
             protected:
               PublishesDef (int collocated = 0);
-              
+
               // This methods travese the inheritance tree and set the
               // parents piece of the given class in the right mode
               virtual void IR_PublishesDef_setup_collocation (int collocated);
-              
+
               PublishesDef (
-                  TAO_Stub *objref, 
+                  TAO_Stub *objref,
                   CORBA::Boolean _tao_collocated = 0,
                   TAO_Abstract_ServantBase *servant = 0
                 );
-              
+
               friend class _TAO_PublishesDef_Remote_Proxy_Impl;
               friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
               friend class _TAO_PublishesDef_Direct_Proxy_Impl;
-              
+
               virtual ~PublishesDef (void);
-            
+
             private:
               PublishesDef (const PublishesDef &);
               void operator= (const PublishesDef &);
             };
-            
+
             // The Proxy Implementations are used by each interface to
             // perform a call. Each different implementation encapsulate
             // an invocation logics.
-            
-            
+
+
             ///////////////////////////////////////////////////////////////////////
             //                    Base Proxy Impl. Declaration
             //
-            
+
             class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Impl
               : public virtual IR::_TAO_EventDef_Proxy_Impl
             {
             public:
               virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
-              
+
             protected:
               _TAO_PublishesDef_Proxy_Impl (void);
             };
-            
+
             //
             //               End Base Proxy Impl. Declaration
             ///////////////////////////////////////////////////////////////////////
-            
-            
+
+
             ///////////////////////////////////////////////////////////////////////
             //                Remote Proxy Impl. Declaration
             //
-            
+
             class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl
               : public virtual _TAO_PublishesDef_Proxy_Impl,
                 public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4438,90 +4404,90 @@ TAO_NAMESPACE  IR
             {
             public:
               _TAO_PublishesDef_Remote_Proxy_Impl (void);
-              
+
               virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) { }
-              
+
             };
-            
+
             //
             //             End Remote Proxy Impl. Declaration
             ///////////////////////////////////////////////////////////////////////
-            
+
             // The Proxy Brokers are used by each interface to get
-            // the right proxy for performing a call. In the new 
+            // the right proxy for performing a call. In the new
             // collocation scheme, the proxy to be used can vary on
             // a call by call basis.
-            
-            
+
+
             ///////////////////////////////////////////////////////////////////////
-            //                 Base Proxy Broker Declaration 
+            //                 Base Proxy Broker Declaration
             //
-            
+
                         class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker
             {
             public:
               virtual ~_TAO_PublishesDef_Proxy_Broker (void);
               virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-                  PublishesDef *object,
-                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                  PublishesDef *object
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS
                 ) = 0;
-              
+
             protected:
               _TAO_PublishesDef_Proxy_Broker (void);
-              
+
             };
-            
+
             //
-            //              End Base Proxy Broker Declaration 
+            //              End Base Proxy Broker Declaration
             ///////////////////////////////////////////////////////////////////////
-            
-                        
+
+
             ///////////////////////////////////////////////////////////////////////
-            //                 Remote Proxy Broker Declaration 
+            //                 Remote Proxy Broker Declaration
             //
-            
+
             class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Broker
               : public virtual _TAO_PublishesDef_Proxy_Broker
             {
-            public: 
+            public:
               _TAO_PublishesDef_Remote_Proxy_Broker (void);
-              
+
               virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
-              
+
               virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-                  PublishesDef *object,
-                  CORBA_Environment &ACE_TRY_ENV
+                  PublishesDef *object
+                  TAO_ENV_ARG_DECL
                 );
-              
+
               private:
                 _TAO_PublishesDef_Remote_Proxy_Impl remote_proxy_impl_;
-              
+
               public:
                 // This member function is used to get an handle to the unique instance
                 // of the Remote Proxy Broker that is available for a given
                 // interface.
                 static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
               };
-              
+
               //
-              //              End Remote Proxy Broker Declaration 
+              //              End Remote Proxy Broker Declaration
               ///////////////////////////////////////////////////////////////////////
-              
-              
+
+
 #endif /* end #if !defined */
-              
+
               TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDef;
-              
-              
+
+
 #if !defined (_IR_CONSUMESDEF_CH_)
 #define _IR_CONSUMESDEF_CH_
-              
+
               // Forward Classes Declaration
               class _TAO_ConsumesDef_Proxy_Impl;
               class _TAO_ConsumesDef_Remote_Proxy_Impl;
               class _TAO_ConsumesDef_Proxy_Broker;
               class _TAO_ConsumesDef_Remote_Proxy_Broker;
-              
+
               class TAO_IFR_Client_Export ConsumesDef
                 : public virtual EventDef
               {
@@ -4535,91 +4501,88 @@ TAO_NAMESPACE  IR
 
                 // the static operations
                 static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
-                
+
                 static ConsumesDef_ptr _narrow (
-                    CORBA::Object_ptr obj,
-                    CORBA::Environment &ACE_TRY_ENV = 
-                      TAO_default_environment ()
-                  );
-                
+                    CORBA::Object_ptr obj
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                 static ConsumesDef_ptr _unchecked_narrow (
-                    CORBA::Object_ptr obj,
-                    CORBA::Environment &ACE_TRY_ENV = 
-                      TAO_default_environment ()
-                  );
-                
+                    CORBA::Object_ptr obj
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                 static ConsumesDef_ptr _nil (void)
                   {
                     return (ConsumesDef_ptr)0;
                   }
-                
+
                 static void _tao_any_destructor (void*);
-                
+
                 virtual CORBA::Boolean _is_a (
-                    const CORBA::Char *type_id, 
-                    CORBA::Environment &ACE_TRY_ENV = 
-                      TAO_default_environment ()
-                  );
-                
+                    const CORBA::Char *type_id
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                 virtual void *_tao_QueryInterface (ptr_arith_t type);
-                
+
                 virtual const char* _interface_repository_id (void) const;
 
               private:
                 _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
-                
+
               protected:
                 ConsumesDef (int collocated = 0);
-                
+
                 // This methods travese the inheritance tree and set the
                 // parents piece of the given class in the right mode
                 virtual void IR_ConsumesDef_setup_collocation (int collocated);
-                
+
                 ConsumesDef (
-                    TAO_Stub *objref, 
+                    TAO_Stub *objref,
                     CORBA::Boolean _tao_collocated = 0,
                     TAO_Abstract_ServantBase *servant = 0
                   );
-                
+
                 friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
                 friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
                 friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
-                
+
                 virtual ~ConsumesDef (void);
-              
+
               private:
                 ConsumesDef (const ConsumesDef &);
                 void operator= (const ConsumesDef &);
               };
-              
+
               // The Proxy Implementations are used by each interface to
               // perform a call. Each different implementation encapsulate
               // an invocation logics.
-              
-              
+
+
               ///////////////////////////////////////////////////////////////////////
               //                    Base Proxy Impl. Declaration
               //
-              
+
               class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Impl
                 : public virtual IR::_TAO_EventDef_Proxy_Impl
               {
               public:
                 virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
-                
+
               protected:
                 _TAO_ConsumesDef_Proxy_Impl (void);
               };
-              
+
               //
               //               End Base Proxy Impl. Declaration
               ///////////////////////////////////////////////////////////////////////
-              
-              
+
+
               ///////////////////////////////////////////////////////////////////////
               //                Remote Proxy Impl. Declaration
               //
-              
+
               class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl
                 : public virtual _TAO_ConsumesDef_Proxy_Impl,
                   public virtual TAO_Remote_Object_Proxy_Impl,
@@ -4627,90 +4590,90 @@ TAO_NAMESPACE  IR
               {
               public:
                 _TAO_ConsumesDef_Remote_Proxy_Impl (void);
-                
+
                 virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) { }
-                
+
               };
-              
+
               //
               //             End Remote Proxy Impl. Declaration
               ///////////////////////////////////////////////////////////////////////
-              
+
               // The Proxy Brokers are used by each interface to get
-              // the right proxy for performing a call. In the new 
+              // the right proxy for performing a call. In the new
               // collocation scheme, the proxy to be used can vary on
               // a call by call basis.
-              
-              
+
+
               ///////////////////////////////////////////////////////////////////////
-              //                 Base Proxy Broker Declaration 
+              //                 Base Proxy Broker Declaration
               //
-              
+
                             class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker
               {
               public:
                 virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
                 virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-                    ConsumesDef *object,
-                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                    ConsumesDef *object
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS
                   ) = 0;
-                
+
               protected:
                 _TAO_ConsumesDef_Proxy_Broker (void);
-                
+
               };
-              
+
               //
-              //              End Base Proxy Broker Declaration 
+              //              End Base Proxy Broker Declaration
               ///////////////////////////////////////////////////////////////////////
-              
-                            
+
+
               ///////////////////////////////////////////////////////////////////////
-              //                 Remote Proxy Broker Declaration 
+              //                 Remote Proxy Broker Declaration
               //
-              
+
               class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker
                 : public virtual _TAO_ConsumesDef_Proxy_Broker
               {
-              public: 
+              public:
                 _TAO_ConsumesDef_Remote_Proxy_Broker (void);
-                
+
                 virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
-                
+
                 virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-                    ConsumesDef *object,
-                    CORBA_Environment &ACE_TRY_ENV
+                    ConsumesDef *object
+                    TAO_ENV_ARG_DECL
                   );
-                
+
                 private:
                   _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
-                
+
                 public:
                   // This member function is used to get an handle to the unique instance
                   // of the Remote Proxy Broker that is available for a given
                   // interface.
                   static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
                 };
-                
+
                 //
-                //              End Remote Proxy Broker Declaration 
+                //              End Remote Proxy Broker Declaration
                 ///////////////////////////////////////////////////////////////////////
-                
-                
+
+
 #endif /* end #if !defined */
-                
+
                 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDef;
-                
-                
+
+
 #if !defined (_IR_COMPONENTDEF_CH_)
 #define _IR_COMPONENTDEF_CH_
-                
+
                 // Forward Classes Declaration
                 class _TAO_ComponentDef_Proxy_Impl;
                 class _TAO_ComponentDef_Remote_Proxy_Impl;
                 class _TAO_ComponentDef_Proxy_Broker;
                 class _TAO_ComponentDef_Remote_Proxy_Broker;
-                
+
                 class TAO_IFR_Client_Export ComponentDef
                   : public virtual CORBA_InterfaceDef
                 {
@@ -4724,359 +4687,342 @@ TAO_NAMESPACE  IR
 
                   // the static operations
                   static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
-                  
+
                   static ComponentDef_ptr _narrow (
-                      CORBA::Object_ptr obj,
-                      CORBA::Environment &ACE_TRY_ENV = 
-                        TAO_default_environment ()
-                    );
-                  
+                      CORBA::Object_ptr obj
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                   static ComponentDef_ptr _unchecked_narrow (
-                      CORBA::Object_ptr obj,
-                      CORBA::Environment &ACE_TRY_ENV = 
-                        TAO_default_environment ()
-                    );
-                  
+                      CORBA::Object_ptr obj
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                   static ComponentDef_ptr _nil (void)
                     {
                       return (ComponentDef_ptr)0;
                     }
-                  
+
                   static void _tao_any_destructor (void*);
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   virtual 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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   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
                     ));
-                  
+
                   virtual CORBA::Boolean _is_a (
-                      const CORBA::Char *type_id, 
-                      CORBA::Environment &ACE_TRY_ENV = 
-                        TAO_default_environment ()
-                    );
-                  
+                      const CORBA::Char *type_id
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                   virtual void *_tao_QueryInterface (ptr_arith_t type);
-                  
+
                   virtual const char* _interface_repository_id (void) const;
 
                 private:
                   _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
-                  
+
                 protected:
                   ComponentDef (int collocated = 0);
-                  
+
                   // This methods travese the inheritance tree and set the
                   // parents piece of the given class in the right mode
                   virtual void IR_ComponentDef_setup_collocation (int collocated);
-                  
+
                   ComponentDef (
-                      TAO_Stub *objref, 
+                      TAO_Stub *objref,
                       CORBA::Boolean _tao_collocated = 0,
                       TAO_Abstract_ServantBase *servant = 0
                     );
-                  
+
                   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
                   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
                   friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-                  
+
                   virtual ~ComponentDef (void);
-                
+
                 private:
                   ComponentDef (const ComponentDef &);
                   void operator= (const ComponentDef &);
                 };
-                
+
                 // The Proxy Implementations are used by each interface to
                 // perform a call. Each different implementation encapsulate
                 // an invocation logics.
-                
-                
+
+
                 ///////////////////////////////////////////////////////////////////////
                 //                    Base Proxy Impl. Declaration
                 //
-                
+
                 class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl
                   : public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
                 {
                 public:
                   virtual ~_TAO_ComponentDef_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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
+
                   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
                     )) = 0;
-                  
-                  
+
+
                 protected:
                   _TAO_ComponentDef_Proxy_Impl (void);
                 };
-                
+
                 //
                 //               End Base Proxy Impl. Declaration
                 ///////////////////////////////////////////////////////////////////////
-                
-                
+
+
                 ///////////////////////////////////////////////////////////////////////
                 //                Remote Proxy Impl. Declaration
                 //
-                
+
                 class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl
                   : public virtual _TAO_ComponentDef_Proxy_Impl,
                     public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5084,226 +5030,226 @@ TAO_NAMESPACE  IR
                 {
                 public:
                   _TAO_ComponentDef_Remote_Proxy_Impl (void);
-                  
+
                   virtual ~_TAO_ComponentDef_Remote_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
                     ));
-                  
-                  
+
+
                 };
-                
+
                 //
                 //             End Remote Proxy Impl. Declaration
                 ///////////////////////////////////////////////////////////////////////
-                
+
                 // The Proxy Brokers are used by each interface to get
-                // the right proxy for performing a call. In the new 
+                // the right proxy for performing a call. In the new
                 // collocation scheme, the proxy to be used can vary on
                 // a call by call basis.
-                
-                
+
+
                 ///////////////////////////////////////////////////////////////////////
-                //                 Base Proxy Broker Declaration 
+                //                 Base Proxy Broker Declaration
                 //
-                
+
                                 class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker
                 {
                 public:
                   virtual ~_TAO_ComponentDef_Proxy_Broker (void);
                   virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-                      ComponentDef *object,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                      ComponentDef *object
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS
                     ) = 0;
-                  
+
                 protected:
                   _TAO_ComponentDef_Proxy_Broker (void);
-                  
+
                 };
-                
+
                 //
-                //              End Base Proxy Broker Declaration 
+                //              End Base Proxy Broker Declaration
                 ///////////////////////////////////////////////////////////////////////
-                
-                                
+
+
                 ///////////////////////////////////////////////////////////////////////
-                //                 Remote Proxy Broker Declaration 
+                //                 Remote Proxy Broker Declaration
                 //
-                
+
                 class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Broker
                   : public virtual _TAO_ComponentDef_Proxy_Broker
                 {
-                public: 
+                public:
                   _TAO_ComponentDef_Remote_Proxy_Broker (void);
-                  
+
                   virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
-                  
+
                   virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-                      ComponentDef *object,
-                      CORBA_Environment &ACE_TRY_ENV
+                      ComponentDef *object
+                      TAO_ENV_ARG_DECL
                     );
-                  
+
                   private:
                     _TAO_ComponentDef_Remote_Proxy_Impl remote_proxy_impl_;
-                  
+
                   public:
                     // This member function is used to get an handle to the unique instance
                     // of the Remote Proxy Broker that is available for a given
                     // interface.
                     static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
                   };
-                  
+
                   //
-                  //              End Remote Proxy Broker Declaration 
+                  //              End Remote Proxy Broker Declaration
                   ///////////////////////////////////////////////////////////////////////
-                  
-                  
+
+
 #endif /* end #if !defined */
-                  
+
                   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDef;
-                  
+
                   struct ComponentDescription;
                   class ComponentDescription_var;
-                  
+
                   struct TAO_IFR_Client_Export ComponentDescription
                   {
-                    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
                     typedef ComponentDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
                     static void _tao_any_destructor (void*);
-                    
+
                     TAO_String_Manager name;
                     TAO_String_Manager id;
                     TAO_String_Manager defined_in;
@@ -5317,9 +5263,9 @@ TAO_NAMESPACE  IR
                     ACE_NESTED_CLASS (IR, PublishesDefSeq) publishes_events;
                     ACE_NESTED_CLASS (IR, ConsumesDefSeq) consumes_events;
                     CORBA::Boolean is_basic;
-                    
+
                   };
-                  
+
                   class TAO_IFR_Client_Export ComponentDescription_var
                   {
                   public:
@@ -5327,29 +5273,29 @@ TAO_NAMESPACE  IR
                     ComponentDescription_var (ComponentDescription *);
                     ComponentDescription_var (const ComponentDescription_var &);
                     ~ComponentDescription_var (void);
-                    
+
                     ComponentDescription_var &operator= (ComponentDescription *);
                     ComponentDescription_var &operator= (const ComponentDescription_var &);
                     ComponentDescription *operator-> (void);
                     const ComponentDescription *operator-> (void) const;
-                    
+
                     operator const ComponentDescription &() const;
                     operator ComponentDescription &();
                     operator ComponentDescription &() const;
                     // Variable-size types only.
                     operator ComponentDescription *&();
-                    
-                    // in, inout, out, _retn 
+
+                    // in, inout, out, _retn
                     const ComponentDescription &in (void) const;
                     ComponentDescription &inout (void);
                     ComponentDescription *&out (void);
                     ComponentDescription *_retn (void);
                     ComponentDescription *ptr (void) const;
-                  
+
                   private:
                     ComponentDescription *ptr_;
                   };
-                  
+
                   class TAO_IFR_Client_Export ComponentDescription_out
                   {
                   public:
@@ -5361,25 +5307,25 @@ TAO_NAMESPACE  IR
                     operator ComponentDescription *&();
                     ComponentDescription *&ptr (void);
                     ComponentDescription *operator-> (void);
-                    
+
                   private:
                     ComponentDescription *&ptr_;
                     // Assignment from T_var not allowed.
                     void operator= (const ComponentDescription_var &);
                   };
-                  
+
                   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDescription;
-                  
-                  
+
+
 #if !defined (_IR_PRIMARYKEYDEF_CH_)
 #define _IR_PRIMARYKEYDEF_CH_
-                  
+
                   // Forward Classes Declaration
                   class _TAO_PrimaryKeyDef_Proxy_Impl;
                   class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
                   class _TAO_PrimaryKeyDef_Proxy_Broker;
                   class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
-                  
+
                   class TAO_IFR_Client_Export PrimaryKeyDef
                     : public virtual CORBA_Contained
                   {
@@ -5393,89 +5339,84 @@ TAO_NAMESPACE  IR
 
                     // the static operations
                     static PrimaryKeyDef_ptr _duplicate (PrimaryKeyDef_ptr obj);
-                    
+
                     static PrimaryKeyDef_ptr _narrow (
-                        CORBA::Object_ptr obj,
-                        CORBA::Environment &ACE_TRY_ENV = 
-                          TAO_default_environment ()
-                      );
-                    
+                        CORBA::Object_ptr obj
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                     static PrimaryKeyDef_ptr _unchecked_narrow (
-                        CORBA::Object_ptr obj,
-                        CORBA::Environment &ACE_TRY_ENV = 
-                          TAO_default_environment ()
-                      );
-                    
+                        CORBA::Object_ptr obj
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                     static PrimaryKeyDef_ptr _nil (void)
                       {
                         return (PrimaryKeyDef_ptr)0;
                       }
-                    
+
                     static void _tao_any_destructor (void*);
-                    
+
                     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
                       ));
-                    
+
                     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
                       ));
-                    
+
                     virtual CORBA::Boolean _is_a (
-                        const CORBA::Char *type_id, 
-                        CORBA::Environment &ACE_TRY_ENV = 
-                          TAO_default_environment ()
-                      );
-                    
+                        const CORBA::Char *type_id
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                     virtual void *_tao_QueryInterface (ptr_arith_t type);
-                    
+
                     virtual const char* _interface_repository_id (void) const;
 
                   private:
                     _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
-                    
+
                   protected:
                     PrimaryKeyDef (int collocated = 0);
-                    
+
                     // This methods travese the inheritance tree and set the
                     // parents piece of the given class in the right mode
                     virtual void IR_PrimaryKeyDef_setup_collocation (int collocated);
-                    
+
                     PrimaryKeyDef (
-                        TAO_Stub *objref, 
+                        TAO_Stub *objref,
                         CORBA::Boolean _tao_collocated = 0,
                         TAO_Abstract_ServantBase *servant = 0
                       );
-                    
+
                     friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
                     friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
                     friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
-                    
+
                     virtual ~PrimaryKeyDef (void);
-                  
+
                   private:
                     PrimaryKeyDef (const PrimaryKeyDef &);
                     void operator= (const PrimaryKeyDef &);
                   };
-                  
+
                   // The Proxy Implementations are used by each interface to
                   // perform a call. Each different implementation encapsulate
                   // an invocation logics.
-                  
-                  
+
+
                   ///////////////////////////////////////////////////////////////////////
                   //                    Base Proxy Impl. Declaration
                   //
-                  
+
                   class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl
                     : public virtual _TAO_CORBA_Contained_Proxy_Impl
                   {
@@ -5483,35 +5424,35 @@ TAO_NAMESPACE  IR
                     virtual ~_TAO_PrimaryKeyDef_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
                       )) = 0;
-                    
+
                     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
                       )) = 0;
-                    
-                    
+
+
                   protected:
                     _TAO_PrimaryKeyDef_Proxy_Impl (void);
                   };
-                  
+
                   //
                   //               End Base Proxy Impl. Declaration
                   ///////////////////////////////////////////////////////////////////////
-                  
-                  
+
+
                   ///////////////////////////////////////////////////////////////////////
                   //                Remote Proxy Impl. Declaration
                   //
-                  
+
                   class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl
                     : public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
                       public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5519,117 +5460,117 @@ TAO_NAMESPACE  IR
                   {
                   public:
                     _TAO_PrimaryKeyDef_Remote_Proxy_Impl (void);
-                    
+
                     virtual ~_TAO_PrimaryKeyDef_Remote_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
                       ));
-                    
-                    
+
+
                   };
-                  
+
                   //
                   //             End Remote Proxy Impl. Declaration
                   ///////////////////////////////////////////////////////////////////////
-                  
+
                   // The Proxy Brokers are used by each interface to get
-                  // the right proxy for performing a call. In the new 
+                  // the right proxy for performing a call. In the new
                   // collocation scheme, the proxy to be used can vary on
                   // a call by call basis.
-                  
-                  
+
+
                   ///////////////////////////////////////////////////////////////////////
-                  //                 Base Proxy Broker Declaration 
+                  //                 Base Proxy Broker Declaration
                   //
-                  
+
                                     class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker
                   {
                   public:
                     virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
                     virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-                        PrimaryKeyDef *object,
-                        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                        PrimaryKeyDef *object
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS
                       ) = 0;
-                    
+
                   protected:
                     _TAO_PrimaryKeyDef_Proxy_Broker (void);
-                    
+
                   };
-                  
+
                   //
-                  //              End Base Proxy Broker Declaration 
+                  //              End Base Proxy Broker Declaration
                   ///////////////////////////////////////////////////////////////////////
-                  
-                                    
+
+
                   ///////////////////////////////////////////////////////////////////////
-                  //                 Remote Proxy Broker Declaration 
+                  //                 Remote Proxy Broker Declaration
                   //
-                  
+
                   class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Broker
                     : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
                   {
-                  public: 
+                  public:
                     _TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-                    
+
                     virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-                    
+
                     virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-                        PrimaryKeyDef *object,
-                        CORBA_Environment &ACE_TRY_ENV
+                        PrimaryKeyDef *object
+                        TAO_ENV_ARG_DECL
                       );
-                    
+
                     private:
                       _TAO_PrimaryKeyDef_Remote_Proxy_Impl remote_proxy_impl_;
-                    
+
                     public:
                       // This member function is used to get an handle to the unique instance
                       // of the Remote Proxy Broker that is available for a given
                       // interface.
                       static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
                     };
-                    
+
                     //
-                    //              End Remote Proxy Broker Declaration 
+                    //              End Remote Proxy Broker Declaration
                     ///////////////////////////////////////////////////////////////////////
-                    
-                    
+
+
 #endif /* end #if !defined */
-                    
+
                     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDef;
-                    
+
                     struct PrimaryKeyDescription;
                     class PrimaryKeyDescription_var;
-                    
+
                     struct TAO_IFR_Client_Export PrimaryKeyDescription
                     {
-                      
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
                       typedef PrimaryKeyDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
                       static void _tao_any_destructor (void*);
-                      
+
                       TAO_String_Manager name;
                       TAO_String_Manager id;
                       TAO_String_Manager defined_in;
                       TAO_String_Manager version;
                       CORBA_ValueDef_var primary_key;
-                      
+
                     };
-                    
+
                     class TAO_IFR_Client_Export PrimaryKeyDescription_var
                     {
                     public:
@@ -5637,29 +5578,29 @@ TAO_NAMESPACE  IR
                       PrimaryKeyDescription_var (PrimaryKeyDescription *);
                       PrimaryKeyDescription_var (const PrimaryKeyDescription_var &);
                       ~PrimaryKeyDescription_var (void);
-                      
+
                       PrimaryKeyDescription_var &operator= (PrimaryKeyDescription *);
                       PrimaryKeyDescription_var &operator= (const PrimaryKeyDescription_var &);
                       PrimaryKeyDescription *operator-> (void);
                       const PrimaryKeyDescription *operator-> (void) const;
-                      
+
                       operator const PrimaryKeyDescription &() const;
                       operator PrimaryKeyDescription &();
                       operator PrimaryKeyDescription &() const;
                       // Variable-size types only.
                       operator PrimaryKeyDescription *&();
-                      
-                      // in, inout, out, _retn 
+
+                      // in, inout, out, _retn
                       const PrimaryKeyDescription &in (void) const;
                       PrimaryKeyDescription &inout (void);
                       PrimaryKeyDescription *&out (void);
                       PrimaryKeyDescription *_retn (void);
                       PrimaryKeyDescription *ptr (void) const;
-                    
+
                     private:
                       PrimaryKeyDescription *ptr_;
                     };
-                    
+
                     class TAO_IFR_Client_Export PrimaryKeyDescription_out
                     {
                     public:
@@ -5671,25 +5612,25 @@ TAO_NAMESPACE  IR
                       operator PrimaryKeyDescription *&();
                       PrimaryKeyDescription *&ptr (void);
                       PrimaryKeyDescription *operator-> (void);
-                      
+
                     private:
                       PrimaryKeyDescription *&ptr_;
                       // Assignment from T_var not allowed.
                       void operator= (const PrimaryKeyDescription_var &);
                     };
-                    
+
                     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDescription;
-                    
-                    
+
+
 #if !defined (_IR_FACTORYDEF_CH_)
 #define _IR_FACTORYDEF_CH_
-                    
+
                     // Forward Classes Declaration
                     class _TAO_FactoryDef_Proxy_Impl;
                     class _TAO_FactoryDef_Remote_Proxy_Impl;
                     class _TAO_FactoryDef_Proxy_Broker;
                     class _TAO_FactoryDef_Remote_Proxy_Broker;
-                    
+
                     class TAO_IFR_Client_Export FactoryDef
                       : public virtual CORBA_OperationDef
                     {
@@ -5703,91 +5644,88 @@ TAO_NAMESPACE  IR
 
                       // the static operations
                       static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
-                      
+
                       static FactoryDef_ptr _narrow (
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &ACE_TRY_ENV = 
-                            TAO_default_environment ()
-                        );
-                      
+                          CORBA::Object_ptr obj
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                       static FactoryDef_ptr _unchecked_narrow (
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &ACE_TRY_ENV = 
-                            TAO_default_environment ()
-                        );
-                      
+                          CORBA::Object_ptr obj
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                       static FactoryDef_ptr _nil (void)
                         {
                           return (FactoryDef_ptr)0;
                         }
-                      
+
                       static void _tao_any_destructor (void*);
-                      
+
                       virtual CORBA::Boolean _is_a (
-                          const CORBA::Char *type_id, 
-                          CORBA::Environment &ACE_TRY_ENV = 
-                            TAO_default_environment ()
-                        );
-                      
+                          const CORBA::Char *type_id
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                       virtual void *_tao_QueryInterface (ptr_arith_t type);
-                      
+
                       virtual const char* _interface_repository_id (void) const;
 
                     private:
                       _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
-                      
+
                     protected:
                       FactoryDef (int collocated = 0);
-                      
+
                       // This methods travese the inheritance tree and set the
                       // parents piece of the given class in the right mode
                       virtual void IR_FactoryDef_setup_collocation (int collocated);
-                      
+
                       FactoryDef (
-                          TAO_Stub *objref, 
+                          TAO_Stub *objref,
                           CORBA::Boolean _tao_collocated = 0,
                           TAO_Abstract_ServantBase *servant = 0
                         );
-                      
+
                       friend class _TAO_FactoryDef_Remote_Proxy_Impl;
                       friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
                       friend class _TAO_FactoryDef_Direct_Proxy_Impl;
-                      
+
                       virtual ~FactoryDef (void);
-                    
+
                     private:
                       FactoryDef (const FactoryDef &);
                       void operator= (const FactoryDef &);
                     };
-                    
+
                     // The Proxy Implementations are used by each interface to
                     // perform a call. Each different implementation encapsulate
                     // an invocation logics.
-                    
-                    
+
+
                     ///////////////////////////////////////////////////////////////////////
                     //                    Base Proxy Impl. Declaration
                     //
-                    
+
                     class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl
                       : public virtual _TAO_CORBA_OperationDef_Proxy_Impl
                     {
                     public:
                       virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
-                      
+
                     protected:
                       _TAO_FactoryDef_Proxy_Impl (void);
                     };
-                    
+
                     //
                     //               End Base Proxy Impl. Declaration
                     ///////////////////////////////////////////////////////////////////////
-                    
-                    
+
+
                     ///////////////////////////////////////////////////////////////////////
                     //                Remote Proxy Impl. Declaration
                     //
-                    
+
                     class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl
                       : public virtual _TAO_FactoryDef_Proxy_Impl,
                         public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5795,90 +5733,90 @@ TAO_NAMESPACE  IR
                     {
                     public:
                       _TAO_FactoryDef_Remote_Proxy_Impl (void);
-                      
+
                       virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) { }
-                      
+
                     };
-                    
+
                     //
                     //             End Remote Proxy Impl. Declaration
                     ///////////////////////////////////////////////////////////////////////
-                    
+
                     // The Proxy Brokers are used by each interface to get
-                    // the right proxy for performing a call. In the new 
+                    // the right proxy for performing a call. In the new
                     // collocation scheme, the proxy to be used can vary on
                     // a call by call basis.
-                    
-                    
+
+
                     ///////////////////////////////////////////////////////////////////////
-                    //                 Base Proxy Broker Declaration 
+                    //                 Base Proxy Broker Declaration
                     //
-                    
+
                                         class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker
                     {
                     public:
                       virtual ~_TAO_FactoryDef_Proxy_Broker (void);
                       virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-                          FactoryDef *object,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                          FactoryDef *object
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
                         ) = 0;
-                      
+
                     protected:
                       _TAO_FactoryDef_Proxy_Broker (void);
-                      
+
                     };
-                    
+
                     //
-                    //              End Base Proxy Broker Declaration 
+                    //              End Base Proxy Broker Declaration
                     ///////////////////////////////////////////////////////////////////////
-                    
-                                        
+
+
                     ///////////////////////////////////////////////////////////////////////
-                    //                 Remote Proxy Broker Declaration 
+                    //                 Remote Proxy Broker Declaration
                     //
-                    
+
                     class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Broker
                       : public virtual _TAO_FactoryDef_Proxy_Broker
                     {
-                    public: 
+                    public:
                       _TAO_FactoryDef_Remote_Proxy_Broker (void);
-                      
+
                       virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
-                      
+
                       virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-                          FactoryDef *object,
-                          CORBA_Environment &ACE_TRY_ENV
+                          FactoryDef *object
+                          TAO_ENV_ARG_DECL
                         );
-                      
+
                       private:
                         _TAO_FactoryDef_Remote_Proxy_Impl remote_proxy_impl_;
-                      
+
                       public:
                         // This member function is used to get an handle to the unique instance
                         // of the Remote Proxy Broker that is available for a given
                         // interface.
                         static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
                       };
-                      
+
                       //
-                      //              End Remote Proxy Broker Declaration 
+                      //              End Remote Proxy Broker Declaration
                       ///////////////////////////////////////////////////////////////////////
-                      
-                      
+
+
 #endif /* end #if !defined */
-                      
+
                       TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDef;
-                      
-                      
+
+
 #if !defined (_IR_FINDERDEF_CH_)
 #define _IR_FINDERDEF_CH_
-                      
+
                       // Forward Classes Declaration
                       class _TAO_FinderDef_Proxy_Impl;
                       class _TAO_FinderDef_Remote_Proxy_Impl;
                       class _TAO_FinderDef_Proxy_Broker;
                       class _TAO_FinderDef_Remote_Proxy_Broker;
-                      
+
                       class TAO_IFR_Client_Export FinderDef
                         : public virtual CORBA_OperationDef
                       {
@@ -5892,91 +5830,88 @@ TAO_NAMESPACE  IR
 
                         // the static operations
                         static FinderDef_ptr _duplicate (FinderDef_ptr obj);
-                        
+
                         static FinderDef_ptr _narrow (
-                            CORBA::Object_ptr obj,
-                            CORBA::Environment &ACE_TRY_ENV = 
-                              TAO_default_environment ()
-                          );
-                        
+                            CORBA::Object_ptr obj
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                         static FinderDef_ptr _unchecked_narrow (
-                            CORBA::Object_ptr obj,
-                            CORBA::Environment &ACE_TRY_ENV = 
-                              TAO_default_environment ()
-                          );
-                        
+                            CORBA::Object_ptr obj
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                         static FinderDef_ptr _nil (void)
                           {
                             return (FinderDef_ptr)0;
                           }
-                        
+
                         static void _tao_any_destructor (void*);
-                        
+
                         virtual CORBA::Boolean _is_a (
-                            const CORBA::Char *type_id, 
-                            CORBA::Environment &ACE_TRY_ENV = 
-                              TAO_default_environment ()
-                          );
-                        
+                            const CORBA::Char *type_id
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                         virtual void *_tao_QueryInterface (ptr_arith_t type);
-                        
+
                         virtual const char* _interface_repository_id (void) const;
 
                       private:
                         _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
-                        
+
                       protected:
                         FinderDef (int collocated = 0);
-                        
+
                         // This methods travese the inheritance tree and set the
                         // parents piece of the given class in the right mode
                         virtual void IR_FinderDef_setup_collocation (int collocated);
-                        
+
                         FinderDef (
-                            TAO_Stub *objref, 
+                            TAO_Stub *objref,
                             CORBA::Boolean _tao_collocated = 0,
                             TAO_Abstract_ServantBase *servant = 0
                           );
-                        
+
                         friend class _TAO_FinderDef_Remote_Proxy_Impl;
                         friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
                         friend class _TAO_FinderDef_Direct_Proxy_Impl;
-                        
+
                         virtual ~FinderDef (void);
-                      
+
                       private:
                         FinderDef (const FinderDef &);
                         void operator= (const FinderDef &);
                       };
-                      
+
                       // The Proxy Implementations are used by each interface to
                       // perform a call. Each different implementation encapsulate
                       // an invocation logics.
-                      
-                      
+
+
                       ///////////////////////////////////////////////////////////////////////
                       //                    Base Proxy Impl. Declaration
                       //
-                      
+
                       class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl
                         : public virtual _TAO_CORBA_OperationDef_Proxy_Impl
                       {
                       public:
                         virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
-                        
+
                       protected:
                         _TAO_FinderDef_Proxy_Impl (void);
                       };
-                      
+
                       //
                       //               End Base Proxy Impl. Declaration
                       ///////////////////////////////////////////////////////////////////////
-                      
-                      
+
+
                       ///////////////////////////////////////////////////////////////////////
                       //                Remote Proxy Impl. Declaration
                       //
-                      
+
                       class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl
                         : public virtual _TAO_FinderDef_Proxy_Impl,
                           public virtual TAO_Remote_Object_Proxy_Impl,
@@ -5984,90 +5919,90 @@ TAO_NAMESPACE  IR
                       {
                       public:
                         _TAO_FinderDef_Remote_Proxy_Impl (void);
-                        
+
                         virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) { }
-                        
+
                       };
-                      
+
                       //
                       //             End Remote Proxy Impl. Declaration
                       ///////////////////////////////////////////////////////////////////////
-                      
+
                       // The Proxy Brokers are used by each interface to get
-                      // the right proxy for performing a call. In the new 
+                      // the right proxy for performing a call. In the new
                       // collocation scheme, the proxy to be used can vary on
                       // a call by call basis.
-                      
-                      
+
+
                       ///////////////////////////////////////////////////////////////////////
-                      //                 Base Proxy Broker Declaration 
+                      //                 Base Proxy Broker Declaration
                       //
-                      
+
                                             class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker
                       {
                       public:
                         virtual ~_TAO_FinderDef_Proxy_Broker (void);
                         virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-                            FinderDef *object,
-                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                            FinderDef *object
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS
                           ) = 0;
-                        
+
                       protected:
                         _TAO_FinderDef_Proxy_Broker (void);
-                        
+
                       };
-                      
+
                       //
-                      //              End Base Proxy Broker Declaration 
+                      //              End Base Proxy Broker Declaration
                       ///////////////////////////////////////////////////////////////////////
-                      
-                                            
+
+
                       ///////////////////////////////////////////////////////////////////////
-                      //                 Remote Proxy Broker Declaration 
+                      //                 Remote Proxy Broker Declaration
                       //
-                      
+
                       class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Broker
                         : public virtual _TAO_FinderDef_Proxy_Broker
                       {
-                      public: 
+                      public:
                         _TAO_FinderDef_Remote_Proxy_Broker (void);
-                        
+
                         virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
-                        
+
                         virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-                            FinderDef *object,
-                            CORBA_Environment &ACE_TRY_ENV
+                            FinderDef *object
+                            TAO_ENV_ARG_DECL
                           );
-                        
+
                         private:
                           _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
-                        
+
                         public:
                           // This member function is used to get an handle to the unique instance
                           // of the Remote Proxy Broker that is available for a given
                           // interface.
                           static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
                         };
-                        
+
                         //
-                        //              End Remote Proxy Broker Declaration 
+                        //              End Remote Proxy Broker Declaration
                         ///////////////////////////////////////////////////////////////////////
-                        
-                        
+
+
 #endif /* end #if !defined */
-                        
+
                         TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDef;
-                        
-                        
+
+
 #if !defined (_IR_HOMEDEF_CH_)
 #define _IR_HOMEDEF_CH_
-                        
+
                         // Forward Classes Declaration
                         class _TAO_HomeDef_Proxy_Impl;
                         class _TAO_HomeDef_Remote_Proxy_Impl;
                         class _TAO_HomeDef_Proxy_Broker;
                         class _TAO_HomeDef_Remote_Proxy_Broker;
-                        
+
                         class TAO_IFR_Client_Export HomeDef
                           : public virtual CORBA_InterfaceDef
                         {
@@ -6081,263 +6016,251 @@ TAO_NAMESPACE  IR
 
                           // the static operations
                           static HomeDef_ptr _duplicate (HomeDef_ptr obj);
-                          
+
                           static HomeDef_ptr _narrow (
-                              CORBA::Object_ptr obj,
-                              CORBA::Environment &ACE_TRY_ENV = 
-                                TAO_default_environment ()
-                            );
-                          
+                              CORBA::Object_ptr obj
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                           static HomeDef_ptr _unchecked_narrow (
-                              CORBA::Object_ptr obj,
-                              CORBA::Environment &ACE_TRY_ENV = 
-                                TAO_default_environment ()
-                            );
-                          
+                              CORBA::Object_ptr obj
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                           static HomeDef_ptr _nil (void)
                             {
                               return (HomeDef_ptr)0;
                             }
-                          
+
                           static void _tao_any_destructor (void*);
-                          
+
                           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
                             ));
-                          
+
                           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
                             ));
-                          
+
                           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
                             ));
-                          
+
                           virtual IR::FactoryDefSeq * factories (
-                              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
                             ));
-                          
+
                           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
                             ));
-                          
+
                           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
                             ));
-                          
+
                           virtual 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
                             ));
-                          
+
                           virtual 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
                             ));
-                          
+
                           virtual CORBA::Boolean _is_a (
-                              const CORBA::Char *type_id, 
-                              CORBA::Environment &ACE_TRY_ENV = 
-                                TAO_default_environment ()
-                            );
-                          
+                              const CORBA::Char *type_id
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
                           virtual void *_tao_QueryInterface (ptr_arith_t type);
-                          
+
                           virtual const char* _interface_repository_id (void) const;
 
                         private:
                           _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
-                          
+
                         protected:
                           HomeDef (int collocated = 0);
-                          
+
                           // This methods travese the inheritance tree and set the
                           // parents piece of the given class in the right mode
                           virtual void IR_HomeDef_setup_collocation (int collocated);
-                          
+
                           HomeDef (
-                              TAO_Stub *objref, 
+                              TAO_Stub *objref,
                               CORBA::Boolean _tao_collocated = 0,
                               TAO_Abstract_ServantBase *servant = 0
                             );
-                          
+
                           friend class _TAO_HomeDef_Remote_Proxy_Impl;
                           friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
                           friend class _TAO_HomeDef_Direct_Proxy_Impl;
-                          
+
                           virtual ~HomeDef (void);
-                        
+
                         private:
                           HomeDef (const HomeDef &);
                           void operator= (const HomeDef &);
                         };
-                        
+
                         // The Proxy Implementations are used by each interface to
                         // perform a call. Each different implementation encapsulate
                         // an invocation logics.
-                        
-                        
+
+
                         ///////////////////////////////////////////////////////////////////////
                         //                    Base Proxy Impl. Declaration
                         //
-                        
+
                         class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl
                           : public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
                         {
                         public:
                           virtual ~_TAO_HomeDef_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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
+
                           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
                             )) = 0;
-                          
-                          
+
+
                         protected:
                           _TAO_HomeDef_Proxy_Impl (void);
                         };
-                        
+
                         //
                         //               End Base Proxy Impl. Declaration
                         ///////////////////////////////////////////////////////////////////////
-                        
-                        
+
+
                         ///////////////////////////////////////////////////////////////////////
                         //                Remote Proxy Impl. Declaration
                         //
-                        
+
                         class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl
                           : public virtual _TAO_HomeDef_Proxy_Impl,
                             public virtual TAO_Remote_Object_Proxy_Impl,
@@ -6345,178 +6268,178 @@ TAO_NAMESPACE  IR
                         {
                         public:
                           _TAO_HomeDef_Remote_Proxy_Impl (void);
-                          
+
                           virtual ~_TAO_HomeDef_Remote_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
                             ));
-                          
-                          
+
+
                         };
-                        
+
                         //
                         //             End Remote Proxy Impl. Declaration
                         ///////////////////////////////////////////////////////////////////////
-                        
+
                         // The Proxy Brokers are used by each interface to get
-                        // the right proxy for performing a call. In the new 
+                        // the right proxy for performing a call. In the new
                         // collocation scheme, the proxy to be used can vary on
                         // a call by call basis.
-                        
-                        
+
+
                         ///////////////////////////////////////////////////////////////////////
-                        //                 Base Proxy Broker Declaration 
+                        //                 Base Proxy Broker Declaration
                         //
-                        
+
                                                 class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker
                         {
                         public:
                           virtual ~_TAO_HomeDef_Proxy_Broker (void);
                           virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
-                              HomeDef *object,
-                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+                              HomeDef *object
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS
                             ) = 0;
-                          
+
                         protected:
                           _TAO_HomeDef_Proxy_Broker (void);
-                          
+
                         };
-                        
+
                         //
-                        //              End Base Proxy Broker Declaration 
+                        //              End Base Proxy Broker Declaration
                         ///////////////////////////////////////////////////////////////////////
-                        
-                                                
+
+
                         ///////////////////////////////////////////////////////////////////////
-                        //                 Remote Proxy Broker Declaration 
+                        //                 Remote Proxy Broker Declaration
                         //
-                        
+
                         class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Broker
                           : public virtual _TAO_HomeDef_Proxy_Broker
                         {
-                        public: 
+                        public:
                           _TAO_HomeDef_Remote_Proxy_Broker (void);
-                          
+
                           virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
-                          
+
                           virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
-                              HomeDef *object,
-                              CORBA_Environment &ACE_TRY_ENV
+                              HomeDef *object
+                              TAO_ENV_ARG_DECL
                             );
-                          
+
                           private:
                             _TAO_HomeDef_Remote_Proxy_Impl remote_proxy_impl_;
-                          
+
                           public:
                             // This member function is used to get an handle to the unique instance
                             // of the Remote Proxy Broker that is available for a given
                             // interface.
                             static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
                           };
-                          
+
                           //
-                          //              End Remote Proxy Broker Declaration 
+                          //              End Remote Proxy Broker Declaration
                           ///////////////////////////////////////////////////////////////////////
-                          
-                          
+
+
 #endif /* end #if !defined */
-                          
+
                           TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDef;
-                          
+
                           struct HomeDescription;
                           class HomeDescription_var;
-                          
+
                           struct TAO_IFR_Client_Export HomeDescription
                           {
-                            
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
                             typedef HomeDescription_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
                             static void _tao_any_destructor (void*);
-                            
+
                             TAO_String_Manager name;
                             TAO_String_Manager id;
                             TAO_String_Manager defined_in;
@@ -6529,9 +6452,9 @@ TAO_NAMESPACE  IR
                             CORBA_OpDescriptionSeq operations;
                             CORBA_AttrDescriptionSeq attributes;
                             CORBA::Boolean is_basic;
-                            
+
                           };
-                          
+
                           class TAO_IFR_Client_Export HomeDescription_var
                           {
                           public:
@@ -6539,29 +6462,29 @@ TAO_NAMESPACE  IR
                             HomeDescription_var (HomeDescription *);
                             HomeDescription_var (const HomeDescription_var &);
                             ~HomeDescription_var (void);
-                            
+
                             HomeDescription_var &operator= (HomeDescription *);
                             HomeDescription_var &operator= (const HomeDescription_var &);
                             HomeDescription *operator-> (void);
                             const HomeDescription *operator-> (void) const;
-                            
+
                             operator const HomeDescription &() const;
                             operator HomeDescription &();
                             operator HomeDescription &() const;
                             // Variable-size types only.
                             operator HomeDescription *&();
-                            
-                            // in, inout, out, _retn 
+
+                            // in, inout, out, _retn
                             const HomeDescription &in (void) const;
                             HomeDescription &inout (void);
                             HomeDescription *&out (void);
                             HomeDescription *_retn (void);
                             HomeDescription *ptr (void) const;
-                          
+
                           private:
                             HomeDescription *ptr_;
                           };
-                          
+
                           class TAO_IFR_Client_Export HomeDescription_out
                           {
                           public:
@@ -6573,93 +6496,93 @@ TAO_NAMESPACE  IR
                             operator HomeDescription *&();
                             HomeDescription *&ptr (void);
                             HomeDescription *operator-> (void);
-                            
+
                           private:
                             HomeDescription *&ptr_;
                             // Assignment from T_var not allowed.
                             void operator= (const HomeDescription_var &);
                           };
-                          
+
                           TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDescription;
-                          
-                          
+
+
                         }
 TAO_NAMESPACE_CLOSE // module IR
 
 // Proxy Broker Factory function pointer declarations.
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_ComponentRepository_Proxy_Broker *
                         (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_ProvidesDef_Proxy_Broker *
                         (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_UsesDef_Proxy_Broker *
                         (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_EventDef_Proxy_Broker *
                         (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_EmitsDef_Proxy_Broker *
                         (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_PublishesDef_Proxy_Broker *
                         (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_ConsumesDef_Proxy_Broker *
                         (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_ComponentDef_Proxy_Broker *
                         (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_PrimaryKeyDef_Proxy_Broker *
                         (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_FactoryDef_Proxy_Broker *
                         (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_FinderDef_Proxy_Broker *
                         (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                         extern TAO_IFR_Client_Export
                         IR::_TAO_HomeDef_Proxy_Broker *
                         (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
                             CORBA::Object_ptr obj
                           );
-                        
+
                                                                                                                                                 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
                         TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
                         TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
@@ -6771,7 +6694,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::
 
                         #ifndef __ACE_INLINE__
 
-                                                                                                
+
 #if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_H_
                         #define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
 
@@ -6786,7 +6709,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_H_ */
 
-                                                
+
 #if !defined _TAO_CDR_OP_IR_ComponentDefSeq_H_
                         #define _TAO_CDR_OP_IR_ComponentDefSeq_H_
 
@@ -6801,7 +6724,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_ComponentDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_H_
                         #define _TAO_CDR_OP_IR_ProvidesDefSeq_H_
 
@@ -6816,7 +6739,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_UsesDefSeq_H_
                         #define _TAO_CDR_OP_IR_UsesDefSeq_H_
 
@@ -6831,7 +6754,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_UsesDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_HomeDefSeq_H_
                         #define _TAO_CDR_OP_IR_HomeDefSeq_H_
 
@@ -6846,7 +6769,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_HomeDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_EmitsDefSeq_H_
                         #define _TAO_CDR_OP_IR_EmitsDefSeq_H_
 
@@ -6861,7 +6784,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_EmitsDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_PublishesDefSeq_H_
                         #define _TAO_CDR_OP_IR_PublishesDefSeq_H_
 
@@ -6876,7 +6799,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_PublishesDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_H_
                         #define _TAO_CDR_OP_IR_ConsumesDefSeq_H_
 
@@ -6891,7 +6814,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_FactoryDefSeq_H_
                         #define _TAO_CDR_OP_IR_FactoryDefSeq_H_
 
@@ -6906,7 +6829,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_FactoryDefSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_FinderDefSeq_H_
                         #define _TAO_CDR_OP_IR_FinderDefSeq_H_
 
@@ -6931,7 +6854,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
                         TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDef_ptr &);
                         TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDescription &);
                         TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDescription &);
-                        
+
 #if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_H_
                         #define _TAO_CDR_OP_IR_ProvidesDescSeq_H_
 
@@ -6946,7 +6869,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (
 
 #endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_H_ */
 
-                        
+
 #if !defined _TAO_CDR_OP_IR_UsesDescSeq_H_
                         #define _TAO_CDR_OP_IR_UsesDescSeq_H_
 
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 7bd5bcd8de2..400e30ee8bf 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -65,11 +65,11 @@ tao_CORBA_FixedDef_nil (
 
 CORBA_FixedDef_ptr
 tao_CORBA_FixedDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_FixedDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -192,11 +192,11 @@ CORBA_FixedDef_var::tao_nil (void)
 
 ::CORBA_FixedDef_ptr
 CORBA_FixedDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_FixedDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -273,27 +273,23 @@ class TAO_ClientRequestInfo_CORBA_FixedDef_digits_get : public TAO_ClientRequest
 public:
   TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::UShort result);
@@ -307,31 +303,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -339,13 +335,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -367,27 +363,23 @@ public:
   TAO_ClientRequestInfo_CORBA_FixedDef_digits_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -401,20 +393,20 @@ private:
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::TAO_ClientRequestInfo_CORBA_FixedDef_digits_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::UShort & digits,
-    CORBA::Environment &
+    const CORBA::UShort & digits
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     digits_ (digits)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -430,12 +422,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -443,13 +435,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -460,27 +452,23 @@ class TAO_ClientRequestInfo_CORBA_FixedDef_scale_get : public TAO_ClientRequestI
 public:
   TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Short result);
@@ -494,31 +482,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -526,13 +514,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment &
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -554,27 +542,23 @@ public:
   TAO_ClientRequestInfo_CORBA_FixedDef_scale_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -588,20 +572,20 @@ private:
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::TAO_ClientRequestInfo_CORBA_FixedDef_scale_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::Short & scale,
-    CORBA::Environment &
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     scale_ (scale)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -617,12 +601,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -630,13 +614,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment &
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -657,8 +641,8 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Impl::_TAO_CORBA_FixedDef_Remote_Proxy_Impl (vo
 // Remote Implementation of the IDL interface methods
 
 CORBA::UShort _TAO_CORBA_FixedDef_Remote_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
@@ -699,8 +683,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -715,8 +699,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -728,17 +712,17 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -754,8 +738,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -781,8 +765,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -791,13 +775,13 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -808,7 +792,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -824,8 +808,8 @@ return _tao_retval;
 
 void _TAO_CORBA_FixedDef_Remote_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
@@ -867,8 +851,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        digits,
-        ACE_TRY_ENV
+        digits
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -883,8 +867,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -896,12 +880,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -914,7 +898,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -929,8 +913,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -943,8 +927,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -953,13 +937,13 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -970,7 +954,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -985,8 +969,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 }
 
 CORBA::Short _TAO_CORBA_FixedDef_Remote_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
@@ -1027,8 +1011,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -1043,8 +1027,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1056,17 +1040,17 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1082,8 +1066,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1109,8 +1093,8 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1119,13 +1103,13 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1136,7 +1120,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1152,8 +1136,8 @@ return _tao_retval;
 
 void _TAO_CORBA_FixedDef_Remote_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
@@ -1195,8 +1179,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        scale,
-        ACE_TRY_ENV
+        scale
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -1211,8 +1195,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1224,12 +1208,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -1242,7 +1226,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1257,8 +1241,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1271,8 +1255,8 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1281,13 +1265,13 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1298,7 +1282,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1352,8 +1336,8 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Broker::~_TAO_CORBA_FixedDef_Remote_Proxy_Broke
 
 _TAO_CORBA_FixedDef_Proxy_Impl&
 _TAO_CORBA_FixedDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_FixedDef *,
-  CORBA::Environment &
+  ::CORBA_FixedDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -1395,25 +1379,25 @@ void CORBA_FixedDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_FixedDef_ptr CORBA_FixedDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_FixedDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_FixedDef::_nil ());
       if (is_a == 0)
         return CORBA_FixedDef::_nil ();
     }
-  return CORBA_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_FixedDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr CORBA_FixedDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1468,7 +1452,7 @@ CORBA_FixedDef::_duplicate (CORBA_FixedDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
@@ -1477,7 +1461,7 @@ CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environme
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_FixedDef::_tao_QueryInterface (ptr_arith_t type)
@@ -1526,74 +1510,74 @@ const char* CORBA_FixedDef::_interface_repository_id (void) const
 }
 
 CORBA::UShort CORBA_FixedDef::digits (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.digits (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_FixedDef::digits (
-    CORBA::UShort digits,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::UShort digits
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.digits (
       this,
-      digits,
-      ACE_TRY_ENV
+      digits
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Short CORBA_FixedDef::scale (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.scale (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_FixedDef::scale (
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.scale (
       this,
-      scale,
-      ACE_TRY_ENV
+      scale
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -1726,11 +1710,11 @@ tao_CORBA_ValueMemberDef_nil (
 
 CORBA_ValueMemberDef_ptr
 tao_CORBA_ValueMemberDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1853,11 +1837,11 @@ CORBA_ValueMemberDef_var::tao_nil (void)
 
 ::CORBA_ValueMemberDef_ptr
 CORBA_ValueMemberDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1934,27 +1918,23 @@ class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ClientReq
 public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::TypeCode_ptr result);
@@ -1968,31 +1948,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2000,13 +1980,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2027,27 +2007,23 @@ class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get : public TAO_Clien
 public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -2061,31 +2037,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2093,13 +2069,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2121,27 +2097,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -2155,20 +2127,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     type_def_ (type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2184,12 +2156,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2197,13 +2169,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2214,27 +2186,23 @@ class TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ClientR
 public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Visibility result);
@@ -2248,31 +2216,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2280,13 +2248,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2308,27 +2276,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -2342,20 +2306,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::Visibility & access,
-    CORBA::Environment &
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     access_ (access)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2371,12 +2335,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2384,13 +2348,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -2411,8 +2375,8 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::_TAO_CORBA_ValueMemberDef_Remote_Pr
 // Remote Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_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
@@ -2454,8 +2418,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2470,8 +2434,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2483,17 +2447,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2509,8 +2473,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2537,8 +2501,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2547,13 +2511,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2564,7 +2528,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2579,8 +2543,8 @@ return _tao_safe_retval._retn ();
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_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
@@ -2622,8 +2586,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2638,8 +2602,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2651,17 +2615,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2677,8 +2641,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2705,8 +2669,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2715,13 +2679,13 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2732,7 +2696,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2748,8 +2712,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ValueMemberDef_Remote_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
@@ -2791,8 +2755,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -2807,8 +2771,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2820,12 +2784,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -2838,7 +2802,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2853,8 +2817,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2867,8 +2831,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2877,13 +2841,13 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -2894,7 +2858,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2909,8 +2873,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 }
 
 CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_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
@@ -2951,8 +2915,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -2967,8 +2931,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2980,17 +2944,17 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3006,8 +2970,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3033,8 +2997,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3043,13 +3007,13 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -3060,7 +3024,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3076,8 +3040,8 @@ return _tao_retval;
 
 void _TAO_CORBA_ValueMemberDef_Remote_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
@@ -3119,8 +3083,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        access,
-        ACE_TRY_ENV
+        access
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3135,8 +3099,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3148,12 +3112,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3166,7 +3130,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3181,8 +3145,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3195,8 +3159,8 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3205,13 +3169,13 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -3222,7 +3186,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3276,8 +3240,8 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Remote
 
 _TAO_CORBA_ValueMemberDef_Proxy_Impl&
 _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ValueMemberDef *,
-  CORBA::Environment &
+  ::CORBA_ValueMemberDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3319,25 +3283,25 @@ void CORBA_ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ValueMemberDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ValueMemberDef::_nil ());
       if (is_a == 0)
         return CORBA_ValueMemberDef::_nil ();
     }
-  return CORBA_ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ValueMemberDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3392,7 +3356,7 @@ CORBA_ValueMemberDef::_duplicate (CORBA_ValueMemberDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
@@ -3401,7 +3365,7 @@ CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Env
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
@@ -3450,91 +3414,91 @@ const char* CORBA_ValueMemberDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_ValueMemberDef::type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_ValueMemberDef::type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueMemberDef::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
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.type_def (
       this,
-      type_def,
-      ACE_TRY_ENV
+      type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Visibility CORBA_ValueMemberDef::access (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.access (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueMemberDef::access (
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.access (
       this,
-      access,
-      ACE_TRY_ENV
+      access
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -3564,11 +3528,11 @@ tao_CORBA_ValueDef_nil (
 
 CORBA_ValueDef_ptr
 tao_CORBA_ValueDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ValueDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3691,11 +3655,11 @@ CORBA_ValueDef_var::tao_nil (void)
 
 ::CORBA_ValueDef_ptr
 CORBA_ValueDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ValueDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3772,27 +3736,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -3806,31 +3766,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3838,13 +3798,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3866,27 +3826,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -3900,20 +3856,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     supported_interfaces_ (supported_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3929,12 +3885,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3942,13 +3898,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -3959,27 +3915,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ClientR
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_InitializerSeq * result);
@@ -3993,31 +3945,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4025,13 +3977,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4053,27 +4005,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -4087,20 +4035,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     initializers_ (initializers)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4116,12 +4064,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4129,13 +4077,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4146,27 +4094,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ClientReq
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ValueDef_ptr result);
@@ -4180,31 +4124,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4212,13 +4156,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4240,27 +4184,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -4274,20 +4214,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     base_value_ (base_value)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4303,12 +4243,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4316,13 +4256,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4333,27 +4273,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ValueDefSeq * result);
@@ -4367,31 +4303,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4399,13 +4335,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4427,27 +4363,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -4461,20 +4393,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     abstract_base_values_ (abstract_base_values)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4490,12 +4422,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4503,13 +4435,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4520,27 +4452,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ClientRe
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Boolean result);
@@ -4554,31 +4482,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4586,13 +4514,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4614,27 +4542,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -4648,20 +4572,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &
+    const CORBA::Boolean & is_abstract
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     is_abstract_ (is_abstract)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4677,12 +4601,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4690,13 +4614,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environ
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4707,27 +4631,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ClientRequ
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Boolean result);
@@ -4741,31 +4661,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4773,13 +4693,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environme
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4801,27 +4721,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -4835,20 +4751,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_custom,
-    CORBA::Environment &
+    const CORBA::Boolean & is_custom
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     is_custom_ (is_custom)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4864,12 +4780,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4877,13 +4793,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environme
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4894,27 +4810,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_Clien
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Boolean result);
@@ -4928,31 +4840,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4960,13 +4872,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -4988,27 +4900,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -5022,20 +4930,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &
+    const CORBA::Boolean & is_truncatable
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     is_truncatable_ (is_truncatable)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5051,12 +4959,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5064,13 +4972,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Envi
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5082,27 +4990,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_a (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
   void result (CORBA::Boolean result);
@@ -5118,20 +5022,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_a::TAO_ClientRequestInfo_CORBA_ValueDef_is_a (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * id,
-    CORBA::Environment &
+    const char * id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5147,12 +5051,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TR
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5160,13 +5064,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_T
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5187,27 +5091,23 @@ class TAO_ClientRequestInfo_CORBA_ValueDef_describe_value : public TAO_ClientReq
 public:
   TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_ValueDef::FullValueDescription * result);
@@ -5221,31 +5121,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5253,13 +5153,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environm
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5285,27 +5185,23 @@ 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));
 
   void result (CORBA_ValueMemberDef_ptr result);
@@ -5329,8 +5225,8 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_
     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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -5341,12 +5237,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5374,12 +5270,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Envi
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5387,13 +5283,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Env
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5419,27 +5315,23 @@ 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));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -5463,8 +5355,8 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -5475,12 +5367,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5508,12 +5400,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5521,13 +5413,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5556,27 +5448,23 @@ 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));
 
   void result (CORBA_OperationDef_ptr result);
@@ -5606,8 +5494,8 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_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_ClientRequestInfo (_tao_invocation, _tao_target),
     id_ (id),
@@ -5621,12 +5509,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5663,12 +5551,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5676,13 +5564,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Enviro
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -5713,8 +5601,8 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Impl::_TAO_CORBA_ValueDef_Remote_Proxy_Impl (vo
 // Remote Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_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
@@ -5757,8 +5645,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -5773,8 +5661,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5786,17 +5674,17 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5812,8 +5700,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -5840,8 +5728,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5850,13 +5738,13 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -5867,7 +5755,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -5883,8 +5771,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ValueDef_Remote_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
@@ -5926,8 +5814,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        supported_interfaces,
-        ACE_TRY_ENV
+        supported_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -5942,8 +5830,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5955,12 +5843,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -5973,7 +5861,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5988,8 +5876,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6002,8 +5890,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6012,13 +5900,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6029,7 +5917,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6044,8 +5932,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
 }
 
 CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_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
@@ -6088,8 +5976,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -6104,8 +5992,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6117,17 +6005,17 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6143,8 +6031,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6171,8 +6059,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6181,13 +6069,13 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6198,7 +6086,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6214,8 +6102,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ValueDef_Remote_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
@@ -6257,8 +6145,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        initializers,
-        ACE_TRY_ENV
+        initializers
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -6273,8 +6161,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6286,12 +6174,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -6304,7 +6192,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6319,8 +6207,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6333,8 +6221,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6343,13 +6231,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6360,7 +6248,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6375,8 +6263,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 }
 
 CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_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
@@ -6418,8 +6306,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -6434,8 +6322,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6447,17 +6335,17 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6473,8 +6361,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6501,8 +6389,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6511,13 +6399,13 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6528,7 +6416,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6544,8 +6432,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ValueDef_Remote_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
@@ -6587,8 +6475,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        base_value,
-        ACE_TRY_ENV
+        base_value
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -6603,8 +6491,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6616,12 +6504,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -6634,7 +6522,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6649,8 +6537,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6663,8 +6551,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6673,13 +6561,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6690,7 +6578,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6705,8 +6593,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 }
 
 CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_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
@@ -6749,8 +6637,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -6765,8 +6653,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6778,17 +6666,17 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6804,8 +6692,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6832,8 +6720,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6842,13 +6730,13 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -6859,7 +6747,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6875,8 +6763,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ValueDef_Remote_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
@@ -6918,8 +6806,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        abstract_base_values,
-        ACE_TRY_ENV
+        abstract_base_values
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -6934,8 +6822,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6947,12 +6835,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -6965,7 +6853,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6980,8 +6868,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6994,8 +6882,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7004,13 +6892,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7021,7 +6909,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7036,8 +6924,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_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
@@ -7078,8 +6966,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -7094,8 +6982,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7107,17 +6995,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7133,8 +7021,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7160,8 +7048,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7170,13 +7058,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7187,7 +7075,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7203,8 +7091,8 @@ return _tao_retval;
 
 void _TAO_CORBA_ValueDef_Remote_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
@@ -7246,8 +7134,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        is_abstract,
-        ACE_TRY_ENV
+        is_abstract
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7262,8 +7150,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7275,12 +7163,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7293,7 +7181,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7308,8 +7196,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7322,8 +7210,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7332,13 +7220,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7349,7 +7237,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7364,8 +7252,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_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
@@ -7406,8 +7294,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -7422,8 +7310,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7435,17 +7323,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7461,8 +7349,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7488,8 +7376,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7498,13 +7386,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7515,7 +7403,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7531,8 +7419,8 @@ return _tao_retval;
 
 void _TAO_CORBA_ValueDef_Remote_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
@@ -7574,8 +7462,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        is_custom,
-        ACE_TRY_ENV
+        is_custom
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7590,8 +7478,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7603,12 +7491,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7621,7 +7509,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7636,8 +7524,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7650,8 +7538,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7660,13 +7548,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7677,7 +7565,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7692,8 +7580,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_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
@@ -7734,8 +7622,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -7750,8 +7638,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7763,17 +7651,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7789,8 +7677,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7816,8 +7704,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7826,13 +7714,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -7843,7 +7731,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7859,8 +7747,8 @@ return _tao_retval;
 
 void _TAO_CORBA_ValueDef_Remote_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
@@ -7902,8 +7790,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        is_truncatable,
-        ACE_TRY_ENV
+        is_truncatable
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7918,8 +7806,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7931,12 +7819,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7949,7 +7837,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7964,8 +7852,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7978,8 +7866,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7988,13 +7876,13 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8005,7 +7893,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8021,8 +7909,8 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_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
@@ -8064,8 +7952,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
       TAO_ClientRequestInfo_CORBA_ValueDef_is_a ri (
         &_tao_call,
         _collocated_tao_target_,
-        id,
-        ACE_TRY_ENV
+        id
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -8080,8 +7968,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8093,12 +7981,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -8112,7 +8000,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8128,8 +8016,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8155,8 +8043,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8165,13 +8053,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8182,7 +8070,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8197,8 +8085,8 @@ return _tao_retval;
 }
 
 CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_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
@@ -8240,8 +8128,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8256,8 +8144,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8269,17 +8157,17 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8295,8 +8183,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8323,8 +8211,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8333,13 +8221,13 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8350,7 +8238,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8370,8 +8258,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
     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
@@ -8418,8 +8306,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
         name,
         version,
         type,
-        access,
-        ACE_TRY_ENV
+        access
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8434,8 +8322,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8447,12 +8335,12 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8470,7 +8358,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8486,8 +8374,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8514,8 +8402,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8524,13 +8412,13 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8541,7 +8429,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8561,8 +8449,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_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
@@ -8609,8 +8497,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
         name,
         version,
         type,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8625,8 +8513,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8638,12 +8526,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8661,7 +8549,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8677,8 +8565,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8705,8 +8593,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8715,13 +8603,13 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8732,7 +8620,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8755,8 +8643,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_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
@@ -8806,8 +8694,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
         mode,
         params,
         exceptions,
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8822,8 +8710,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8835,12 +8723,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8861,7 +8749,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8877,8 +8765,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8905,8 +8793,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8915,13 +8803,13 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -8932,7 +8820,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8986,8 +8874,8 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueDef_Remote_Proxy_Broke
 
 _TAO_CORBA_ValueDef_Proxy_Impl&
 _TAO_CORBA_ValueDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ValueDef *,
-  CORBA::Environment &
+  ::CORBA_ValueDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -9033,25 +8921,25 @@ void CORBA_ValueDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_ValueDef_ptr CORBA_ValueDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ValueDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ValueDef::_nil ());
       if (is_a == 0)
         return CORBA_ValueDef::_nil ();
     }
-  return CORBA_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ValueDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr CORBA_ValueDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -9106,7 +8994,7 @@ CORBA_ValueDef::_duplicate (CORBA_ValueDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
@@ -9117,7 +9005,7 @@ CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environme
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ValueDef::_tao_QueryInterface (ptr_arith_t type)
@@ -9190,273 +9078,273 @@ const char* CORBA_ValueDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.supported_interfaces (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::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_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.supported_interfaces (
       this,
-      supported_interfaces,
-      ACE_TRY_ENV
+      supported_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_InitializerSeq * CORBA_ValueDef::initializers (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.initializers (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::initializers (
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.initializers (
       this,
-      initializers,
-      ACE_TRY_ENV
+      initializers
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDef_ptr CORBA_ValueDef::base_value (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_value (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::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
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.base_value (
       this,
-      base_value,
-      ACE_TRY_ENV
+      base_value
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDefSeq * CORBA_ValueDef::abstract_base_values (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.abstract_base_values (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::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_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.abstract_base_values (
       this,
-      abstract_base_values,
-      ACE_TRY_ENV
+      abstract_base_values
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_abstract (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_abstract (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::is_abstract (
-    CORBA::Boolean is_abstract,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_abstract
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.is_abstract (
       this,
-      is_abstract,
-      ACE_TRY_ENV
+      is_abstract
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_custom (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_custom (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::is_custom (
-    CORBA::Boolean is_custom,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_custom
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.is_custom (
       this,
-      is_custom,
-      ACE_TRY_ENV
+      is_custom
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_truncatable (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_truncatable (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::is_truncatable (
-    CORBA::Boolean is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_truncatable
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.is_truncatable (
       this,
-      is_truncatable,
-      ACE_TRY_ENV
+      is_truncatable
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
-      id,
-      ACE_TRY_ENV
+      id
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -10840,19 +10728,19 @@ void CORBA_ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void_
 }
 
 CORBA_ValueDef::FullValueDescription * CORBA_ValueDef::describe_value (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.describe_value (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -10861,15 +10749,15 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::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
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_value_member (
@@ -10878,8 +10766,8 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member (
       name,
       version,
       type,
-      access,
-      ACE_TRY_ENV
+      access
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -10888,15 +10776,15 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::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
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_attribute (
@@ -10905,8 +10793,8 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute (
       name,
       version,
       type,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -10918,15 +10806,15 @@ CORBA_OperationDef_ptr CORBA_ValueDef::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
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_operation (
@@ -10938,8 +10826,8 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation (
       mode,
       params,
       exceptions,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -10976,11 +10864,11 @@ tao_CORBA_ValueBoxDef_nil (
 
 CORBA_ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV);
+  return CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11103,11 +10991,11 @@ CORBA_ValueBoxDef_var::tao_nil (void)
 
 ::CORBA_ValueBoxDef_ptr
 CORBA_ValueBoxDef_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11184,27 +11072,23 @@ class TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO
 public:
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA_IDLType_ptr result);
@@ -11218,31 +11102,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11250,13 +11134,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11278,27 +11162,23 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      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));
 
 private:
@@ -11312,20 +11192,20 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     original_type_def_ (original_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11341,12 +11221,12 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11354,13 +11234,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_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;
@@ -11381,8 +11261,8 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Im
 // Remote Implementation of the IDL interface methods
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_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
@@ -11424,8 +11304,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11440,8 +11320,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11453,17 +11333,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11479,8 +11359,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11507,8 +11387,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11517,13 +11397,13 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11534,7 +11414,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11550,8 +11430,8 @@ return _tao_safe_retval._retn ();
 
 void _TAO_CORBA_ValueBoxDef_Remote_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
@@ -11593,8 +11473,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set ri (
         &_tao_call,
         _collocated_tao_target_,
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -11609,8 +11489,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11622,12 +11502,12 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -11640,7 +11520,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11655,8 +11535,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11669,8 +11549,8 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11679,13 +11559,13 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -11696,7 +11576,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11750,8 +11630,8 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Remote_Proxy
 
 _TAO_CORBA_ValueBoxDef_Proxy_Impl&
 _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
-  ::CORBA_ValueBoxDef *,
-  CORBA::Environment &
+  ::CORBA_ValueBoxDef *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -11793,25 +11673,25 @@ void CORBA_ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ValueBoxDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
       if (is_a == 0)
         return CORBA_ValueBoxDef::_nil ();
     }
-  return CORBA_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ValueBoxDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -11866,7 +11746,7 @@ CORBA_ValueBoxDef::_duplicate (CORBA_ValueBoxDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
@@ -11877,7 +11757,7 @@ CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Enviro
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
@@ -11950,38 +11830,38 @@ const char* CORBA_ValueBoxDef::_interface_repository_id (void) const
 }
 
 CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.original_type_def (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueBoxDef::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
   ))
 {
   _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.original_type_def (
       this,
-      original_type_def,
-      ACE_TRY_ENV
+      original_type_def
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -12008,7 +11888,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_FixedDef_ptr &_tao
     _tao_elem = CORBA_FixedDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12083,7 +11963,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMember
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12174,7 +12054,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMemberS
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12243,7 +12123,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr
     _tao_elem = CORBA_ValueMemberDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12304,7 +12184,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDef_ptr &_tao
     _tao_elem = CORBA_ValueDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12379,7 +12259,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDef::Fu
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12462,7 +12342,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDescrip
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12531,7 +12411,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr &_
     _tao_elem = CORBA_ValueBoxDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12591,8 +12471,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_FixedDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -12669,8 +12549,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ValueMemberDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -12705,8 +12585,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ValueDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -12741,8 +12621,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA_ValueBoxDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index a44e99046eb..fe1c8246aff 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -92,8 +92,8 @@ public:
   static void tao_release (CORBA_FixedDef_ptr);
   static CORBA_FixedDef_ptr tao_nil (void);
   static CORBA_FixedDef_ptr tao_narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -156,16 +156,14 @@ public:
   static CORBA_FixedDef_ptr _duplicate (CORBA_FixedDef_ptr obj);
 
   static CORBA_FixedDef_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_FixedDef_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static CORBA_FixedDef_ptr _nil (void)
     {
@@ -175,44 +173,39 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::UShort digits (
-      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
     ));
 
   virtual CORBA::Short scale (
-      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
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::Char *type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -260,8 +253,8 @@ class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Impl
 public:
   virtual ~_TAO_CORBA_FixedDef_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
@@ -269,16 +262,16 @@ public:
 
   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
     )) = 0;
 
   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
@@ -286,8 +279,8 @@ public:
 
   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
@@ -317,8 +310,8 @@ public:
 
   virtual ~_TAO_CORBA_FixedDef_Remote_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
@@ -326,16 +319,16 @@ public:
 
   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
@@ -343,8 +336,8 @@ public:
 
   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
@@ -372,8 +365,8 @@ class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Broker
 public:
   virtual ~_TAO_CORBA_FixedDef_Proxy_Broker (void);
   virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
-      CORBA_FixedDef *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      CORBA_FixedDef *object
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
 protected:
@@ -399,8 +392,8 @@ public:
   virtual ~_TAO_CORBA_FixedDef_Remote_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:
@@ -691,8 +684,8 @@ public:
     static void tao_release (CORBA_ValueMemberDef_ptr);
     static CORBA_ValueMemberDef_ptr tao_nil (void);
     static CORBA_ValueMemberDef_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -755,16 +748,14 @@ public:
     static CORBA_ValueMemberDef_ptr _duplicate (CORBA_ValueMemberDef_ptr obj);
 
     static CORBA_ValueMemberDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static CORBA_ValueMemberDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static CORBA_ValueMemberDef_ptr _nil (void)
       {
@@ -774,52 +765,46 @@ public:
     static void _tao_any_destructor (void*);
 
     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_IDLType_ptr type_def (
-        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
       ));
 
     virtual CORBA::Visibility access (
-        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
       ));
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -867,16 +852,16 @@ public:
   public:
     virtual ~_TAO_CORBA_ValueMemberDef_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
       )) = 0;
 
     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
@@ -884,16 +869,16 @@ public:
 
     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
       )) = 0;
 
     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
@@ -901,8 +886,8 @@ public:
 
     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
@@ -932,16 +917,16 @@ public:
 
     virtual ~_TAO_CORBA_ValueMemberDef_Remote_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
@@ -949,16 +934,16 @@ public:
 
     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
@@ -966,8 +951,8 @@ public:
 
     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
@@ -995,8 +980,8 @@ public:
   public:
     virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
     virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
-        CORBA_ValueMemberDef *object,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        CORBA_ValueMemberDef *object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1022,8 +1007,8 @@ public:
     virtual ~_TAO_CORBA_ValueMemberDef_Remote_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:
@@ -1083,8 +1068,8 @@ public:
       static void tao_release (CORBA_ValueDef_ptr);
       static CORBA_ValueDef_ptr tao_nil (void);
       static CORBA_ValueDef_ptr tao_narrow (
-          CORBA::Object *,
-          CORBA::Environment &
+          CORBA::Object *
+          TAO_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1149,16 +1134,14 @@ public:
       static CORBA_ValueDef_ptr _duplicate (CORBA_ValueDef_ptr obj);
 
       static CORBA_ValueDef_ptr _narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       static CORBA_ValueDef_ptr _unchecked_narrow (
-          CORBA::Object_ptr obj,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA::Object_ptr obj
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       static CORBA_ValueDef_ptr _nil (void)
         {
@@ -1168,129 +1151,114 @@ public:
       static void _tao_any_destructor (void*);
 
       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
         ));
 
       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
         ));
 
       virtual CORBA_InitializerSeq * initializers (
-          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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
 
       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
         ));
@@ -1376,9 +1344,8 @@ public:
       static CORBA::TypeCode_ptr _tc_FullValueDescription;
 
       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
         ));
@@ -1388,10 +1355,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
         ));
@@ -1401,10 +1367,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
         ));
@@ -1417,19 +1382,17 @@ 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
         ));
 
       virtual CORBA::Boolean _is_a (
-          const CORBA::Char *type_id,
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          const CORBA::Char *type_id
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
       virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -1479,8 +1442,8 @@ public:
     public:
       virtual ~_TAO_CORBA_ValueDef_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
@@ -1488,16 +1451,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1505,16 +1468,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1522,16 +1485,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1539,16 +1502,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1556,16 +1519,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1573,16 +1536,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1590,8 +1553,8 @@ public:
 
       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
@@ -1599,16 +1562,16 @@ public:
 
       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
         )) = 0;
 
       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
@@ -1620,8 +1583,8 @@ public:
           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
@@ -1633,8 +1596,8 @@ public:
           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
@@ -1649,8 +1612,8 @@ 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
@@ -1682,8 +1645,8 @@ public:
 
       virtual ~_TAO_CORBA_ValueDef_Remote_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
@@ -1691,16 +1654,16 @@ public:
 
       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
@@ -1708,16 +1671,16 @@ public:
 
       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
@@ -1725,16 +1688,16 @@ public:
 
       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
@@ -1742,16 +1705,16 @@ public:
 
       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
@@ -1759,16 +1722,16 @@ public:
 
       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
@@ -1776,16 +1739,16 @@ public:
 
       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
@@ -1793,8 +1756,8 @@ public:
 
       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
@@ -1802,16 +1765,16 @@ public:
 
       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
@@ -1823,8 +1786,8 @@ public:
           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
@@ -1836,8 +1799,8 @@ public:
           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
@@ -1852,8 +1815,8 @@ 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
@@ -1881,8 +1844,8 @@ public:
     public:
       virtual ~_TAO_CORBA_ValueDef_Proxy_Broker (void);
       virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
-          CORBA_ValueDef *object,
-          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+          CORBA_ValueDef *object
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
 
     protected:
@@ -1908,8 +1871,8 @@ public:
       virtual ~_TAO_CORBA_ValueDef_Remote_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:
@@ -2042,8 +2005,8 @@ public:
         static void tao_release (CORBA_ValueBoxDef_ptr);
         static CORBA_ValueBoxDef_ptr tao_nil (void);
         static CORBA_ValueBoxDef_ptr tao_narrow (
-            CORBA::Object *,
-            CORBA::Environment &
+            CORBA::Object *
+            TAO_ENV_ARG_DECL_NOT_USED
           );
         static CORBA::Object * tao_upcast (void *);
 
@@ -2106,16 +2069,14 @@ public:
         static CORBA_ValueBoxDef_ptr _duplicate (CORBA_ValueBoxDef_ptr obj);
 
         static CORBA_ValueBoxDef_ptr _narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         static CORBA_ValueBoxDef_ptr _unchecked_narrow (
-            CORBA::Object_ptr obj,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            CORBA::Object_ptr obj
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         static CORBA_ValueBoxDef_ptr _nil (void)
           {
@@ -2125,27 +2086,24 @@ public:
         static void _tao_any_destructor (void*);
 
         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
           ));
 
         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
           ));
 
         virtual CORBA::Boolean _is_a (
-            const CORBA::Char *type_id,
-            CORBA::Environment &ACE_TRY_ENV =
-              TAO_default_environment ()
-          );
+            const CORBA::Char *type_id
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
         virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -2193,8 +2151,8 @@ public:
       public:
         virtual ~_TAO_CORBA_ValueBoxDef_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
@@ -2202,8 +2160,8 @@ public:
 
         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
@@ -2233,8 +2191,8 @@ public:
 
         virtual ~_TAO_CORBA_ValueBoxDef_Remote_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
@@ -2242,8 +2200,8 @@ public:
 
         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
@@ -2271,8 +2229,8 @@ public:
       public:
         virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
         virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
-            CORBA_ValueBoxDef *object,
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+            CORBA_ValueBoxDef *object
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
 
       protected:
@@ -2298,8 +2256,8 @@ public:
         virtual ~_TAO_CORBA_ValueBoxDef_Remote_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:
diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
index 6889ec13661..9aff98f44fe 100644
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ b/TAO/tao/IFR_Client_Adapter.cpp
@@ -11,14 +11,14 @@ TAO_IFR_Client_Adapter::~TAO_IFR_Client_Adapter (void)
 
 // Methods to be overridden.
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_IFR_Client_Adapter::interfacedef_cdr_insert (TAO_OutputCDR &,
                                                  CORBA_InterfaceDef_ptr)
 {
   return 0;
 }
 
-void 
+void
 TAO_IFR_Client_Adapter::interfacedef_any_insert (CORBA_Any &,
                                                  CORBA_InterfaceDef_ptr)
 {
@@ -31,15 +31,15 @@ TAO_IFR_Client_Adapter::dispose (CORBA_InterfaceDef_ptr)
 
 CORBA_InterfaceDef_ptr
 TAO_IFR_Client_Adapter::get_interface (CORBA::ORB_ptr,
-                                       const char *,
-                                       CORBA::Environment &)
+                                       const char *
+                                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 CORBA_InterfaceDef_ptr
-TAO_IFR_Client_Adapter::get_interface_remote (const CORBA::Object_ptr,
-                                              CORBA_Environment &)
+TAO_IFR_Client_Adapter::get_interface_remote (const CORBA::Object_ptr
+                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 08c200e4c4e..f6158f80841 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -29,7 +29,7 @@
  * @brief TAO_IFR_Client_Adapter.
  *
  * Class that adapts various functions in the CORBA namespace
- * which use the Interface Repository. This is a base class for 
+ * which use the Interface Repository. This is a base class for
  * the actual implementation in the TAO_IFR_Client library.
  */
 class TAO_Export TAO_IFR_Client_Adapter : public ACE_Service_Object
@@ -53,14 +53,13 @@ public:
 
   virtual CORBA_InterfaceDef_ptr get_interface (
       CORBA::ORB_ptr orb,
-      const char *repo_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char *repo_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual CORBA_InterfaceDef_ptr get_interface_remote (
-      const CORBA::Object_ptr target,
-      CORBA_Environment &ACE_TRY_ENV
+      const CORBA::Object_ptr target
+      TAO_ENV_ARG_DECL
     );
 };
 
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 08c979ca664..5ff8b03195e 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -34,7 +34,7 @@ static const CORBA::Long _oc_IIOP_ListenPoint[] =
   12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
   2, // member count
   5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
   CORBA::tk_ushort,
@@ -53,7 +53,7 @@ void IIOP::ListenPoint::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IIOP_LISTENPOINTLIST_CS_
 
@@ -62,43 +62,43 @@ void IIOP::ListenPoint::_tao_any_destructor (void *x)
   {
     IIOP::ListenPoint* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IIOP_ListenPointList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       IIOP::ListenPoint *old = ACE_reinterpret_cast (IIOP::ListenPoint *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     IIOP::ListenPoint *tmp = ACE_reinterpret_cast (IIOP::ListenPoint *,this->buffer_);
-    
+
     _TAO_Unbounded_Sequence_IIOP_ListenPointList::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   IIOP::_TAO_Unbounded_Sequence_IIOP_ListenPointList::~_TAO_Unbounded_Sequence_IIOP_ListenPointList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IIOP_LISTENPOINTLIST_CS_)
 #define _IIOP_LISTENPOINTLIST_CS_
@@ -110,30 +110,30 @@ void IIOP::ListenPoint::_tao_any_destructor (void *x)
 IIOP::ListenPointList::ListenPointList (void)
 {}
 IIOP::ListenPointList::ListenPointList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 IIOP::ListenPointList::ListenPointList (CORBA::ULong max, CORBA::ULong length, IIOP::ListenPoint *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 IIOP::ListenPointList::ListenPointList (const ListenPointList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IIOP_ListenPointList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IIOP::ListenPoint>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 IIOP::ListenPointList::~ListenPointList (void) // dtor
@@ -162,7 +162,7 @@ static const CORBA::Long _oc_IIOP_ListenPointList[] =
       12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
       2, // member count
       5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
       CORBA::tk_ushort,
@@ -198,7 +198,7 @@ static const CORBA::Long _oc_IIOP_BiDirIIOPServiceContext[] =
         12, ACE_NTOHL (0x4c697374), ACE_NTOHL (0x656e506f), ACE_NTOHL (0x696e7400),  // name = ListenPoint
         2, // member count
         5, ACE_NTOHL (0x686f7374), ACE_NTOHL (0x0),  // name = host
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
         5, ACE_NTOHL (0x706f7274), ACE_NTOHL (0x0),  // name = port
         CORBA::tk_ushort,
@@ -256,7 +256,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPoint
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPoint, ACE_TRY_ENV);
+      type->equivalent (IIOP::_tc_ListenPoint TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -349,7 +349,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPointL
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPointList, ACE_TRY_ENV);
+      type->equivalent (IIOP::_tc_ListenPointList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -434,8 +434,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::BiDirIIOPSer
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_BiDirIIOPServiceContext,
-                        ACE_TRY_ENV);
+      type->equivalent (IIOP::_tc_BiDirIIOPServiceContext
+                         TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -512,7 +512,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index e4c86a4ffec..ec0bac2b60c 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -116,8 +116,8 @@ TAO_IIOP_Connector::close (void)
 
 int
 TAO_IIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
-                             TAO_Transport_Descriptor_Interface *desc,
-                             CORBA::Environment &)
+                             TAO_Transport_Descriptor_Interface *desc
+                             TAO_ENV_ARG_DECL_NOT_USED)
 {
   TAO_Transport *&transport = invocation->transport ();
   ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
@@ -427,7 +427,7 @@ TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_IIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV)
+TAO_IIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -494,7 +494,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
   // lookup and caching are not done based on protocol
   // properties.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // Initialize the settings to the ORB defaults.  If RT CORBA is enabled,
   // it may override these.
@@ -502,7 +502,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
   int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
   int no_delay = this->orb_core ()->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 57a1d7010d7..b6b10fbc772 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -57,8 +57,8 @@ public:
   int open (TAO_ORB_Core *orb_core);
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
-               TAO_Transport_Descriptor_Interface *desc,
-               CORBA::Environment &ACE_TRY_ENV);
+               TAO_Transport_Descriptor_Interface *desc
+               TAO_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -70,7 +70,7 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Pluggable.h
-  virtual TAO_Profile *make_profile (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Obtain tcp properties that must be used by this connector, i.e.,
   /// initialize <tcp_properties_>.
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 693c2451380..7b31e4acce5 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -162,8 +162,8 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
 }
 
 void
-TAO_IIOP_Profile::parse_string (const char *ior,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_IIOP_Profile::parse_string (const char *ior
+                                TAO_ENV_ARG_DECL)
 {
   if (!ior || !*ior)
     {
@@ -328,8 +328,8 @@ TAO_IIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_IIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
+TAO_IIOP_Profile::hash (CORBA::ULong max
+                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -374,7 +374,7 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp)
 }
 
 char *
-TAO_IIOP_Profile::to_string (CORBA::Environment &)
+TAO_IIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index bb5bd4330a4..b837f202439 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -74,8 +74,8 @@ public:
 
   /// Initialize this object using the given input string.
   /// Url-style string contain only one endpoint.
-  virtual void parse_string (const char *string,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void parse_string (const char *string
+                             TAO_ENV_ARG_DECL);
 
   /**
    * Return a string representation for this profile.
@@ -83,7 +83,7 @@ public:
    * This is used to create url-style reference.  Only one
    * endpoint is included into the string.
    */
-  virtual char * to_string (CORBA::Environment &ACE_TRY_ENV);
+  virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr);
@@ -139,8 +139,8 @@ public:
   virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::ULong hash (CORBA::ULong max
+                             TAO_ENV_ARG_DECL);
 
   /// Please refer to Profile.h for the documentation of this
   /// function.
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index cfe79d420b2..376ff91f2ed 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1596,11 +1596,11 @@ tao_IOP_Codec_nil (
 
 IOP::Codec_ptr
 tao_IOP_Codec_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IOP::Codec::_narrow (p, ACE_TRY_ENV);
+  return IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1720,11 +1720,11 @@ IOP::Codec_var::tao_nil (void)
 
 ::IOP::Codec_ptr
 IOP::Codec_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IOP::Codec::_narrow (p, ACE_TRY_ENV);
+  return ::IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1805,16 +1805,16 @@ IOP::Codec::~Codec (void)
 {}
 
 IOP::Codec_ptr IOP::Codec::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Codec::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Codec::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IOP::Codec_ptr IOP::Codec::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1908,16 +1908,16 @@ void IOP::Codec::InvalidTypeForEncoding::_raise ()
 }
 
 void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -1976,16 +1976,16 @@ void IOP::Codec::FormatMismatch::_raise ()
 }
 
 void IOP::Codec::FormatMismatch::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void IOP::Codec::FormatMismatch::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2044,16 +2044,16 @@ void IOP::Codec::TypeMismatch::_raise ()
 }
 
 void IOP::Codec::TypeMismatch::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void IOP::Codec::TypeMismatch::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2210,11 +2210,11 @@ tao_IOP_CodecFactory_nil (
 
 IOP::CodecFactory_ptr
 tao_IOP_CodecFactory_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IOP::CodecFactory::_narrow (p, ACE_TRY_ENV);
+  return IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2336,11 +2336,11 @@ IOP::CodecFactory_var::tao_nil (void)
 
 ::IOP::CodecFactory_ptr
 IOP::CodecFactory_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IOP::CodecFactory::_narrow (p, ACE_TRY_ENV);
+  return ::IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2421,16 +2421,16 @@ IOP::CodecFactory::~CodecFactory (void)
 {}
 
 IOP::CodecFactory_ptr IOP::CodecFactory::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return CodecFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CodecFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2524,16 +2524,16 @@ void IOP::CodecFactory::UnknownEncoding::_raise ()
 }
 
 void IOP::CodecFactory::UnknownEncoding::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void IOP::CodecFactory::UnknownEncoding::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2584,7 +2584,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2667,7 +2667,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2750,7 +2750,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2841,7 +2841,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleCompo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2932,7 +2932,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3023,7 +3023,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3106,7 +3106,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3197,7 +3197,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3287,7 +3287,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 1a652cba8a2..61303ca2cc6 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -74,7 +74,7 @@ TAO_NAMESPACE  IOP
 
   struct TaggedProfile;
   class TaggedProfile_var;
-  
+
   struct TAO_Export TaggedProfile
   {
 
@@ -91,25 +91,25 @@ TAO_NAMESPACE  IOP
 
     class _tao_seq_Octet;
     class _tao_seq_Octet_var;
-    
+
     // *************************************************************
     // _tao_seq_Octet
     // *************************************************************
-    
-    class TAO_Export _tao_seq_Octet : public 
+
+    class TAO_Export _tao_seq_Octet : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
       TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
       TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
     {
     public:
       _tao_seq_Octet (void); // default ctor
       _tao_seq_Octet (CORBA::ULong max); // uses max size
       _tao_seq_Octet (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Octet *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Octet *buffer,
         CORBA::Boolean release = 0
       );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
@@ -130,7 +130,7 @@ TAO_NAMESPACE  IOP
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
 
     };
-    
+
 #endif /* end #if !defined */
 
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -147,18 +147,18 @@ TAO_NAMESPACE  IOP
     TaggedProfile_var (TaggedProfile *);
     TaggedProfile_var (const TaggedProfile_var &); // copy constructor
     ~TaggedProfile_var (void); // destructor
-    
+
     TaggedProfile_var &operator= (TaggedProfile *);
     TaggedProfile_var &operator= (const TaggedProfile_var &);
     TaggedProfile *operator-> (void);
     const TaggedProfile *operator-> (void) const;
-    
+
     operator const TaggedProfile &() const;
     operator TaggedProfile &();
     operator TaggedProfile &() const;
     operator TaggedProfile *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const TaggedProfile &in (void) const;
     TaggedProfile &inout (void);
     TaggedProfile *&out (void);
@@ -180,7 +180,7 @@ TAO_NAMESPACE  IOP
     operator TaggedProfile *&();
     TaggedProfile *&ptr (void);
     TaggedProfile *operator-> (void);
-    
+
   private:
     TaggedProfile *&ptr_;
     // assignment from T_var not allowed
@@ -191,7 +191,7 @@ TAO_NAMESPACE  IOP
 
   struct IOR;
   class IOR_var;
-  
+
   struct TAO_Export IOR
   {
 
@@ -204,7 +204,7 @@ TAO_NAMESPACE  IOP
     TAO_String_Manager type_id;
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_
 
@@ -212,9 +212,9 @@ TAO_NAMESPACE  IOP
       {
       public:
         // = Initialization and termination methods.
-        
+
         _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void); // Default constructor.
-        _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum); 
+        _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum);
         _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (CORBA::ULong maximum,
           CORBA::ULong length,
           ACE_NESTED_CLASS (IOP, TaggedProfile) *data,
@@ -231,7 +231,7 @@ TAO_NAMESPACE  IOP
         virtual void _allocate_buffer (CORBA::ULong length);
         virtual void _deallocate_buffer (void);
         // Implement the TAO_Base_Sequence methods (see Sequence.h)
-        
+
         ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (CORBA::Boolean orphan = 0);
         const ACE_NESTED_CLASS (IOP, TaggedProfile) *get_buffer (void) const;
         void replace (CORBA::ULong max,
@@ -243,32 +243,32 @@ TAO_NAMESPACE  IOP
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-    
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_)
 #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CH_
 
     class _tao_seq_TaggedProfile;
     class _tao_seq_TaggedProfile_var;
-    
+
     // *************************************************************
     // _tao_seq_TaggedProfile
     // *************************************************************
-    
-    class TAO_Export _tao_seq_TaggedProfile : public 
+
+    class TAO_Export _tao_seq_TaggedProfile : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
       _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
       TAO_Unbounded_Sequence<ACE_NESTED_CLASS (IOP, TaggedProfile)>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
     {
     public:
       _tao_seq_TaggedProfile (void); // default ctor
       _tao_seq_TaggedProfile (CORBA::ULong max); // uses max size
       _tao_seq_TaggedProfile (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer,
         CORBA::Boolean release = 0
       );
       _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor
@@ -280,7 +280,7 @@ TAO_NAMESPACE  IOP
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     };
-    
+
 #endif /* end #if !defined */
 
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -297,18 +297,18 @@ TAO_NAMESPACE  IOP
     IOR_var (IOR *);
     IOR_var (const IOR_var &); // copy constructor
     ~IOR_var (void); // destructor
-    
+
     IOR_var &operator= (IOR *);
     IOR_var &operator= (const IOR_var &);
     IOR *operator-> (void);
     const IOR *operator-> (void) const;
-    
+
     operator const IOR &() const;
     operator IOR &();
     operator IOR &() const;
     operator IOR *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const IOR &in (void) const;
     IOR &inout (void);
     IOR *&out (void);
@@ -330,7 +330,7 @@ TAO_NAMESPACE  IOP
     operator IOR *&();
     IOR *&ptr (void);
     IOR *operator-> (void);
-    
+
   private:
     IOR *&ptr_;
     // assignment from T_var not allowed
@@ -345,7 +345,7 @@ TAO_NAMESPACE  IOP
 
   struct TaggedComponent;
   class TaggedComponent_var;
-  
+
   struct TAO_Export TaggedComponent
   {
 
@@ -362,25 +362,25 @@ TAO_NAMESPACE  IOP
 
     class _tao_seq_Octet;
     class _tao_seq_Octet_var;
-    
+
     // *************************************************************
     // _tao_seq_Octet
     // *************************************************************
-    
-    class TAO_Export _tao_seq_Octet : public 
+
+    class TAO_Export _tao_seq_Octet : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
       TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
       TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
     {
     public:
       _tao_seq_Octet (void); // default ctor
       _tao_seq_Octet (CORBA::ULong max); // uses max size
       _tao_seq_Octet (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Octet *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Octet *buffer,
         CORBA::Boolean release = 0
       );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
@@ -401,7 +401,7 @@ TAO_NAMESPACE  IOP
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
 
     };
-    
+
 #endif /* end #if !defined */
 
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -418,18 +418,18 @@ TAO_NAMESPACE  IOP
     TaggedComponent_var (TaggedComponent *);
     TaggedComponent_var (const TaggedComponent_var &); // copy constructor
     ~TaggedComponent_var (void); // destructor
-    
+
     TaggedComponent_var &operator= (TaggedComponent *);
     TaggedComponent_var &operator= (const TaggedComponent_var &);
     TaggedComponent *operator-> (void);
     const TaggedComponent *operator-> (void) const;
-    
+
     operator const TaggedComponent &() const;
     operator TaggedComponent &();
     operator TaggedComponent &() const;
     operator TaggedComponent *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const TaggedComponent &in (void) const;
     TaggedComponent &inout (void);
     TaggedComponent *&out (void);
@@ -451,7 +451,7 @@ TAO_NAMESPACE  IOP
     operator TaggedComponent *&();
     TaggedComponent *&ptr (void);
     TaggedComponent *operator-> (void);
-    
+
   private:
     TaggedComponent *&ptr_;
     // assignment from T_var not allowed
@@ -462,7 +462,7 @@ TAO_NAMESPACE  IOP
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CH_
 
@@ -470,9 +470,9 @@ TAO_NAMESPACE  IOP
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void); // Default constructor.
-      _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (CORBA::ULong maximum,
         CORBA::ULong length,
         TaggedComponent *data,
@@ -489,7 +489,7 @@ TAO_NAMESPACE  IOP
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       TaggedComponent *get_buffer (CORBA::Boolean orphan = 0);
       const TaggedComponent *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -501,32 +501,32 @@ TAO_NAMESPACE  IOP
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CH_
 
   class MultipleComponentProfile;
   class MultipleComponentProfile_var;
-  
+
   // *************************************************************
   // MultipleComponentProfile
   // *************************************************************
-  
-  class TAO_Export MultipleComponentProfile : public 
+
+  class TAO_Export MultipleComponentProfile : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     MultipleComponentProfile (void); // default ctor
     MultipleComponentProfile (CORBA::ULong max); // uses max size
     MultipleComponentProfile (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      TaggedComponent *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      TaggedComponent *buffer,
       CORBA::Boolean release = 0
     );
     MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor
@@ -538,7 +538,7 @@ TAO_NAMESPACE  IOP
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -556,21 +556,21 @@ TAO_NAMESPACE  IOP
     MultipleComponentProfile_var (MultipleComponentProfile *);
     MultipleComponentProfile_var (const MultipleComponentProfile_var &); // copy constructor
     ~MultipleComponentProfile_var (void); // destructor
-    
+
     MultipleComponentProfile_var &operator= (MultipleComponentProfile *);
     MultipleComponentProfile_var &operator= (const MultipleComponentProfile_var &);
     MultipleComponentProfile *operator-> (void);
     const MultipleComponentProfile *operator-> (void) const;
-    
+
     operator const MultipleComponentProfile &() const;
     operator MultipleComponentProfile &();
     operator MultipleComponentProfile &() const;
     operator MultipleComponentProfile *&(); // variable-size base types only
-    
+
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const MultipleComponentProfile &in (void) const;
     MultipleComponentProfile &inout (void);
     MultipleComponentProfile *&out (void);
@@ -600,7 +600,7 @@ TAO_NAMESPACE  IOP
     MultipleComponentProfile *&ptr (void);
     MultipleComponentProfile *operator-> (void);
     TaggedComponent & operator[] (CORBA::ULong index);
-    
+
   private:
     MultipleComponentProfile *&ptr_;
     // assignment from T_var not allowed
@@ -614,7 +614,7 @@ TAO_NAMESPACE  IOP
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CH_
 
@@ -622,9 +622,9 @@ TAO_NAMESPACE  IOP
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_IOP_TaggedComponentList (void); // Default constructor.
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_IOP_TaggedComponentList (CORBA::ULong maximum,
         CORBA::ULong length,
         TaggedComponent *data,
@@ -641,7 +641,7 @@ TAO_NAMESPACE  IOP
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       TaggedComponent *get_buffer (CORBA::Boolean orphan = 0);
       const TaggedComponent *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -653,32 +653,32 @@ TAO_NAMESPACE  IOP
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
 #define _IOP_TAGGEDCOMPONENTLIST_CH_
 
   class TaggedComponentList;
   class TaggedComponentList_var;
-  
+
   // *************************************************************
   // TaggedComponentList
   // *************************************************************
-  
-  class TAO_Export TaggedComponentList : public 
+
+  class TAO_Export TaggedComponentList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     TaggedComponentList (void); // default ctor
     TaggedComponentList (CORBA::ULong max); // uses max size
     TaggedComponentList (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      TaggedComponent *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      TaggedComponent *buffer,
       CORBA::Boolean release = 0
     );
     TaggedComponentList (const TaggedComponentList &); // copy ctor
@@ -690,7 +690,7 @@ TAO_NAMESPACE  IOP
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -708,21 +708,21 @@ TAO_NAMESPACE  IOP
     TaggedComponentList_var (TaggedComponentList *);
     TaggedComponentList_var (const TaggedComponentList_var &); // copy constructor
     ~TaggedComponentList_var (void); // destructor
-    
+
     TaggedComponentList_var &operator= (TaggedComponentList *);
     TaggedComponentList_var &operator= (const TaggedComponentList_var &);
     TaggedComponentList *operator-> (void);
     const TaggedComponentList *operator-> (void) const;
-    
+
     operator const TaggedComponentList &() const;
     operator TaggedComponentList &();
     operator TaggedComponentList &() const;
     operator TaggedComponentList *&(); // variable-size base types only
-    
+
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const TaggedComponentList &in (void) const;
     TaggedComponentList &inout (void);
     TaggedComponentList *&out (void);
@@ -752,7 +752,7 @@ TAO_NAMESPACE  IOP
     TaggedComponentList *&ptr (void);
     TaggedComponentList *operator-> (void);
     TaggedComponent & operator[] (CORBA::ULong index);
-    
+
   private:
     TaggedComponentList *&ptr_;
     // assignment from T_var not allowed
@@ -766,7 +766,7 @@ TAO_NAMESPACE  IOP
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_
 
@@ -774,9 +774,9 @@ TAO_NAMESPACE  IOP
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum,
         CORBA::ULong length,
         TaggedComponent *data,
@@ -793,7 +793,7 @@ TAO_NAMESPACE  IOP
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       TaggedComponent *get_buffer (CORBA::Boolean orphan = 0);
       const TaggedComponent *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -805,32 +805,32 @@ TAO_NAMESPACE  IOP
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CH_
 
   class TaggedComponentSeq;
   class TaggedComponentSeq_var;
-  
+
   // *************************************************************
   // TaggedComponentSeq
   // *************************************************************
-  
-  class TAO_Export TaggedComponentSeq : public 
+
+  class TAO_Export TaggedComponentSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     TaggedComponentSeq (void); // default ctor
     TaggedComponentSeq (CORBA::ULong max); // uses max size
     TaggedComponentSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      TaggedComponent *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      TaggedComponent *buffer,
       CORBA::Boolean release = 0
     );
     TaggedComponentSeq (const TaggedComponentSeq &); // copy ctor
@@ -842,7 +842,7 @@ TAO_NAMESPACE  IOP
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -860,21 +860,21 @@ TAO_NAMESPACE  IOP
     TaggedComponentSeq_var (TaggedComponentSeq *);
     TaggedComponentSeq_var (const TaggedComponentSeq_var &); // copy constructor
     ~TaggedComponentSeq_var (void); // destructor
-    
+
     TaggedComponentSeq_var &operator= (TaggedComponentSeq *);
     TaggedComponentSeq_var &operator= (const TaggedComponentSeq_var &);
     TaggedComponentSeq *operator-> (void);
     const TaggedComponentSeq *operator-> (void) const;
-    
+
     operator const TaggedComponentSeq &() const;
     operator TaggedComponentSeq &();
     operator TaggedComponentSeq &() const;
     operator TaggedComponentSeq *&(); // variable-size base types only
-    
+
     TaggedComponent & operator[] (CORBA::ULong index);
     const TaggedComponent & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const TaggedComponentSeq &in (void) const;
     TaggedComponentSeq &inout (void);
     TaggedComponentSeq *&out (void);
@@ -904,7 +904,7 @@ TAO_NAMESPACE  IOP
     TaggedComponentSeq *&ptr (void);
     TaggedComponentSeq *operator-> (void);
     TaggedComponent & operator[] (CORBA::ULong index);
-    
+
   private:
     TaggedComponentSeq *&ptr_;
     // assignment from T_var not allowed
@@ -942,7 +942,7 @@ TAO_NAMESPACE  IOP
 
   struct ServiceContext;
   class ServiceContext_var;
-  
+
   struct TAO_Export ServiceContext
   {
 
@@ -959,25 +959,25 @@ TAO_NAMESPACE  IOP
 
     class _tao_seq_Octet;
     class _tao_seq_Octet_var;
-    
+
     // *************************************************************
     // _tao_seq_Octet
     // *************************************************************
-    
-    class TAO_Export _tao_seq_Octet : public 
+
+    class TAO_Export _tao_seq_Octet : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
       TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
       TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
     {
     public:
       _tao_seq_Octet (void); // default ctor
       _tao_seq_Octet (CORBA::ULong max); // uses max size
       _tao_seq_Octet (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Octet *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Octet *buffer,
         CORBA::Boolean release = 0
       );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
@@ -998,7 +998,7 @@ TAO_NAMESPACE  IOP
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
 
     };
-    
+
 #endif /* end #if !defined */
 
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -1015,18 +1015,18 @@ TAO_NAMESPACE  IOP
     ServiceContext_var (ServiceContext *);
     ServiceContext_var (const ServiceContext_var &); // copy constructor
     ~ServiceContext_var (void); // destructor
-    
+
     ServiceContext_var &operator= (ServiceContext *);
     ServiceContext_var &operator= (const ServiceContext_var &);
     ServiceContext *operator-> (void);
     const ServiceContext *operator-> (void) const;
-    
+
     operator const ServiceContext &() const;
     operator ServiceContext &();
     operator ServiceContext &() const;
     operator ServiceContext *&(); // variable-size types only
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const ServiceContext &in (void) const;
     ServiceContext &inout (void);
     ServiceContext *&out (void);
@@ -1048,7 +1048,7 @@ TAO_NAMESPACE  IOP
     operator ServiceContext *&();
     ServiceContext *&ptr (void);
     ServiceContext *operator-> (void);
-    
+
   private:
     ServiceContext *&ptr_;
     // assignment from T_var not allowed
@@ -1059,7 +1059,7 @@ TAO_NAMESPACE  IOP
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CH_
 
@@ -1067,9 +1067,9 @@ TAO_NAMESPACE  IOP
     {
     public:
       // = Initialization and termination methods.
-      
+
       _TAO_Unbounded_Sequence_IOP_ServiceContextList (void); // Default constructor.
-      _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum); 
+      _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum);
       _TAO_Unbounded_Sequence_IOP_ServiceContextList (CORBA::ULong maximum,
         CORBA::ULong length,
         ServiceContext *data,
@@ -1086,7 +1086,7 @@ TAO_NAMESPACE  IOP
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
+
       ServiceContext *get_buffer (CORBA::Boolean orphan = 0);
       const ServiceContext *get_buffer (void) const;
       void replace (CORBA::ULong max,
@@ -1098,32 +1098,32 @@ TAO_NAMESPACE  IOP
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IOP_SERVICECONTEXTLIST_CH_)
 #define _IOP_SERVICECONTEXTLIST_CH_
 
   class ServiceContextList;
   class ServiceContextList_var;
-  
+
   // *************************************************************
   // ServiceContextList
   // *************************************************************
-  
-  class TAO_Export ServiceContextList : public 
+
+  class TAO_Export ServiceContextList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     ServiceContextList (void); // default ctor
     ServiceContextList (CORBA::ULong max); // uses max size
     ServiceContextList (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      ServiceContext *buffer, 
+      CORBA::ULong max,
+      CORBA::ULong length,
+      ServiceContext *buffer,
       CORBA::Boolean release = 0
     );
     ServiceContextList (const ServiceContextList &); // copy ctor
@@ -1135,7 +1135,7 @@ TAO_NAMESPACE  IOP
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-  
+
 #endif /* end #if !defined */
 
 
@@ -1153,21 +1153,21 @@ TAO_NAMESPACE  IOP
     ServiceContextList_var (ServiceContextList *);
     ServiceContextList_var (const ServiceContextList_var &); // copy constructor
     ~ServiceContextList_var (void); // destructor
-    
+
     ServiceContextList_var &operator= (ServiceContextList *);
     ServiceContextList_var &operator= (const ServiceContextList_var &);
     ServiceContextList *operator-> (void);
     const ServiceContextList *operator-> (void) const;
-    
+
     operator const ServiceContextList &() const;
     operator ServiceContextList &();
     operator ServiceContextList &() const;
     operator ServiceContextList *&(); // variable-size base types only
-    
+
     ServiceContext & operator[] (CORBA::ULong index);
     const ServiceContext & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const ServiceContextList &in (void) const;
     ServiceContextList &inout (void);
     ServiceContextList *&out (void);
@@ -1197,7 +1197,7 @@ TAO_NAMESPACE  IOP
     ServiceContextList *&ptr (void);
     ServiceContextList *operator-> (void);
     ServiceContext & operator[] (CORBA::ULong index);
-    
+
   private:
     ServiceContextList *&ptr_;
     // assignment from T_var not allowed
@@ -1247,7 +1247,7 @@ TAO_NAMESPACE  IOP
 
   class Codec;
   typedef Codec *Codec_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1258,31 +1258,31 @@ TAO_NAMESPACE  IOP
   {
   public:
     Codec_var (void); // default constructor
-    Codec_var (Codec_ptr p) : ptr_ (p) {} 
+    Codec_var (Codec_ptr p) : ptr_ (p) {}
     Codec_var (const Codec_var &); // copy constructor
     ~Codec_var (void); // destructor
-    
+
     Codec_var &operator= (Codec_ptr);
     Codec_var &operator= (const Codec_var &);
     Codec_ptr operator-> (void) const;
-    
+
     operator const Codec_ptr &() const;
     operator Codec_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Codec_ptr in (void) const;
     Codec_ptr &inout (void);
     Codec_ptr &out (void);
     Codec_ptr _retn (void);
     Codec_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Codec_ptr tao_duplicate (Codec_ptr);
     static void tao_release (Codec_ptr);
     static Codec_ptr tao_nil (void);
-    static Codec_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static Codec_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Codec_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1309,7 +1309,7 @@ TAO_NAMESPACE  IOP
     operator Codec_ptr &();
     Codec_ptr &ptr (void);
     Codec_ptr operator-> (void);
-  
+
   private:
     Codec_ptr &ptr_;
   };
@@ -1334,15 +1334,13 @@ class TAO_Export Codec : public virtual CORBA_Object
   // the static operations
   static Codec_ptr _duplicate (Codec_ptr obj);
   static Codec_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static Codec_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static Codec_ptr _nil (void)
     {
       return (Codec_ptr)0;
@@ -1358,27 +1356,27 @@ class TAO_Export Codec : public virtual CORBA_Object
 
       InvalidTypeForEncoding (void);
       // Default constructor.
-      
+
       InvalidTypeForEncoding (const InvalidTypeForEncoding &);
       // Copy constructor.
-      
+
       ~InvalidTypeForEncoding (void);
       // Destructor.
-      
+
       InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
 
 
@@ -1399,27 +1397,27 @@ class TAO_Export Codec : public virtual CORBA_Object
 
       FormatMismatch (void);
       // Default constructor.
-      
+
       FormatMismatch (const FormatMismatch &);
       // Copy constructor.
-      
+
       ~FormatMismatch (void);
       // Destructor.
-      
+
       FormatMismatch &operator= (const FormatMismatch &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static FormatMismatch *_downcast (CORBA::Exception *);
 
 
@@ -1440,27 +1438,27 @@ class TAO_Export Codec : public virtual CORBA_Object
 
       TypeMismatch (void);
       // Default constructor.
-      
+
       TypeMismatch (const TypeMismatch &);
       // Copy constructor.
-      
+
       ~TypeMismatch (void);
       // Destructor.
-      
+
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
 
 
@@ -1472,30 +1470,27 @@ class TAO_Export Codec : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual CORBA::OctetSeq * encode (
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & data
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IOP::Codec::InvalidTypeForEncoding
       )) = 0;
 
     virtual CORBA::Any * decode (
-        const CORBA::OctetSeq & data,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::OctetSeq & data
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IOP::Codec::FormatMismatch
       )) = 0;
 
     virtual CORBA::OctetSeq * encode_value (
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & data
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IOP::Codec::InvalidTypeForEncoding
@@ -1503,10 +1498,9 @@ class TAO_Export Codec : public virtual CORBA_Object
 
     virtual CORBA::Any * decode_value (
         const CORBA::OctetSeq & data,
-        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,
         IOP::Codec::FormatMismatch,
@@ -1514,12 +1508,12 @@ class TAO_Export Codec : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Codec ();
-    
+
     virtual ~Codec (void);
   private:
     Codec (const Codec &);
@@ -1537,7 +1531,7 @@ class TAO_Export Codec : public virtual CORBA_Object
 
   struct Encoding;
   class Encoding_var;
-  
+
   struct TAO_Export Encoding
   {
 
@@ -1560,18 +1554,18 @@ class TAO_Export Codec : public virtual CORBA_Object
     Encoding_var (const Encoding_var &); // copy constructor
     Encoding_var (const Encoding &); // fixed-size types only
     ~Encoding_var (void); // destructor
-    
+
     Encoding_var &operator= (Encoding *);
     Encoding_var &operator= (const Encoding_var &);
     Encoding_var &operator= (const Encoding &); // fixed-size types only
     Encoding *operator-> (void);
     const Encoding *operator-> (void) const;
-    
+
     operator const Encoding &() const;
     operator Encoding &();
     operator Encoding &() const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const Encoding &in (void) const;
     Encoding &inout (void);
     Encoding &out (void);
@@ -1592,7 +1586,7 @@ class TAO_Export Codec : public virtual CORBA_Object
 
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -1603,31 +1597,31 @@ class TAO_Export Codec : public virtual CORBA_Object
   {
   public:
     CodecFactory_var (void); // default constructor
-    CodecFactory_var (CodecFactory_ptr p) : ptr_ (p) {} 
+    CodecFactory_var (CodecFactory_ptr p) : ptr_ (p) {}
     CodecFactory_var (const CodecFactory_var &); // copy constructor
     ~CodecFactory_var (void); // destructor
-    
+
     CodecFactory_var &operator= (CodecFactory_ptr);
     CodecFactory_var &operator= (const CodecFactory_var &);
     CodecFactory_ptr operator-> (void) const;
-    
+
     operator const CodecFactory_ptr &() const;
     operator CodecFactory_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     CodecFactory_ptr in (void) const;
     CodecFactory_ptr &inout (void);
     CodecFactory_ptr &out (void);
     CodecFactory_ptr _retn (void);
     CodecFactory_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static CodecFactory_ptr tao_duplicate (CodecFactory_ptr);
     static void tao_release (CodecFactory_ptr);
     static CodecFactory_ptr tao_nil (void);
-    static CodecFactory_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static CodecFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     CodecFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1654,7 +1648,7 @@ class TAO_Export Codec : public virtual CORBA_Object
     operator CodecFactory_ptr &();
     CodecFactory_ptr &ptr (void);
     CodecFactory_ptr operator-> (void);
-  
+
   private:
     CodecFactory_ptr &ptr_;
   };
@@ -1679,15 +1673,13 @@ class TAO_Export CodecFactory : public virtual CORBA_Object
   // the static operations
   static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
   static CodecFactory_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CodecFactory_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CodecFactory_ptr _nil (void)
     {
       return (CodecFactory_ptr)0;
@@ -1703,27 +1695,27 @@ class TAO_Export CodecFactory : public virtual CORBA_Object
 
       UnknownEncoding (void);
       // Default constructor.
-      
+
       UnknownEncoding (const UnknownEncoding &);
       // Copy constructor.
-      
+
       ~UnknownEncoding (void);
       // Destructor.
-      
+
       UnknownEncoding &operator= (const UnknownEncoding &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static UnknownEncoding *_downcast (CORBA::Exception *);
 
 
@@ -1735,22 +1727,21 @@ class TAO_Export CodecFactory : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual IOP::Codec_ptr create_codec (
-        const IOP::Encoding & enc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const IOP::Encoding & enc
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IOP::CodecFactory::UnknownEncoding
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     CodecFactory ();
-    
+
     virtual ~CodecFactory (void);
   private:
     CodecFactory (const CodecFactory &);
diff --git a/TAO/tao/IORInfo.cpp b/TAO/tao/IORInfo.cpp
index 0e3e2071078..720d67a8ad2 100644
--- a/TAO/tao/IORInfo.cpp
+++ b/TAO/tao/IORInfo.cpp
@@ -24,8 +24,8 @@ TAO_IORInfo::~TAO_IORInfo (void)
 }
 
 CORBA::Policy_ptr
-TAO_IORInfo::get_effective_policy (CORBA::PolicyType type,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the policy list supplied by the POA.
@@ -51,8 +51,8 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type,
 }
 
 void
-TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles.
@@ -62,7 +62,7 @@ TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component,
     {
       TAO_Profile *profile = this->mp_.get_profile (i);
 
-      profile->add_tagged_component (component, ACE_TRY_ENV);
+      profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -70,8 +70,8 @@ TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component,
 void
 TAO_IORInfo::add_ior_component_to_profile (
     const IOP::TaggedComponent &component,
-    IOP::ProfileId profile_id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ProfileId profile_id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles matching the given
@@ -86,7 +86,7 @@ TAO_IORInfo::add_ior_component_to_profile (
 
       if (profile->tag () == profile_id)
         {
-          profile->add_tagged_component (component, ACE_TRY_ENV);
+          profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           found_profile = 1;
diff --git a/TAO/tao/IORInfo.h b/TAO/tao/IORInfo.h
index 0fd0dd10b79..00057b5a6bb 100644
--- a/TAO/tao/IORInfo.h
+++ b/TAO/tao/IORInfo.h
@@ -56,28 +56,28 @@ public:
 
   /// Constructor.
   TAO_IORInfo (TAO_ORB_Core *orb_core,
-	       TAO_MProfile &mp,
-	       CORBA::PolicyList *policy_list);
+               TAO_MProfile &mp,
+               CORBA::PolicyList *policy_list);
 
   /// Return the policy matching the given policy type that is in
   /// effect for the object whose IOR is being created.
   virtual CORBA::Policy_ptr get_effective_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      CORBA::PolicyType type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles.
   virtual void add_ior_component (
-      const IOP::TaggedComponent & component,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const IOP::TaggedComponent & component
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles matching the given
   /// ProfileId.
   virtual void add_ior_component_to_profile (
       const IOP::TaggedComponent & component,
-      IOP::ProfileId profile_id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      IOP::ProfileId profile_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index a3c26e21787..783f085ef51 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -83,28 +83,28 @@ void TAO_IOP::EmptyProfileList::_raise ()
 }
 
 void TAO_IOP::EmptyProfileList::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void TAO_IOP::EmptyProfileList::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -120,20 +120,20 @@ static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x456d7074), 
-  ACE_NTOHL (0x7950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
   17,
-  ACE_NTOHL (0x456d7074), 
-  ACE_NTOHL (0x7950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = EmptyProfileList
   0, // member count
 };
@@ -209,28 +209,28 @@ void TAO_IOP::NotFound::_raise ()
 }
 
 void TAO_IOP::NotFound::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void TAO_IOP::NotFound::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -246,16 +246,16 @@ static const CORBA::Long _oc_TAO_IOP_NotFound[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   25,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
   9,
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
 };
@@ -331,28 +331,28 @@ void TAO_IOP::Duplicate::_raise ()
 }
 
 void TAO_IOP::Duplicate::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void TAO_IOP::Duplicate::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -368,16 +368,16 @@ static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   26,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
-  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
+  ACE_NTOHL (0x653a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
   10,
-  ACE_NTOHL (0x4475706c), 
-  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x4475706c),
+  ACE_NTOHL (0x69636174),
   ACE_NTOHL (0x65000000),  // name = Duplicate
   0, // member count
 };
@@ -453,28 +453,28 @@ void TAO_IOP::Invalid_IOR::_raise ()
 }
 
 void TAO_IOP::Invalid_IOR::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void TAO_IOP::Invalid_IOR::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -490,16 +490,16 @@ static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69645f), 
-  ACE_NTOHL (0x494f523a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
+  ACE_NTOHL (0x494f523a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
   12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c69645f),
   ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
   0, // member count
 };
@@ -575,28 +575,28 @@ void TAO_IOP::MultiProfileList::_raise ()
 }
 
 void TAO_IOP::MultiProfileList::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void TAO_IOP::MultiProfileList::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -612,20 +612,20 @@ static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x54414f5f), 
-  ACE_NTOHL (0x494f502f), 
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x6950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
   17,
-  ACE_NTOHL (0x4d756c74), 
-  ACE_NTOHL (0x6950726f), 
-  ACE_NTOHL (0x66696c65), 
-  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x4d756c74),
+  ACE_NTOHL (0x6950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
   ACE_NTOHL (0x0),  // name = MultiProfileList
   0, // member count
 };
@@ -700,7 +700,7 @@ TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &(
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
+TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -760,11 +760,11 @@ TAO_IOP::TAO_IOR_Property_var::tao_nil (void)
 
 ::TAO_IOP::TAO_IOR_Property_ptr
 TAO_IOP::TAO_IOR_Property_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::TAO_IOP::TAO_IOR_Property::_narrow (p, ACE_TRY_ENV);
+  return ::TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -845,16 +845,16 @@ TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
 TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO_IOR_Property::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return TAO_IOR_Property::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -892,7 +892,7 @@ void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -953,7 +953,7 @@ TAO_IOP::TAO_IOR_Manipulation_var::operator const ::TAO_IOP::TAO_IOR_Manipulatio
   return this->ptr_;
 }
 
-TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast 
+TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1013,11 +1013,11 @@ TAO_IOP::TAO_IOR_Manipulation_var::tao_nil (void)
 
 ::TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p, ACE_TRY_ENV);
+  return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1098,16 +1098,16 @@ TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
 TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO_IOR_Manipulation::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return TAO_IOR_Manipulation::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1145,7 +1145,7 @@ void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1158,7 +1158,7 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
 
@@ -1168,7 +1168,7 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
   {
     CORBA::Object **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
@@ -1183,7 +1183,7 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
               tmp[i] = old[i];
             }
         }
-      
+
       if (this->release_)
         {
           delete[] old;
@@ -1191,50 +1191,50 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
         tmp[i] = CORBA::Object::_nil ();
       }
-    
+
     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
     this->buffer_ = 0;
   }
-  
+
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void)
   {
     this->_deallocate_buffer ();
   }
-  
+
   void
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
     CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-    
+
     for (CORBA::ULong i = nl; i < ol; ++i)
       {
         CORBA::release (tmp[i]);
         tmp[i] = CORBA::Object::_nil ();
       }
   }
-  
-  void 
+
+  void
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
       void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
+      CORBA_Object *src
+      TAO_ENV_ARG_DECL
     )
   {
     CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target);
-    *tmp = CORBA::Object::_narrow (src, ACE_TRY_ENV);
+    *tmp = CORBA::Object::_narrow (src TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -1244,11 +1244,11 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
     CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src);
     return *tmp;
   }
-  
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
@@ -1260,30 +1260,30 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
@@ -1336,13 +1336,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProf
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::EmptyProfileList *)_tao_any.value ();
@@ -1426,13 +1426,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::NotFound *)_tao_any.value ();
@@ -1516,13 +1516,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::Duplicate *)_tao_any.value ();
@@ -1606,13 +1606,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_I
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::Invalid_IOR *)_tao_any.value ();
@@ -1696,13 +1696,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProf
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::MultiProfileList *)_tao_any.value ();
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index d97afdf5b92..ed6557ecc35 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -75,29 +75,29 @@ TAO_NAMESPACE  TAO_IOP
 
     EmptyProfileList (void);
     // Default constructor.
-    
+
     EmptyProfileList (const EmptyProfileList &);
     // Copy constructor.
-    
+
     ~EmptyProfileList (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     EmptyProfileList &operator= (const EmptyProfileList &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static EmptyProfileList *_downcast (CORBA::Exception *);
 
 
@@ -121,29 +121,29 @@ TAO_NAMESPACE  TAO_IOP
 
     NotFound (void);
     // Default constructor.
-    
+
     NotFound (const NotFound &);
     // Copy constructor.
-    
+
     ~NotFound (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     NotFound &operator= (const NotFound &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static NotFound *_downcast (CORBA::Exception *);
 
 
@@ -167,29 +167,29 @@ TAO_NAMESPACE  TAO_IOP
 
     Duplicate (void);
     // Default constructor.
-    
+
     Duplicate (const Duplicate &);
     // Copy constructor.
-    
+
     ~Duplicate (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     Duplicate &operator= (const Duplicate &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static Duplicate *_downcast (CORBA::Exception *);
 
 
@@ -213,29 +213,29 @@ TAO_NAMESPACE  TAO_IOP
 
     Invalid_IOR (void);
     // Default constructor.
-    
+
     Invalid_IOR (const Invalid_IOR &);
     // Copy constructor.
-    
+
     ~Invalid_IOR (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     Invalid_IOR &operator= (const Invalid_IOR &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static Invalid_IOR *_downcast (CORBA::Exception *);
 
 
@@ -259,29 +259,29 @@ TAO_NAMESPACE  TAO_IOP
 
     MultiProfileList (void);
     // Default constructor.
-    
+
     MultiProfileList (const MultiProfileList &);
     // Copy constructor.
-    
+
     ~MultiProfileList (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     MultiProfileList &operator= (const MultiProfileList &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static MultiProfileList *_downcast (CORBA::Exception *);
 
 
@@ -301,7 +301,7 @@ TAO_NAMESPACE  TAO_IOP
 
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -312,31 +312,31 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
     TAO_IOR_Property_var (void); // default constructor
-    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {} 
+    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {}
     TAO_IOR_Property_var (const TAO_IOR_Property_var &); // copy constructor
     ~TAO_IOR_Property_var (void); // destructor
-    
+
     TAO_IOR_Property_var &operator= (TAO_IOR_Property_ptr);
     TAO_IOR_Property_var &operator= (const TAO_IOR_Property_var &);
     TAO_IOR_Property_ptr operator-> (void) const;
-    
+
     operator const TAO_IOR_Property_ptr &() const;
     operator TAO_IOR_Property_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     TAO_IOR_Property_ptr in (void) const;
     TAO_IOR_Property_ptr &inout (void);
     TAO_IOR_Property_ptr &out (void);
     TAO_IOR_Property_ptr _retn (void);
     TAO_IOR_Property_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr);
     static void tao_release (TAO_IOR_Property_ptr);
     static TAO_IOR_Property_ptr tao_nil (void);
-    static TAO_IOR_Property_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     TAO_IOR_Property_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -363,7 +363,7 @@ TAO_NAMESPACE  TAO_IOP
     operator TAO_IOR_Property_ptr &();
     TAO_IOR_Property_ptr &ptr (void);
     TAO_IOR_Property_ptr operator-> (void);
-  
+
   private:
     TAO_IOR_Property_ptr &ptr_;
   };
@@ -388,25 +388,22 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     // the static operations
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
     static TAO_IOR_Property_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static TAO_IOR_Property_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static TAO_IOR_Property_ptr _nil (void)
       {
         return (TAO_IOR_Property_ptr)0;
       }
 
     virtual CORBA::Boolean set_property (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR
@@ -414,10 +411,9 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
     virtual CORBA::Boolean set_primary (
         CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior2
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Duplicate,
@@ -425,31 +421,29 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr get_primary (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
       )) = 0;
 
     virtual CORBA::Boolean is_primary_set (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     TAO_IOR_Property ();
-    
+
     virtual ~TAO_IOR_Property (void);
   private:
     TAO_IOR_Property (const TAO_IOR_Property &);
@@ -465,7 +459,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -476,31 +470,31 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
   {
   public:
     TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {} 
+    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
     TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
     ~TAO_IOR_Manipulation_var (void); // destructor
-    
+
     TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
     TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
     TAO_IOR_Manipulation_ptr operator-> (void) const;
-    
+
     operator const TAO_IOR_Manipulation_ptr &() const;
     operator TAO_IOR_Manipulation_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     TAO_IOR_Manipulation_ptr in (void) const;
     TAO_IOR_Manipulation_ptr &inout (void);
     TAO_IOR_Manipulation_ptr &out (void);
     TAO_IOR_Manipulation_ptr _retn (void);
     TAO_IOR_Manipulation_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr);
     static void tao_release (TAO_IOR_Manipulation_ptr);
     static TAO_IOR_Manipulation_ptr tao_nil (void);
-    static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     TAO_IOR_Manipulation_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -527,7 +521,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     operator TAO_IOR_Manipulation_ptr &();
     TAO_IOR_Manipulation_ptr &ptr (void);
     TAO_IOR_Manipulation_ptr operator-> (void);
-  
+
   private:
     TAO_IOR_Manipulation_ptr &ptr_;
   };
@@ -552,15 +546,13 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     // the static operations
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
     static TAO_IOR_Manipulation_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static TAO_IOR_Manipulation_ptr _nil (void)
       {
         return (TAO_IOR_Manipulation_ptr)0;
@@ -568,7 +560,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-      
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
 
@@ -576,7 +568,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
       {
       public:
         // = Initialization and termination methods.
-        
+
         _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
         _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
         _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
@@ -597,43 +589,42 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
         virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
         virtual void _downcast (
             void* target,
-            CORBA_Object *src,
-            CORBA_Environment &ACE_TRY_ENV = 
-              TAO_default_environment ()
-          );
+            CORBA_Object *src
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
         virtual CORBA_Object* _upcast (void *src) const;
-        
+
       };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-    
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
 
     class IORList;
     class IORList_var;
-    
+
     // *************************************************************
     // IORList
     // *************************************************************
-    
-    class TAO_IORManip_Export IORList : public 
+
+    class TAO_IORManip_Export IORList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
       TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
     {
     public:
       IORList (void); // default ctor
       IORList (CORBA::ULong max); // uses max size
       IORList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        CORBA::Object_ptr *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        CORBA::Object_ptr *buffer,
         CORBA::Boolean release = 0
       );
       IORList (const IORList &); // copy ctor
@@ -645,7 +636,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     };
-    
+
 #endif /* end #if !defined */
 
 
@@ -663,20 +654,20 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
       IORList_var (IORList *);
       IORList_var (const IORList_var &); // copy constructor
       ~IORList_var (void); // destructor
-      
+
       IORList_var &operator= (IORList *);
       IORList_var &operator= (const IORList_var &);
       IORList *operator-> (void);
       const IORList *operator-> (void) const;
-      
+
       operator const IORList &() const;
       operator IORList &();
       operator IORList &() const;
       operator IORList *&(); // variable-size base types only
-      
+
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-      
-      // in, inout, out, _retn 
+
+      // in, inout, out, _retn
       const IORList &in (void) const;
       IORList &inout (void);
       IORList *&out (void);
@@ -706,7 +697,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
       IORList *&ptr (void);
       IORList *operator-> (void);
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-      
+
     private:
       IORList *&ptr_;
       // assignment from T_var not allowed
@@ -717,10 +708,9 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -730,10 +720,9 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr add_profiles (
         CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior2
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -743,10 +732,9 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr remove_profiles (
         CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior2
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -756,10 +744,9 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::Boolean set_property (
         TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -769,10 +756,9 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Boolean set_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior2
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -783,10 +769,9 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr get_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -794,42 +779,39 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::Boolean is_primary_set (
         TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::ULong is_in_ior (
         CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior2
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
       )) = 0;
 
     virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr ior
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     TAO_IOR_Manipulation ();
-    
+
     virtual ~TAO_IOR_Manipulation (void);
   private:
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index a8d2ba4aab2..073be5e1c98 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -69,11 +69,11 @@ tao_TAO_IOP_TAO_IOR_Property_nil (
 
 ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr
 tao_TAO_IOP_TAO_IOR_Property_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO_IOP::TAO_IOR_Property::_narrow (p, ACE_TRY_ENV);
+  return TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -91,7 +91,7 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
 
@@ -99,36 +99,36 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (CORBA::ULong nelems)
   {
     CORBA::Object **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, CORBA::Object*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       {
         buf[i] = CORBA::Object::_nil ();
       }
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (CORBA::Object **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void)
   {
   }
-  
+
   ACE_INLINE
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -137,7 +137,7 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -146,12 +146,12 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
     {
       CORBA::Object **tmp1 = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (this->maximum_);
       CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
           tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
         }
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -159,17 +159,17 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -183,20 +183,20 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     CORBA::Object **tmp1 = ACE_reinterpret_cast (CORBA::Object **, this->buffer_);
     CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
         tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
       }
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -205,7 +205,7 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
     CORBA::Object ** const tmp = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<CORBA::Object,CORBA::Object_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE CORBA::Object* *
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (CORBA::Boolean orphan)
   {
@@ -239,18 +239,18 @@ tao_TAO_IOP_TAO_IOR_Property_upcast (
     }
     return result;
   }
-  
+
   ACE_INLINE const CORBA::Object* *
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const CORBA::Object ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CI_
@@ -306,7 +306,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_
         {
           IORList *deep_copy =
             new IORList (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               IORList *tmp = deep_copy;
@@ -316,7 +316,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -332,27 +332,27 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator const ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast 
+ACE_INLINE
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast 
+ACE_INLINE
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast 
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast
 {
   return this->ptr_;
 }
@@ -375,7 +375,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList *&
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::out (void)
 {
@@ -436,7 +436,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator= (IORList *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator ::TAO_IOP::TAO_IOR_Manipulation::IORList *&() // cast
 {
   return this->ptr_;
@@ -493,11 +493,11 @@ tao_TAO_IOP_TAO_IOR_Manipulation_nil (
 
 ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
 tao_TAO_IOP_TAO_IOR_Manipulation_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO_IOP::TAO_IOR_Manipulation::_narrow (p, ACE_TRY_ENV);
+  return TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index a22c8122658..46365ab2016 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -26,8 +26,8 @@ TAO_IORManip_Loader::TAO_IORManip_Loader (void)
 CORBA::Object_ptr
 TAO_IORManip_Loader::create_object (CORBA::ORB_ptr,
                                     int,
-                                    char *[],
-                                    CORBA::Environment &)
+                                    char *[]
+                                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index ea03db3fe34..68d63af9f64 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -35,8 +35,8 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv [],
-                                           CORBA::Environment &)
+                                           char *argv []
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Creates a IORManip factory and returns it.
 
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index ef812ce8907..95df98ceb57 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -49,8 +49,8 @@ TAO_IOR_Manipulation_impl::_remove_ref (void)
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV)
+    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        TAO_IOP::EmptyProfileList,
                        TAO_IOP::Duplicate,
@@ -120,8 +120,8 @@ TAO_IOR_Manipulation_impl::merge_iors (
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string
-                                          Merged_Profiles,
-                                          ACE_TRY_ENV);
+                                          Merged_Profiles
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Make the stub memory allocation exception safe for the duration
@@ -155,8 +155,8 @@ TAO_IOR_Manipulation_impl::merge_iors (
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::add_profiles (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Object_ptr ior2
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -170,14 +170,14 @@ TAO_IOR_Manipulation_impl::add_profiles (
   buffer [0] = ior1;
   buffer [1] = ior2;
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0);
-  return this->merge_iors (iors, ACE_TRY_ENV);
+  return this->merge_iors (iors TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::remove_profiles (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Object_ptr ior2
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -224,8 +224,8 @@ TAO_IOR_Manipulation_impl::remove_profiles (
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string
-                                          Diff_Profiles,
-                                          ACE_TRY_ENV);
+                                          Diff_Profiles
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Make the stub memory allocation exception safe for the duration
@@ -259,8 +259,8 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 CORBA::Boolean
 TAO_IOR_Manipulation_impl::set_property (
       TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -274,16 +274,16 @@ TAO_IOR_Manipulation_impl::set_property (
                       0);
 
   // Call the implementation object to
-  return prop->set_property (ior,
-                             ACE_TRY_ENV);
+  return prop->set_property (ior
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_IOR_Manipulation_impl::set_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr ior2
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -305,15 +305,15 @@ TAO_IOR_Manipulation_impl::set_primary (
 
   // Call the callback object to do the rest of the processing.
   return prop->set_primary (ior1,
-                            ior2,
-                            ACE_TRY_ENV);
+                            ior2
+                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::get_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -328,28 +328,28 @@ TAO_IOR_Manipulation_impl::get_primary (
   // run-time (if it does not crash).  Any idea about what is going on
   // here?
 
-  return prop->get_primary (ior,
-                            ACE_TRY_ENV);
+  return prop->get_primary (ior
+                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_IOR_Manipulation_impl::is_primary_set (
       TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return prop->is_primary_set (ior, ACE_TRY_ENV);
+  return prop->is_primary_set (ior TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
 TAO_IOR_Manipulation_impl::is_in_ior (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Object_ptr ior2
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -380,8 +380,8 @@ TAO_IOR_Manipulation_impl::is_in_ior (
 
 CORBA::ULong
 TAO_IOR_Manipulation_impl::get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Object_ptr ior
+    TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index c110a30d295..f446acfdb12 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -62,8 +62,8 @@ public:
   // Decrement the reference count.
 
   virtual CORBA::Object_ptr merge_iors (
-    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
+    const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -73,8 +73,8 @@ public:
 
   virtual CORBA::Object_ptr add_profiles (
       CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
+      CORBA::Object_ptr ior2
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -84,8 +84,8 @@ public:
 
   virtual CORBA::Object_ptr remove_profiles (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
+    CORBA::Object_ptr ior2
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -95,10 +95,9 @@ public:
 
   virtual CORBA::Boolean set_property (
       TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::Invalid_IOR,
@@ -108,10 +107,9 @@ public:
   virtual CORBA::Boolean set_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior1,
-      CORBA::Object_ptr ior2,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr ior2
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::Invalid_IOR,
@@ -121,10 +119,9 @@ public:
 
   virtual CORBA::Object_ptr get_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       TAO_IOP::NotFound
@@ -132,26 +129,25 @@ public:
 
   virtual CORBA::Boolean is_primary_set (
       TAO_IOP::TAO_IOR_Property_ptr prop,
-      CORBA::Object_ptr ior,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Object_ptr ior
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual CORBA::ULong is_in_ior (
     CORBA::Object_ptr ior1,
-    CORBA::Object_ptr ior2,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
+    CORBA::Object_ptr ior2
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
       ));
 
   virtual CORBA::ULong get_profile_count (
-    CORBA::Object_ptr ior,
-    CORBA::Environment &ACE_TRY_ENV = CORBA::default_environment ())
+    CORBA::Object_ptr ior
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index ee1f01ea354..1569daf4738 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -80,16 +80,16 @@ void IORTable::AlreadyBound::_raise ()
 }
 
 void IORTable::AlreadyBound::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void IORTable::AlreadyBound::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -154,16 +154,16 @@ void IORTable::NotFound::_raise ()
 }
 
 void IORTable::NotFound::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void IORTable::NotFound::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -227,7 +227,7 @@ IORTable::Table_var::operator const ::IORTable::Table_ptr &() const // cast
   return this->ptr_;
 }
 
-IORTable::Table_var::operator ::IORTable::Table_ptr &() // cast 
+IORTable::Table_var::operator ::IORTable::Table_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -287,11 +287,11 @@ IORTable::Table_var::tao_nil (void)
 
 ::IORTable::Table_ptr
 IORTable::Table_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IORTable::Table::_narrow (p, ACE_TRY_ENV);
+  return ::IORTable::Table::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -372,16 +372,16 @@ IORTable::Table::~Table (void)
 {}
 
 IORTable::Table_ptr IORTable::Table::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Table::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Table::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IORTable::Table_ptr IORTable::Table::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -419,7 +419,7 @@ void *IORTable::Table::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -480,7 +480,7 @@ IORTable::Locator_var::operator const ::IORTable::Locator_ptr &() const // cast
   return this->ptr_;
 }
 
-IORTable::Locator_var::operator ::IORTable::Locator_ptr &() // cast 
+IORTable::Locator_var::operator ::IORTable::Locator_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -540,11 +540,11 @@ IORTable::Locator_var::tao_nil (void)
 
 ::IORTable::Locator_ptr
 IORTable::Locator_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::IORTable::Locator::_narrow (p, ACE_TRY_ENV);
+  return ::IORTable::Locator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -625,16 +625,16 @@ IORTable::Locator::~Locator (void)
 {}
 
 IORTable::Locator_ptr IORTable::Locator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Locator::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Locator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 IORTable::Locator_ptr IORTable::Locator::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -672,7 +672,7 @@ void *IORTable::Locator::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index cec61dcbbcd..71ba8c9b18a 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -57,7 +57,7 @@
 TAO_NAMESPACE  IORTable
 {
   class Locator;
-  
+
 #if !defined (_IORTABLE_LOCATOR___PTR_CH_)
 #define _IORTABLE_LOCATOR___PTR_CH_
 
@@ -73,31 +73,31 @@ TAO_NAMESPACE  IORTable
   {
   public:
     Locator_var (void); // default constructor
-    Locator_var (Locator_ptr p) : ptr_ (p) {} 
+    Locator_var (Locator_ptr p) : ptr_ (p) {}
     Locator_var (const Locator_var &); // copy constructor
     ~Locator_var (void); // destructor
-    
+
     Locator_var &operator= (Locator_ptr);
     Locator_var &operator= (const Locator_var &);
     Locator_ptr operator-> (void) const;
-    
+
     operator const Locator_ptr &() const;
     operator Locator_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Locator_ptr in (void) const;
     Locator_ptr &inout (void);
     Locator_ptr &out (void);
     Locator_ptr _retn (void);
     Locator_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Locator_ptr tao_duplicate (Locator_ptr);
     static void tao_release (Locator_ptr);
     static Locator_ptr tao_nil (void);
-    static Locator_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static Locator_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Locator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -124,7 +124,7 @@ TAO_NAMESPACE  IORTable
     operator Locator_ptr &();
     Locator_ptr &ptr (void);
     Locator_ptr operator-> (void);
-  
+
   private:
     Locator_ptr &ptr_;
   };
@@ -142,29 +142,29 @@ TAO_NAMESPACE  IORTable
 
     AlreadyBound (void);
     // Default constructor.
-    
+
     AlreadyBound (const AlreadyBound &);
     // Copy constructor.
-    
+
     ~AlreadyBound (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     AlreadyBound &operator= (const AlreadyBound &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static AlreadyBound *_downcast (CORBA::Exception *);
 
 
@@ -185,29 +185,29 @@ TAO_NAMESPACE  IORTable
 
     NotFound (void);
     // Default constructor.
-    
+
     NotFound (const NotFound &);
     // Copy constructor.
-    
+
     ~NotFound (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     NotFound &operator= (const NotFound &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static NotFound *_downcast (CORBA::Exception *);
 
 
@@ -224,7 +224,7 @@ TAO_NAMESPACE  IORTable
 
   class Table;
   typedef Table *Table_ptr;
-  
+
 #endif /* end #if !defined */
 
 
@@ -235,31 +235,31 @@ TAO_NAMESPACE  IORTable
   {
   public:
     Table_var (void); // default constructor
-    Table_var (Table_ptr p) : ptr_ (p) {} 
+    Table_var (Table_ptr p) : ptr_ (p) {}
     Table_var (const Table_var &); // copy constructor
     ~Table_var (void); // destructor
-    
+
     Table_var &operator= (Table_ptr);
     Table_var &operator= (const Table_var &);
     Table_ptr operator-> (void) const;
-    
+
     operator const Table_ptr &() const;
     operator Table_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Table_ptr in (void) const;
     Table_ptr &inout (void);
     Table_ptr &out (void);
     Table_ptr _retn (void);
     Table_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Table_ptr tao_duplicate (Table_ptr);
     static void tao_release (Table_ptr);
     static Table_ptr tao_nil (void);
-    static Table_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static Table_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Table_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -286,7 +286,7 @@ TAO_NAMESPACE  IORTable
     operator Table_ptr &();
     Table_ptr &ptr (void);
     Table_ptr operator-> (void);
-  
+
   private:
     Table_ptr &ptr_;
   };
@@ -311,15 +311,13 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
     // the static operations
     static Table_ptr _duplicate (Table_ptr obj);
     static Table_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Table_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Table_ptr _nil (void)
       {
         return (Table_ptr)0;
@@ -327,10 +325,9 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
 
     virtual void bind (
         const char * object_key,
-        const char * IOR,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * IOR
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IORTable::AlreadyBound
@@ -338,40 +335,37 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
 
     virtual void rebind (
         const char * object_key,
-        const char * IOR,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * IOR
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void unbind (
-        const char * object_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * object_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IORTable::NotFound
       )) = 0;
 
     virtual void set_locator (
-        IORTable::Locator_ptr the_locator,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        IORTable::Locator_ptr the_locator
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Table ();
-    
+
     virtual ~Table (void);
   private:
     Table (const Table &);
@@ -398,37 +392,34 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object
     // the static operations
     static Locator_ptr _duplicate (Locator_ptr obj);
     static Locator_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Locator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Locator_ptr _nil (void)
       {
         return (Locator_ptr)0;
       }
 
     virtual char * locate (
-        const char * object_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * object_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IORTable::NotFound
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Locator ();
-    
+
     virtual ~Locator (void);
   private:
     Locator (const Locator &);
diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i
index cc5fe59fc25..061931da125 100644
--- a/TAO/tao/IORTable/IORTableC.i
+++ b/TAO/tao/IORTable/IORTableC.i
@@ -57,11 +57,11 @@ tao_IORTable_Table_nil (
 
 ACE_INLINE IORTable::Table_ptr
 tao_IORTable_Table_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IORTable::Table::_narrow (p, ACE_TRY_ENV);
+  return IORTable::Table::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -107,11 +107,11 @@ tao_IORTable_Locator_nil (
 
 ACE_INLINE IORTable::Locator_ptr
 tao_IORTable_Locator_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return IORTable::Locator::_narrow (p, ACE_TRY_ENV);
+  return IORTable::Locator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index 0e4deb7e620..ef8768a0139 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -15,15 +15,15 @@ TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
 }
 
 char *
-TAO_IOR_Table_Impl::find (const char *object_key,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_IOR_Table_Impl::find (const char *object_key
+                          TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IORTable::NotFound
       ))
 {
   // We don't want the lock held during locate, so make it go out
-  // of scope before then. 
+  // of scope before then.
   {
     ACE_CString key (object_key);
     ACE_CString ior;
@@ -37,14 +37,14 @@ TAO_IOR_Table_Impl::find (const char *object_key,
       ACE_THROW_RETURN (IORTable::NotFound (), 0);
   }
 
-  return this->locator_->locate (object_key, ACE_TRY_ENV);
+  return this->locator_->locate (object_key TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_IOR_Table_Impl::bind (
         const char * object_key,
-        const char * IOR,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * IOR
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -59,8 +59,8 @@ TAO_IOR_Table_Impl::bind (
 void
 TAO_IOR_Table_Impl::rebind (
         const char * object_key,
-        const char * IOR,
-        CORBA::Environment &
+        const char * IOR
+        TAO_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -72,8 +72,8 @@ TAO_IOR_Table_Impl::rebind (
 
 void
 TAO_IOR_Table_Impl::unbind (
-        const char * object_key,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * object_key
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -87,8 +87,8 @@ TAO_IOR_Table_Impl::unbind (
 
 void
 TAO_IOR_Table_Impl::set_locator (
-        IORTable::Locator_ptr locator,
-        CORBA::Environment &
+        IORTable::Locator_ptr locator
+        TAO_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index ded61994aa4..cd2dabbde71 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -39,8 +39,8 @@ public:
 
   /// Find the object, using the locator if it is not on the table.
   char *find (
-      const char *object_key,
-      CORBA::Environment &ACE_TRY_ENV
+      const char *object_key
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -51,10 +51,9 @@ public:
   // details.
     virtual void bind (
         const char * object_key,
-        const char * IOR,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const char * IOR
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IORTable::AlreadyBound
@@ -62,29 +61,26 @@ public:
 
     virtual void rebind (
         const char * object_key,
-        const char * IOR,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const char * IOR
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual void unbind (
-        const char * object_key,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const char * object_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IORTable::NotFound
       ));
 
     virtual void set_locator (
-        IORTable::Locator_ptr the_locator,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        IORTable::Locator_ptr the_locator
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index d728036090b..c3399cc3e0b 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -26,7 +26,7 @@ TAO_Table_Adapter::~TAO_Table_Adapter (void)
 }
 
 void
-TAO_Table_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
+TAO_Table_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->root_,
                     TAO_IOR_Table_Impl (),
@@ -35,14 +35,14 @@ TAO_Table_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Table_Adapter::close (int , CORBA::Environment &)
+TAO_Table_Adapter::close (int  TAO_ENV_ARG_DECL_NOT_USED)
 {
   CORBA::release (this->root_);
   this->root_ = 0;
 }
 
 void
-TAO_Table_Adapter::check_close (int , CORBA::Environment &)
+TAO_Table_Adapter::check_close (int  TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -55,8 +55,8 @@ TAO_Table_Adapter::priority (void) const
 int
 TAO_Table_Adapter::dispatch (TAO_ObjectKey &key,
                              TAO_ServerRequest &,
-                             CORBA::Object_out forward_to,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Object_out forward_to
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_key;
@@ -65,12 +65,12 @@ TAO_Table_Adapter::dispatch (TAO_ObjectKey &key,
   ACE_TRY
     {
       CORBA::String_var ior =
-        this->root_->find (object_key.in (), ACE_TRY_ENV);
+        this->root_->find (object_key.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       forward_to =
-        this->orb_core_->orb ()->string_to_object (ior.in (),
-                                                   ACE_TRY_ENV);
+        this->orb_core_->orb ()->string_to_object (ior.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (IORTable::NotFound, nf_ex)
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index df639820818..7c50ffdc202 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -37,16 +37,16 @@ public:
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (CORBA::Environment &ACE_TRY_ENV);
-  virtual void close (int wait_for_completion,
-                      CORBA::Environment &ACE_TRY_ENV);
-  virtual void check_close (int wait_for_completion,
-                            CORBA::Environment &ACE_TRY_ENV);
+  virtual void open (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void close (int wait_for_completion
+                      TAO_ENV_ARG_DECL);
+  virtual void check_close (int wait_for_completion
+                            TAO_ENV_ARG_DECL);
   virtual int priority (void) const;
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
-                        CORBA::Object_out foward_to,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Object_out foward_to
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual const char *name (void) const;
   virtual CORBA::Object_ptr root (void);
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index a9951aa210a..14d8d99ee2a 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -49,8 +49,8 @@ public:
    * INV_OBJREF, etc.)
    */
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb,
-                                          CORBA::Environment &)
+                                          CORBA::ORB_ptr orb
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp
index b69b6b5ed11..dc19a516650 100644
--- a/TAO/tao/Interceptor_List.cpp
+++ b/TAO/tao/Interceptor_List.cpp
@@ -24,8 +24,8 @@ TAO_Interceptor_List::~TAO_Interceptor_List (void)
 
 size_t
 TAO_Interceptor_List::add_interceptor_i (
-    PortableInterceptor::Interceptor_ptr interceptor,
-    CORBA::Environment &ACE_TRY_ENV)
+    PortableInterceptor::Interceptor_ptr interceptor
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
@@ -71,7 +71,7 @@ TAO_Interceptor_List::add_interceptor_i (
       /// Increase the length of the Interceptor sequence by one.
       size_t new_len = old_len + 1;
       this->length (new_len);
-	  return old_len;
+          return old_len;
     }
   else
     ACE_THROW_RETURN (CORBA::INV_OBJREF (
@@ -121,11 +121,11 @@ TAO_ClientRequestInterceptor_List::interceptor (size_t index)
 
 void
 TAO_ClientRequestInterceptor_List::add_interceptor (
-  PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+  TAO_ENV_ARG_DECL)
 {
-  size_t index = this->add_interceptor_i (interceptor,
-                                          ACE_TRY_ENV);
+  size_t index = this->add_interceptor_i (interceptor
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->interceptors_[index] =
@@ -167,11 +167,11 @@ TAO_ServerRequestInterceptor_List::interceptor (size_t index)
 
 void
 TAO_ServerRequestInterceptor_List::add_interceptor (
-  PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+  TAO_ENV_ARG_DECL)
 {
-  size_t index = this->add_interceptor_i (interceptor,
-                                          ACE_TRY_ENV);
+  size_t index = this->add_interceptor_i (interceptor
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->interceptors_[index] =
@@ -215,11 +215,11 @@ TAO_IORInterceptor_List::interceptor (size_t index)
 
 void
 TAO_IORInterceptor_List::add_interceptor (
-  PortableInterceptor::IORInterceptor_ptr interceptor,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::IORInterceptor_ptr interceptor
+  TAO_ENV_ARG_DECL)
 {
-  size_t index = this->add_interceptor_i (interceptor,
-                                          ACE_TRY_ENV);
+  size_t index = this->add_interceptor_i (interceptor
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->interceptors_[index] =
diff --git a/TAO/tao/Interceptor_List.h b/TAO/tao/Interceptor_List.h
index 131fcc78a75..4c0df6e96fe 100644
--- a/TAO/tao/Interceptor_List.h
+++ b/TAO/tao/Interceptor_List.h
@@ -47,8 +47,8 @@ protected:
 
   /// Register an in interceptor with interceptor list.
   size_t add_interceptor_i (
-      PortableInterceptor::Interceptor_ptr interceptor,
-      CORBA::Environment &ACE_TRY_ENV)
+      PortableInterceptor::Interceptor_ptr interceptor
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -88,8 +88,8 @@ public:
   ~TAO_ClientRequestInterceptor_List (void);
 
   /// Register a client request interceptor.
-  void add_interceptor (PortableInterceptor::ClientRequestInterceptor_ptr i,
-                        CORBA::Environment &ACE_TRY_ENV);
+  void add_interceptor (PortableInterceptor::ClientRequestInterceptor_ptr i
+                        TAO_ENV_ARG_DECL);
 
   /// Return reference to the underlying Portable Interceptor array.
   TYPE &interceptors (void);
@@ -136,8 +136,8 @@ public:
   ~TAO_ServerRequestInterceptor_List (void);
 
   /// Register a server request interceptor.
-  void add_interceptor (PortableInterceptor::ServerRequestInterceptor_ptr i,
-                        CORBA::Environment &ACE_TRY_ENV);
+  void add_interceptor (PortableInterceptor::ServerRequestInterceptor_ptr i
+                        TAO_ENV_ARG_DECL);
 
   /// Return reference to the underlying Portable Interceptor array.
   TYPE &interceptors (void);
@@ -185,8 +185,8 @@ public:
   ~TAO_IORInterceptor_List (void);
 
   /// Register an IOR interceptor.
-  void add_interceptor (PortableInterceptor::IORInterceptor_ptr i,
-                        CORBA::Environment &ACE_TRY_ENV);
+  void add_interceptor (PortableInterceptor::IORInterceptor_ptr i
+                        TAO_ENV_ARG_DECL);
 
   /// Return reference to the underlying Portable Interceptor array.
   TYPE &interceptors (void);
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index ff6768b453a..e314047a3a1 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -146,7 +146,7 @@ TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
 // restarted (e.g. request forwarding).  This is the start/restart entry.
 
 void
-TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
@@ -186,8 +186,8 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
     {
       this->endpoint_selector_ =
         this->orb_core_->endpoint_selector_factory ()->get_selector (
-          this,
-          ACE_TRY_ENV);
+          this
+           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -206,8 +206,8 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
   ACE_Countdown_Time countdown (this->max_wait_time_);
   this->countdown_ = &countdown;
 
-  this->endpoint_selector_->select_endpoint (this,
-                                             ACE_TRY_ENV);
+  this->endpoint_selector_->select_endpoint (this
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Set the unique request ID associated with this request.
@@ -218,8 +218,8 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
+                                   TAO_ENV_ARG_DECL)
 {
   // Get the transport object.
   if (this->transport_ != 0)
@@ -249,8 +249,8 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc,
 
   // Obtain a connection.
   int result = conn_reg->connect (this,
-                                  &desc,
-                                  ACE_TRY_ENV);
+                                  &desc
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (result == 0)
@@ -295,8 +295,8 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc,
 }
 
 void
-TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags,
-                                     CORBA_Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Then fill in the rest of the RequestHeader
@@ -306,8 +306,8 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags,
   // add to the service context lists
   this->orb_core_->service_context_list (this->stub_,
                                          this->request_service_context (),
-                                         this->restart_flag_,
-                                         ACE_TRY_ENV);
+                                         this->restart_flag_
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The target specification mode
@@ -334,8 +334,8 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags,
 
       IOP::IOR *ior_info = 0;
       int retval = this->stub_->create_ior_info (ior_info,
-                                                 index,
-                                                 ACE_TRY_ENV);
+                                                 index
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (retval == -1)
@@ -368,8 +368,8 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags,
 
 // Send request.
 int
-TAO_GIOP_Invocation::invoke (CORBA::Boolean is_synchronous,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::invoke (CORBA::Boolean is_synchronous
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Countdown_Time countdown (this->max_wait_time_);
@@ -463,8 +463,8 @@ TAO_GIOP_Invocation::close_connection (void)
 // Handle the GIOP Reply with status = LOCATION_FORWARD
 // Replace the IIOP Profile.
 int
-TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // It can be assumed that the GIOP header and the reply header
@@ -482,15 +482,15 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
   // in order to obtain the profiles.
   TAO_Stub *stubobj = this->forward_reference_->_stubobj ();
 
-  this->location_forward_i (stubobj, ACE_TRY_ENV);
+  this->location_forward_i (stubobj TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   return TAO_INVOKE_RESTART;
 }
 
 int
-TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (forward))
@@ -502,15 +502,15 @@ TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward,
   // in order to obtain the profiles.
   TAO_Stub *stubobj = forward->_stubobj ();
 
-  this->location_forward_i (stubobj, ACE_TRY_ENV);
+  this->location_forward_i (stubobj TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   return TAO_INVOKE_RESTART;
 }
 
 void
-TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj,
-                                         CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj
+                                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the profiles in the given stub object to the list of forward
@@ -523,16 +523,16 @@ TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj,
     {
       this->endpoint_selector_ =
         this->orb_core_->endpoint_selector_factory ()->get_selector (
-          this,
-          ACE_TRY_ENV);
+          this
+           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // Modify the state as appropriate to include new forwarding
   // profiles.
   this->endpoint_selector_->forward (this,
-                                     stubobj->base_profiles (),
-                                     ACE_TRY_ENV);
+                                     stubobj->base_profiles ()
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->received_location_forward_ = 1;
@@ -557,8 +557,8 @@ TAO_GIOP_Synch_Invocation::~TAO_GIOP_Synch_Invocation (void)
 }
 
 int
-TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register a reply dispatcher for this invocation. Use the
@@ -585,7 +585,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request,
     }
 
   // Just send the request, without trying to wait for the reply.
-  int retval = TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
+  int retval = TAO_GIOP_Invocation::invoke (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   if (retval != TAO_INVOKE_OK)
@@ -673,8 +673,8 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request,
       // raise an exception or are we going to base our decision on the
       // loaded services.
       return this->orb_core_->service_raise_comm_failure (this,
-                                                          this->profile_,
-                                                          ACE_TRY_ENV);
+                                                          this->profile_
+                                                           TAO_ENV_ARG_PARAMETER);
     }
 
   // @@ Alex: the old version of this had some error handling code,
@@ -734,8 +734,8 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request,
           }
 
         CORBA::SystemException* ex =
-          TAO_Exceptions::create_system_exception (type_id.in (),
-                                                   ACE_TRY_ENV);
+          TAO_Exceptions::create_system_exception (type_id.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_OK);
 
         if (ex == 0)
@@ -751,11 +751,9 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request,
         ex->minor (minor);
         ex->completed (CORBA::CompletionStatus (completion));
 
+        // Raise the exception.
+        TAO_ENV_RAISE (ex);
 
-        // @@ There should be a better way to raise this exception!
-        //    This code works for both native and emulated exceptions,
-        //    but it is ugly.
-        ACE_TRY_ENV.exception (ex); // We can not use ACE_THROW here.
         return TAO_INVOKE_OK;
       }
       // NOTREACHED.
@@ -763,8 +761,8 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request,
     case TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD:
       // Handle the forwarding and return so the stub restarts the
       // request!
-      return this->location_forward (this->inp_stream (),
-                                     ACE_TRY_ENV);
+      return this->location_forward (this->inp_stream ()
+                                      TAO_ENV_ARG_PARAMETER);
     case TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE:
       {
         // We have received an exception with a request to change the
@@ -796,10 +794,10 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request,
 // ****************************************************************
 
 void
-TAO_GIOP_Twoway_Invocation::start (CORBA_Environment &ACE_TRY_ENV)
+TAO_GIOP_Twoway_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_GIOP_Invocation::start (ACE_TRY_ENV);
+  TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rd_.state_changed (TAO_LF_Event::LFS_ACTIVE);
@@ -825,13 +823,13 @@ TAO_GIOP_Twoway_Invocation::reset_states (void)
 
 int
 TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
-                                    CORBA::ULong except_count,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::ULong except_count
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START);
 
-  int retval = this->invoke_i (0, ACE_TRY_ENV);
+  int retval = this->invoke_i (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
@@ -872,8 +870,8 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
                                 TAO_INVOKE_EXCEPTION);
             }
 
-          exception->_tao_decode (this->inp_stream (),
-                                  ACE_TRY_ENV);
+          exception->_tao_decode (this->inp_stream ()
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
           if (TAO_debug_level > 5)
@@ -885,7 +883,12 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
 
           // @@ Think about a better way to raise the exception here,
           //    maybe we need some more macros?
+#if defined (TAO_HAS_EXCEPTIONS)
+          // Direct throw because we don't have the ACE_TRY_ENV.
+          exception->_raise ();
+#else
           ACE_TRY_ENV.exception (exception); // We can not use ACE_THROW here.
+#endif
           return TAO_INVOKE_EXCEPTION;
         }
 
@@ -928,30 +931,30 @@ TAO_GIOP_Oneway_Invocation::TAO_GIOP_Oneway_Invocation (
 }
 
 void
-TAO_GIOP_Oneway_Invocation::start (CORBA_Environment &ACE_TRY_ENV)
+TAO_GIOP_Oneway_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_GIOP_Invocation::start (ACE_TRY_ENV);
+  TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 int
-TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Oneway_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->sync_scope_ == TAO::SYNC_NONE
       || this->sync_scope_ == TAO::SYNC_EAGER_BUFFERING
       || this->sync_scope_ == TAO::SYNC_DELAYED_BUFFERING)
     {
-      return TAO_GIOP_Invocation::invoke (0, ACE_TRY_ENV);
+      return TAO_GIOP_Invocation::invoke (0 TAO_ENV_ARG_PARAMETER);
     }
   if (this->sync_scope_ == TAO::SYNC_WITH_TRANSPORT)
     {
-      return TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
+      return TAO_GIOP_Invocation::invoke (1 TAO_ENV_ARG_PARAMETER);
     }
 
-  int retval = this->invoke_i (0, ACE_TRY_ENV);
+  int retval = this->invoke_i (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
@@ -984,10 +987,10 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
 // ****************************************************************
 
 void
-TAO_GIOP_Locate_Request_Invocation::start (CORBA_Environment &ACE_TRY_ENV)
+TAO_GIOP_Locate_Request_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_GIOP_Invocation::start (ACE_TRY_ENV);
+  TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->transport_->generate_locate_request (this->target_spec_,
@@ -998,7 +1001,7 @@ TAO_GIOP_Locate_Request_Invocation::start (CORBA_Environment &ACE_TRY_ENV)
 
 // Send request, block until any reply comes back.
 int
-TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
+TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->transport_ == 0)
@@ -1007,7 +1010,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
                         TAO_INVOKE_EXCEPTION);
     }
 
-  CORBA::ULong locate_status = this->invoke_i (1, ACE_TRY_ENV);
+  CORBA::ULong locate_status = this->invoke_i (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   switch (locate_status)
@@ -1020,8 +1023,8 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
                         TAO_INVOKE_EXCEPTION);
       // NOTREACHED.
     case TAO_GIOP_OBJECT_FORWARD:
-      return this->location_forward (this->inp_stream (),
-                                     ACE_TRY_ENV);
+      return this->location_forward (this->inp_stream ()
+                                      TAO_ENV_ARG_PARAMETER);
     case TAO_GIOP_LOC_SYSTEM_EXCEPTION:
       {
         // Pull the exception from the stream.
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index b4605a7979b..feb311a46aa 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -99,8 +99,8 @@ public:
    * established *OR* all profiles have been tried.  In that case it
    * raises the CORBA::TRANSIENT exception.
    */
-  void prepare_header (CORBA::Octet response_flags,
-                       CORBA_Environment &ACE_TRY_ENV)
+  void prepare_header (CORBA::Octet response_flags
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor to the request ServiceContextList.  Only valid when
@@ -130,16 +130,16 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (CORBA_Environment &ACE_TRY_ENV)
+  void start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Called by the invocation endpoint selector for each selected
   /// endpoint.
-  int perform_call (TAO_Transport_Descriptor_Interface &desc,
-                    CORBA::Environment &ACE_TRY_ENV);
+  int perform_call (TAO_Transport_Descriptor_Interface &desc
+                    TAO_ENV_ARG_DECL);
 
   /// Dynamically allocate \param inconsistent_policies_ PolicyList.
-  void init_inconsistent_policies (CORBA_Environment &ACE_TRY_ENV)
+  void init_inconsistent_policies (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return PolicyList stored in \param inconsistent_policies_ and
@@ -156,8 +156,8 @@ public:
    * forward_reference() method in this class.
    * It returns TAO_INVOKE_RESTART unless an exception is raised.
    */
-  int location_forward (CORBA::Object_ptr forward,
-                        CORBA::Environment &ACE_TRY_ENV)
+  int location_forward (CORBA::Object_ptr forward
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the object reference returned in the LOCATION_FORWARD
@@ -217,8 +217,8 @@ protected:
    * that the server closed the connection simply to release
    * resources.
    */
-  int invoke (CORBA::Boolean is_synchronous,
-              CORBA_Environment &ACE_TRY_ENV)
+  int invoke (CORBA::Boolean is_synchronous
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -229,8 +229,8 @@ protected:
    * by invoking the forward_reference() method in this class.
    * It returns TAO_INVOKE_RESTART unless an exception is raised.
    */
-  int location_forward (TAO_InputCDR &inp_stream,
-                        CORBA::Environment &ACE_TRY_ENV)
+  int location_forward (TAO_InputCDR &inp_stream
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -241,8 +241,8 @@ protected:
    * The forward object reference can be retrieved by invoking the
    * forward_reference() method in this class.
    */
-  void location_forward_i (TAO_Stub *stubobj,
-                           CORBA::Environment &ACE_TRY_ENV)
+  void location_forward_i (TAO_Stub *stubobj
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -366,8 +366,8 @@ protected:
 
   /// Implementation of the invoke() methods, handles the basic
   /// send/reply code and the system exceptions.
-  int invoke_i (CORBA::Boolean is_locate_request,
-                CORBA::Environment &ACE_TRY_ENV)
+  int invoke_i (CORBA::Boolean is_locate_request
+                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reply dispatcher for the current synchronous invocation.
@@ -404,7 +404,7 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (CORBA_Environment &ACE_TRY_ENV)
+  void start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -414,8 +414,8 @@ public:
    * footprint of the generated stubs.
    */
   int invoke (TAO_Exception_Data *excepts,
-              CORBA::ULong except_count,
-              CORBA_Environment &ACE_TRY_ENV)
+              CORBA::ULong except_count
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::Exception));
 
   /**
@@ -452,11 +452,11 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (CORBA_Environment &ACE_TRY_ENV)
+  void start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Send request, without blocking for any response.
-  int invoke (CORBA_Environment &ACE_TRY_ENV)
+  int invoke (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor for private member.
@@ -488,11 +488,11 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (CORBA_Environment &ACE_TRY_ENV)
+  void start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Send request, without blocking for any response.
-  int invoke (CORBA_Environment &ACE_TRY_ENV)
+  int invoke (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index 10deba29a5f..c3c1e0a5913 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -29,8 +29,8 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
 
 void
 TAO_Default_Endpoint_Selector::select_endpoint (
-  TAO_GIOP_Invocation *invocation,
-  CORBA::Environment &ACE_TRY_ENV)
+  TAO_GIOP_Invocation *invocation
+  TAO_ENV_ARG_DECL)
 {
   do
     {
@@ -38,8 +38,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (
       invocation->endpoint (invocation->profile ()->endpoint ());
 
       int status =
-        this->endpoint_from_profile (invocation,
-                                     ACE_TRY_ENV);
+        this->endpoint_from_profile (invocation TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == 1)
@@ -55,8 +54,8 @@ TAO_Default_Endpoint_Selector::select_endpoint (
 
 // @@ RTCORBA_Subsetting - next should be deprecated...
 void
-TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation *,
-                                     CORBA::Environment &)
+TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation *
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n")));
   // if (invocation->stub_->next_profile_retry () == 0)
@@ -67,8 +66,8 @@ TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation *,
 void
 TAO_Default_Endpoint_Selector::forward (TAO_GIOP_Invocation
                                         *invocation,
-                                        const TAO_MProfile &mprofile,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const TAO_MProfile &mprofile
+                                        TAO_ENV_ARG_DECL)
 {
   invocation->stub ()->add_forward_profiles (mprofile);
   // This has to be and is thread safe.
@@ -104,8 +103,8 @@ TAO_Default_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invocation
 
 int
 TAO_Default_Endpoint_Selector::endpoint_from_profile (
-    TAO_GIOP_Invocation *invocation,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_GIOP_Invocation *invocation
+    TAO_ENV_ARG_DECL)
 {
   size_t endpoint_count =
     invocation->profile ()->endpoint_count();
@@ -118,7 +117,7 @@ TAO_Default_Endpoint_Selector::endpoint_from_profile (
           TAO_Base_Transport_Property desc (invocation->endpoint ());
 
           int status =
-            invocation->perform_call (desc, ACE_TRY_ENV);
+            invocation->perform_call (desc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           // Check if the invocation has completed.
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index 264a192c05a..cd655d1d64c 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -53,9 +53,8 @@ public:
 
   /// Select the endpoint and set <invocation>'s <profile_> and
   /// <endpoint_> data members accordingly.
-  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()) = 0;
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /**
    * This method must be called when previously selected endpoint
@@ -63,9 +62,8 @@ public:
    * This method performs the necessary state updates, so that next
    * <select_endpoint> call picks a new endpoint.
    */
-    virtual void next (TAO_GIOP_Invocation *invocation,
-                   CORBA::Environment &ACE_TRY_ENV =
-                    TAO_default_environment ()) = 0;
+    virtual void next (TAO_GIOP_Invocation *invocation
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /**
    * This method must be called if the invocation attempt on a
@@ -74,9 +72,8 @@ public:
    * call picks a new endpoint.
    */
   virtual void forward (TAO_GIOP_Invocation *invocation,
-                        const TAO_MProfile &mprofile,
-                        CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ()) = 0;
+                        const TAO_MProfile &mprofile
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Update the state to indicate that the selected endpoint/profile
   /// were used successfully.
@@ -110,24 +107,21 @@ public:
   /// Destructor.
   virtual ~TAO_Default_Endpoint_Selector (void);
 
-  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
-  virtual void next (TAO_GIOP_Invocation *invocation,
-                     CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual void next (TAO_GIOP_Invocation *invocation
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void forward (TAO_GIOP_Invocation *invocation,
-                        const TAO_MProfile &mprofile,
-                        CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                        const TAO_MProfile &mprofile
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void success (TAO_GIOP_Invocation *invocation);
   virtual void close_connection (TAO_GIOP_Invocation *invocation);
 
 protected:
   /// This method selects an endpoint from the profile in the
   /// invocation object.
-  int endpoint_from_profile (TAO_GIOP_Invocation *invocation,
-                             CORBA::Environment &ACE_TRY_ENV);
+  int endpoint_from_profile (TAO_GIOP_Invocation *invocation
+                             TAO_ENV_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index 152ae60c0d7..7ee8c18104d 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -37,14 +37,14 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (TAO_Transport *transport
 {
   // @todo This is not the right way to do this....
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_ORB_Core *orb_core = transport->orb_core ();
 
       while (!transport->queue_is_empty ())
         {
-          int result = orb_core->run (0, 1, ACE_TRY_ENV);
+          int result = orb_core->run (0, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result == -1)
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 2070ba6e8d1..65e3f6abf53 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -36,8 +36,8 @@ CORBA_LocalObject::_remove_ref (void)
 // create hash tables.
 
 CORBA::ULong
-CORBA_LocalObject::_hash (CORBA::ULong maximum,
-                          CORBA_Environment & /* ACE_TRY_ENV */)
+CORBA_LocalObject::_hash (CORBA::ULong maximum
+                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Note that we reinterpret_cast to an "unsigned long" instead of
   // CORBA::ULong since we need to first cast to an integer large
@@ -56,8 +56,8 @@ CORBA_LocalObject::_hash (CORBA::ULong maximum,
 // such as strcmp(), to allow more comparison algorithms.
 
 CORBA::Boolean
-CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj,
-                                   CORBA_Environment &)
+CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj
+                                   TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (())
 {
   return (other_obj == this) ? 1 : 0;
@@ -67,7 +67,7 @@ CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj,
 
 
 TAO_ObjectKey *
-CORBA_LocalObject::_key (CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_key (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_ERROR((LM_ERROR,
              ACE_TEXT ("(%P|%t) Cannot get _key froma LocalObject!!!\n")));
@@ -103,7 +103,7 @@ CORBA_LocalObject::_tao_QueryInterface (ptr_arith_t type)
 // the latter case, return FALSE.
 
 CORBA::Boolean
-CORBA_LocalObject::_non_existent (CORBA_Environment &)
+CORBA_LocalObject::_non_existent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Always return false.
   return 0;
@@ -115,8 +115,8 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr,
                                     CORBA::NVList_ptr,
                                     CORBA::NamedValue_ptr,
                                     CORBA::Request_ptr &,
-                                    CORBA::Flags,
-                                    CORBA_Environment &ACE_TRY_ENV)
+                                    CORBA::Flags
+                                    TAO_ENV_ARG_DECL)
 {
   // @@ Correct minor code?  CCM spec says one thing CORBA spec says
   //    another!
@@ -132,8 +132,8 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr,
                                     CORBA::ExceptionList_ptr,
                                     CORBA::ContextList_ptr,
                                     CORBA::Request_ptr &,
-                                    CORBA::Flags,
-                                    CORBA_Environment &ACE_TRY_ENV)
+                                    CORBA::Flags
+                                    TAO_ENV_ARG_DECL)
 {
   // @@ Correct minor code?  CCM spec says one thing CORBA spec says
   //    another!
@@ -142,8 +142,8 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr,
 }
 
 CORBA::Request_ptr
-CORBA_LocalObject::_request (const CORBA::Char *,
-                             CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_request (const CORBA::Char *
+                             TAO_ENV_ARG_DECL)
 {
   // @@ Correct minor code?  CCM spec says one thing CORBA spec says
   //    another!
@@ -153,13 +153,13 @@ CORBA_LocalObject::_request (const CORBA::Char *,
 }
 
 CORBA_InterfaceDef_ptr
-CORBA_LocalObject::_get_interface (CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_get_interface (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::ImplementationDef_ptr
-CORBA_LocalObject::_get_implementation (CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_get_implementation (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
@@ -183,38 +183,38 @@ TAO_Local_RefCounted_Object::_remove_ref (void)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-CORBA_LocalObject::_get_policy (CORBA::PolicyType,
-                                CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_get_policy (CORBA::PolicyType
+                                TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     CORBA::Policy::_nil ());
 }
 
 CORBA::Policy_ptr
-CORBA_LocalObject::_get_client_policy (CORBA::PolicyType,
-                                       CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_get_client_policy (CORBA::PolicyType
+                                       TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
 
 CORBA::Object_ptr
 CORBA_LocalObject::_set_policy_overrides (const CORBA::PolicyList &,
-                                          CORBA::SetOverrideType,
-                                          CORBA_Environment &ACE_TRY_ENV)
+                                          CORBA::SetOverrideType
+                                          TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
 
 CORBA::PolicyList *
-CORBA_LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &,
-                                          CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &
+                                          TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-CORBA_LocalObject::_validate_connection (CORBA::PolicyList_out,
-                                         CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalObject::_validate_connection (CORBA::PolicyList_out
+                                         TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index b3a9175dc60..fe565cd2180 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -54,30 +54,26 @@ public:
    * object.  Or, even easier, add a <is_local> member into
    * CORBA_Object.  I'll take the easier route for now.
    */
-  static CORBA_LocalObject_ptr _narrow (CORBA::Object_ptr obj,
-                                        CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  static CORBA_LocalObject_ptr _narrow (CORBA::Object_ptr obj
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// No-op it is just here to simplify some templates.
   static CORBA_LocalObject_ptr _unchecked_narrow (
-             CORBA::Object_ptr obj,
-             CORBA_Environment &ACE_TRY_ENV =
-               TAO_default_environment ());
+             CORBA::Object_ptr obj
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   /// Always returns false.
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Throws CORBA::NO_IMPLEMENT.
   virtual CORBA::ImplementationDef_ptr
-      _get_implementation (CORBA_Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
+      _get_implementation (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Gets info about object from the Interface Repository.
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Throws NO_IMPLEMENT.
@@ -86,9 +82,8 @@ public:
                                 CORBA::NVList_ptr arg_list,
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+                                CORBA::Flags req_flags
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void _create_request (CORBA::Context_ptr ctx,
                                 const CORBA::Char *operation,
@@ -97,14 +92,12 @@ public:
                                 CORBA::ExceptionList_ptr exclist,
                                 CORBA::ContextList_ptr ctxtlist,
                                 CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+                                CORBA::Flags req_flags
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Throws NO_IMPLEMENT.
-  virtual CORBA::Request_ptr _request (const CORBA::Char *operation,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ());
+  virtual CORBA::Request_ptr _request (const CORBA::Char *operation
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -112,39 +105,34 @@ public:
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Policy_ptr _get_policy (
-      CORBA::PolicyType type,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::PolicyType type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Policy_ptr _get_client_policy (
-      CORBA::PolicyType type,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::PolicyType type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Object_ptr _set_policy_overrides (
       const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::SetOverrideType set_add
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::PolicyList * _get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::PolicyTypeSeq & types
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Boolean _validate_connection (
-      CORBA::PolicyList_out inconsistent_policies,
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::PolicyList_out inconsistent_policies
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -153,9 +141,8 @@ public:
    * address of the object.  On non-32 bit platforms, the hash may be
    * non-unique.
    */
-  virtual CORBA::ULong _hash (CORBA::ULong maximum,
-                              CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  virtual CORBA::ULong _hash (CORBA::ULong maximum
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Try to determine if this object is the same as <other_obj>.  This
@@ -163,9 +150,8 @@ public:
    * private state.  Since that changes easily (when different ORB
    * protocols are in use) there is no default implementation.
    */
-  virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ())
+  virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (());
 
   // = Reference count managment.
@@ -178,7 +164,7 @@ public:
   // = TAO extensions
 
   /// Throws CORBA::NO_IMPLEMENT.
-  virtual TAO_ObjectKey *_key (CORBA_Environment &ACE_TRY_ENV);
+  virtual TAO_ObjectKey *_key (TAO_ENV_SINGLE_ARG_DECL);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   /// Useful for template programming.
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i
index f2b83c3f88b..2630bd0d0a1 100644
--- a/TAO/tao/LocalObject.i
+++ b/TAO/tao/LocalObject.i
@@ -21,8 +21,8 @@ CORBA_LocalObject::_nil (void)
 }
 
 ACE_INLINE CORBA_LocalObject_ptr
-CORBA_LocalObject::_narrow (CORBA_Object_ptr obj,
-                            CORBA_Environment &)
+CORBA_LocalObject::_narrow (CORBA_Object_ptr obj
+                            TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (obj->_is_local () != 0)
     return
@@ -36,8 +36,8 @@ CORBA_LocalObject::_narrow (CORBA_Object_ptr obj,
 }
 
 ACE_INLINE CORBA_LocalObject_ptr
-CORBA_LocalObject::_unchecked_narrow (CORBA_Object_ptr obj,
-                                      CORBA_Environment &)
+CORBA_LocalObject::_unchecked_narrow (CORBA_Object_ptr obj
+                                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (obj->_is_local () != 0)
     return
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 2fadc9a7218..2b162c04dc1 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -35,8 +35,8 @@ TAO_MCAST_Parser::match_prefix (const char *ior_string) const
 
 CORBA::Object_ptr
 TAO_MCAST_Parser::parse_string (const char *ior,
-                                CORBA::ORB_ptr orb,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::ORB_ptr orb
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *mcast_name =
@@ -60,8 +60,8 @@ TAO_MCAST_Parser::parse_string (const char *ior,
                                  this->mcast_ttl_.in (),
                                  this->mcast_nic_.in (),
                                  orb,
-                                 timeout,
-                                 ACE_TRY_ENV);
+                                 timeout
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object;
@@ -74,8 +74,8 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
                                         const char *mcast_ttl,
                                         const char *mcast_nic,
                                         CORBA::ORB_ptr orb,
-                                        ACE_Time_Value *timeout,
-                                        CORBA::Environment& ACE_TRY_ENV)
+                                        ACE_Time_Value *timeout
+                                        TAO_ENV_ARG_DECL)
 {
   char buf[2048];
   char *ior = buf;
@@ -104,8 +104,8 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
     {
       // Convert IOR to an object reference.
       return_value =
-        orb->string_to_object (ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Object::_nil ());
     }
 
@@ -326,9 +326,9 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
 
   if (pos_colon1 == 0)
     {
-	  const char *default_addr = ACE_DEFAULT_MULTICAST_ADDR;
-	  this->mcast_address_ = CORBA::string_alloc (ACE_OS::strlen (default_addr));
-	  this->mcast_address_ = default_addr;
+          const char *default_addr = ACE_DEFAULT_MULTICAST_ADDR;
+          this->mcast_address_ = CORBA::string_alloc (ACE_OS::strlen (default_addr));
+          this->mcast_address_ = default_addr;
 
     }
   else
@@ -408,8 +408,8 @@ TAO_MCAST_Parser::assign_to_variables (const char * &mcast_name)
   if (pos_colon4 == 0)
     {
       // And, the default TTL to be 1
-	  const char *default_ttl = "1";
-	  this->mcast_ttl_ = CORBA::string_alloc (ACE_OS::strlen (default_ttl));
+          const char *default_ttl = "1";
+          this->mcast_ttl_ = CORBA::string_alloc (ACE_OS::strlen (default_ttl));
       this->mcast_ttl_ = default_ttl;
     }
   else
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index fd7b5c94019..10c2aafa339 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -49,8 +49,8 @@ public:
 
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb,
-                                          CORBA::Environment &)
+                                          CORBA::ORB_ptr orb
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -61,8 +61,8 @@ private:
                                          const char *mcast_ttl,
                                          const char *mcast_nic,
                                          CORBA::ORB_ptr orb,
-                                         ACE_Time_Value *timeout,
-                                         CORBA::Environment&);
+                                         ACE_Time_Value *timeout
+                                         TAO_ENV_ARG_DECL_NOT_USED);
 
   int multicast_query (char *&buf,
                        const char *service_name,
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index 56e0c37a43c..bcc25e545fb 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -201,7 +201,7 @@ TAO_MProfile::is_equivalent (const TAO_MProfile *rhs)
 }
 
 CORBA::ULong
-TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &ACE_TRY_ENV)
+TAO_MProfile::hash (CORBA::ULong max TAO_ENV_ARG_DECL)
 {
   CORBA::ULong hashval = 0;
 
@@ -210,7 +210,7 @@ TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &ACE_TRY_ENV)
 
   for (TAO_PHandle h = 0; h < this->last_ ; ++h)
     {
-      hashval += pfiles_[h]->hash (max, ACE_TRY_ENV);
+      hashval += pfiles_[h]->hash (max TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -222,20 +222,20 @@ TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_MProfile::init_policy_list (CORBA::Environment &ACE_TRY_ENV)
+TAO_MProfile::init_policy_list (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The first time this method is called
   // it causes the initialization of the policies
   // for the current profile.
 
-  this->get_current_profile ()->policies (ACE_TRY_ENV);
+  this->get_current_profile ()->policies (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->is_policy_list_initialized_ = 1;
 }
 
 CORBA::PolicyList *
-TAO_MProfile::policy_list (CORBA::Environment &ACE_TRY_ENV)
+TAO_MProfile::policy_list (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!this->is_policy_list_initialized_)
     {
@@ -246,10 +246,10 @@ TAO_MProfile::policy_list (CORBA::Environment &ACE_TRY_ENV)
 
       if (this->policy_list_ == 0)
         {
-          this->create_policy_list (ACE_TRY_ENV);
+          this->create_policy_list (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          this->init_policy_list (ACE_TRY_ENV);
+          this->init_policy_list (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 252ec5e2b8a..771bfd4797f 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -158,14 +158,14 @@ public:
    * profile and the results are averaged together.
    * NON-THREAD SAFE.
    */
-  CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong hash (CORBA::ULong max
+                     TAO_ENV_ARG_DECL);
 
 protected:
 
   /// This method handle the dynamic allocation of the data member
   /// <policy_list_>.
- void create_policy_list (CORBA::Environment &ACE_TRY_ENV);
+ void create_policy_list (TAO_ENV_SINGLE_ARG_DECL);
 
 public:
 
@@ -175,12 +175,12 @@ public:
 
   /// Gets the policies list associated with the profiles
   /// owned by the TAO_MProfile.
-  CORBA::PolicyList *policy_list (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::PolicyList *policy_list (TAO_ENV_SINGLE_ARG_DECL);
 
 protected:
 
   /// Initialize the policy list, demarsharling the policy.
-  void init_policy_list (CORBA::Environment &ACE_TRY_ENV);
+  void init_policy_list (TAO_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Stores the policy list for the profile of this MProfile.
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
index fe120d3e018..03da59524b6 100644
--- a/TAO/tao/Marshal.cpp
+++ b/TAO/tao/Marshal.cpp
@@ -37,10 +37,10 @@ TAO_Marshal_Object::~TAO_Marshal_Object (void)
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
-                                  TAO_InputCDR *stream,
-                                  CORBA_Environment &ACE_TRY_ENV)
+                                  TAO_InputCDR *stream
+                                  TAO_ENV_ARG_DECL)
 {
-  CORBA::ULong kind = tc->kind (ACE_TRY_ENV);
+  CORBA::ULong kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   switch (kind)
@@ -74,68 +74,68 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
     case CORBA::tk_enum:
       {
         TAO_Marshal_Primitive marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
 
     case CORBA::tk_any:
       {
         TAO_Marshal_Any marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_TypeCode:
       {
         TAO_Marshal_TypeCode marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_Principal:
       {
         TAO_Marshal_Principal marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_objref:
       {
         TAO_Marshal_ObjRef marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_struct:
       {
         TAO_Marshal_Struct marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_union:
       {
         TAO_Marshal_Union marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_string:
       {
         TAO_Marshal_String marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_sequence:
       {
         TAO_Marshal_Sequence marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_array:
       {
         TAO_Marshal_Array marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_alias:
       {
         TAO_Marshal_Alias marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_except:
       {
         TAO_Marshal_Except marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_wstring:
       {
         TAO_Marshal_WString marshal;
-        return marshal.skip (tc, stream, ACE_TRY_ENV);
+        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
       }
     }
 }
@@ -143,10 +143,10 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
                                     TAO_InputCDR *src,
-                                    TAO_OutputCDR *dest,
-                                    CORBA_Environment &ACE_TRY_ENV)
+                                    TAO_OutputCDR *dest
+                                    TAO_ENV_ARG_DECL)
 {
-  CORBA::ULong kind = tc->kind (ACE_TRY_ENV);
+  CORBA::ULong kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   switch (kind)
@@ -180,68 +180,68 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
     case CORBA::tk_enum:
       {
         TAO_Marshal_Primitive marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
 
     case CORBA::tk_any:
       {
         TAO_Marshal_Any marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_TypeCode:
       {
         TAO_Marshal_TypeCode marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_Principal:
       {
         TAO_Marshal_Principal marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_objref:
       {
         TAO_Marshal_ObjRef marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_struct:
       {
         TAO_Marshal_Struct marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_union:
       {
         TAO_Marshal_Union marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_string:
       {
         TAO_Marshal_String marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_sequence:
       {
         TAO_Marshal_Sequence marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_array:
       {
         TAO_Marshal_Array marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_alias:
       {
         TAO_Marshal_Alias marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_except:
       {
         TAO_Marshal_Except marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_wstring:
       {
         TAO_Marshal_WString marshal;
-        return marshal.append (tc, src, dest, ACE_TRY_ENV);
+        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
       }
     }
 }
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index 65617f21c57..934b508db3a 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -71,27 +71,27 @@ public:
   /// and invokes skip on it.
   static CORBA::TypeCode::traverse_status
     perform_skip (CORBA::TypeCode_ptr tc,
-                  TAO_InputCDR *context,
-                  CORBA_Environment &ACE_TRY_ENV);
+                  TAO_InputCDR *context
+                  TAO_ENV_ARG_DECL);
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV) = 0;
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL) = 0;
 
   /// append entry point, it allocates the right kind of Marshal_Object
   /// and invokes skip on it.
   static CORBA::TypeCode::traverse_status
     perform_append (CORBA::TypeCode_ptr tc,
                     TAO_InputCDR *src,
-                    TAO_OutputCDR *dest,
-                    CORBA_Environment &ACE_TRY_ENV);
+                    TAO_OutputCDR *dest
+                    TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV) = 0;
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL) = 0;
 };
 
 /**
@@ -108,14 +108,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -133,14 +133,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -158,14 +158,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -183,14 +183,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -208,14 +208,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -233,14 +233,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -258,14 +258,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -283,14 +283,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -308,14 +308,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -333,14 +333,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -358,14 +358,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -383,14 +383,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
@@ -408,14 +408,14 @@ public:
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                                 TAO_InputCDR *context,
-                                                 CORBA_Environment &ACE_TRY_ENV);
+                                                 TAO_InputCDR *context
+                                                 TAO_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
-                                                   TAO_OutputCDR *dest,
-                                                   CORBA_Environment &ACE_TRY_ENV);
+                                                   TAO_OutputCDR *dest
+                                                   TAO_ENV_ARG_DECL);
 
 };
 
diff --git a/TAO/tao/Messaging.h b/TAO/tao/Messaging.h
index 212077aff41..b662ebc7944 100644
--- a/TAO/tao/Messaging.h
+++ b/TAO/tao/Messaging.h
@@ -44,8 +44,8 @@ enum TAO_AMI_Reply_Status
 typedef void (*TAO_Reply_Handler_Skeleton)(
     TAO_InputCDR &,
     Messaging::ReplyHandler *,
-    CORBA::ULong reply_status,
-    CORBA::Environment &
+    CORBA::ULong reply_status
+    TAO_ENV_ARG_DECL_NOT_USED
     );
 
 #endif /* TAO_HAS_AMI_CALLBACK */
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index 4dd4f5b7d6c..1914008e4ba 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -444,11 +444,11 @@ Messaging::RebindPolicy_var::tao_nil (void)
 
 ::Messaging::RebindPolicy_ptr
 Messaging::RebindPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RebindPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::RebindPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -528,16 +528,16 @@ Messaging::RebindPolicy::~RebindPolicy (void)
 {}
 
 Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RebindPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RebindPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -718,11 +718,11 @@ Messaging::SyncScopePolicy_var::tao_nil (void)
 
 ::Messaging::SyncScopePolicy_ptr
 Messaging::SyncScopePolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::SyncScopePolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::SyncScopePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -801,16 +801,16 @@ Messaging::SyncScopePolicy::~SyncScopePolicy (void)
 {}
 
 Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return SyncScopePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return SyncScopePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1076,11 +1076,11 @@ Messaging::RequestPriorityPolicy_var::tao_nil (void)
 
 ::Messaging::RequestPriorityPolicy_ptr
 Messaging::RequestPriorityPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RequestPriorityPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::RequestPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1160,16 +1160,16 @@ Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void)
 {}
 
 Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RequestPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RequestPriorityPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1346,11 +1346,11 @@ Messaging::ReplyPriorityPolicy_var::tao_nil (void)
 
 ::Messaging::ReplyPriorityPolicy_ptr
 Messaging::ReplyPriorityPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyPriorityPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::ReplyPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1430,16 +1430,16 @@ Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void)
 {}
 
 Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ReplyPriorityPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ReplyPriorityPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1620,11 +1620,11 @@ Messaging::RequestStartTimePolicy_var::tao_nil (void)
 
 ::Messaging::RequestStartTimePolicy_ptr
 Messaging::RequestStartTimePolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RequestStartTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::RequestStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1704,16 +1704,16 @@ Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void)
 {}
 
 Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RequestStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RequestStartTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1894,11 +1894,11 @@ Messaging::RequestEndTimePolicy_var::tao_nil (void)
 
 ::Messaging::RequestEndTimePolicy_ptr
 Messaging::RequestEndTimePolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RequestEndTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::RequestEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1978,16 +1978,16 @@ Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void)
 {}
 
 Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RequestEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RequestEndTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2168,11 +2168,11 @@ Messaging::ReplyStartTimePolicy_var::tao_nil (void)
 
 ::Messaging::ReplyStartTimePolicy_ptr
 Messaging::ReplyStartTimePolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyStartTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::ReplyStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2252,16 +2252,16 @@ Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void)
 {}
 
 Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ReplyStartTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ReplyStartTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2442,11 +2442,11 @@ Messaging::ReplyEndTimePolicy_var::tao_nil (void)
 
 ::Messaging::ReplyEndTimePolicy_ptr
 Messaging::ReplyEndTimePolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyEndTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::ReplyEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2526,16 +2526,16 @@ Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void)
 {}
 
 Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ReplyEndTimePolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ReplyEndTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2716,11 +2716,11 @@ Messaging::RelativeRequestTimeoutPolicy_var::tao_nil (void)
 
 ::Messaging::RelativeRequestTimeoutPolicy_ptr
 Messaging::RelativeRequestTimeoutPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2800,16 +2800,16 @@ Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void)
 {}
 
 Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2990,11 +2990,11 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::tao_nil (void)
 
 ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
 Messaging::RelativeRoundtripTimeoutPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3074,16 +3074,16 @@ Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void
 {}
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3353,11 +3353,11 @@ Messaging::RoutingPolicy_var::tao_nil (void)
 
 ::Messaging::RoutingPolicy_ptr
 Messaging::RoutingPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RoutingPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::RoutingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3437,16 +3437,16 @@ Messaging::RoutingPolicy::~RoutingPolicy (void)
 {}
 
 Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RoutingPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RoutingPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3627,11 +3627,11 @@ Messaging::MaxHopsPolicy_var::tao_nil (void)
 
 ::Messaging::MaxHopsPolicy_ptr
 Messaging::MaxHopsPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::MaxHopsPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::MaxHopsPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3711,16 +3711,16 @@ Messaging::MaxHopsPolicy::~MaxHopsPolicy (void)
 {}
 
 Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return MaxHopsPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return MaxHopsPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3901,11 +3901,11 @@ Messaging::QueueOrderPolicy_var::tao_nil (void)
 
 ::Messaging::QueueOrderPolicy_ptr
 Messaging::QueueOrderPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::QueueOrderPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::QueueOrderPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3985,16 +3985,16 @@ Messaging::QueueOrderPolicy::~QueueOrderPolicy (void)
 {}
 
 Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return QueueOrderPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return QueueOrderPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4563,11 +4563,11 @@ Messaging::ReplyHandler_var::tao_nil (void)
 
 ::Messaging::ReplyHandler_ptr
 Messaging::ReplyHandler_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyHandler::_narrow (p, ACE_TRY_ENV);
+  return ::Messaging::ReplyHandler::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4692,8 +4692,8 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::~_TAO_ReplyHandler_Remote_Prox
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl&
 Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::select_proxy (
-  ::Messaging::ReplyHandler *,
-  CORBA::Environment &
+  ::Messaging::ReplyHandler *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -4733,25 +4733,25 @@ void Messaging::ReplyHandler::_tao_any_destructor (void *x)
 }
 
 Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ReplyHandler::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/Messaging/ReplyHandler:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/Messaging/ReplyHandler:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ReplyHandler::_nil ());
       if (is_a == 0)
         return ReplyHandler::_nil ();
     }
-  return ReplyHandler::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ReplyHandler::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4808,14 +4808,14 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
   return obj;
 }
 
-CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
@@ -5039,7 +5039,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Priorit
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PriorityRange, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_PriorityRange TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5207,7 +5207,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Routing
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_RoutingTypeRange, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_RoutingTypeRange TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5321,7 +5321,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5412,7 +5412,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5483,7 +5483,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_
     _tao_elem = Messaging::ReplyHandler::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_ReplyHandler, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_ReplyHandler TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5664,8 +5664,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       Messaging::ReplyHandler::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+           TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index ab2609afeca..89409f83658 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -177,7 +177,7 @@ TAO_NAMESPACE  Messaging
     static RebindPolicy_ptr tao_duplicate (RebindPolicy_ptr);
     static void tao_release (RebindPolicy_ptr);
     static RebindPolicy_ptr tao_nil (void);
-    static RebindPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RebindPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -231,24 +231,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
     static RebindPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RebindPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RebindPolicy_ptr _nil (void)
       {
         return (RebindPolicy_ptr)0;
       }
 
     virtual Messaging::RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -314,7 +311,7 @@ TAO_NAMESPACE  Messaging
     static SyncScopePolicy_ptr tao_duplicate (SyncScopePolicy_ptr);
     static void tao_release (SyncScopePolicy_ptr);
     static SyncScopePolicy_ptr tao_nil (void);
-    static SyncScopePolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static SyncScopePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -368,24 +365,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj);
     static SyncScopePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static SyncScopePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static SyncScopePolicy_ptr _nil (void)
       {
         return (SyncScopePolicy_ptr)0;
       }
 
     virtual Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -501,7 +495,7 @@ TAO_NAMESPACE  Messaging
     static RequestPriorityPolicy_ptr tao_duplicate (RequestPriorityPolicy_ptr);
     static void tao_release (RequestPriorityPolicy_ptr);
     static RequestPriorityPolicy_ptr tao_nil (void);
-    static RequestPriorityPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RequestPriorityPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -555,24 +549,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
     static RequestPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestPriorityPolicy_ptr _nil (void)
       {
         return (RequestPriorityPolicy_ptr)0;
       }
 
     virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -634,7 +625,7 @@ TAO_NAMESPACE  Messaging
     static ReplyPriorityPolicy_ptr tao_duplicate (ReplyPriorityPolicy_ptr);
     static void tao_release (ReplyPriorityPolicy_ptr);
     static ReplyPriorityPolicy_ptr tao_nil (void);
-    static ReplyPriorityPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ReplyPriorityPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -688,24 +679,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
     static ReplyPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyPriorityPolicy_ptr _nil (void)
       {
         return (ReplyPriorityPolicy_ptr)0;
       }
 
     virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -771,7 +759,7 @@ TAO_NAMESPACE  Messaging
     static RequestStartTimePolicy_ptr tao_duplicate (RequestStartTimePolicy_ptr);
     static void tao_release (RequestStartTimePolicy_ptr);
     static RequestStartTimePolicy_ptr tao_nil (void);
-    static RequestStartTimePolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RequestStartTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -825,24 +813,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
     static RequestStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestStartTimePolicy_ptr _nil (void)
       {
         return (RequestStartTimePolicy_ptr)0;
       }
 
     virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -908,7 +893,7 @@ TAO_NAMESPACE  Messaging
     static RequestEndTimePolicy_ptr tao_duplicate (RequestEndTimePolicy_ptr);
     static void tao_release (RequestEndTimePolicy_ptr);
     static RequestEndTimePolicy_ptr tao_nil (void);
-    static RequestEndTimePolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RequestEndTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -962,24 +947,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
     static RequestEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestEndTimePolicy_ptr _nil (void)
       {
         return (RequestEndTimePolicy_ptr)0;
       }
 
     virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1045,7 +1027,7 @@ TAO_NAMESPACE  Messaging
     static ReplyStartTimePolicy_ptr tao_duplicate (ReplyStartTimePolicy_ptr);
     static void tao_release (ReplyStartTimePolicy_ptr);
     static ReplyStartTimePolicy_ptr tao_nil (void);
-    static ReplyStartTimePolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ReplyStartTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1099,24 +1081,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
     static ReplyStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyStartTimePolicy_ptr _nil (void)
       {
         return (ReplyStartTimePolicy_ptr)0;
       }
 
     virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1182,7 +1161,7 @@ TAO_NAMESPACE  Messaging
     static ReplyEndTimePolicy_ptr tao_duplicate (ReplyEndTimePolicy_ptr);
     static void tao_release (ReplyEndTimePolicy_ptr);
     static ReplyEndTimePolicy_ptr tao_nil (void);
-    static ReplyEndTimePolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ReplyEndTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1236,24 +1215,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
     static ReplyEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyEndTimePolicy_ptr _nil (void)
       {
         return (ReplyEndTimePolicy_ptr)0;
       }
 
     virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1319,7 +1295,7 @@ TAO_NAMESPACE  Messaging
     static RelativeRequestTimeoutPolicy_ptr tao_duplicate (RelativeRequestTimeoutPolicy_ptr);
     static void tao_release (RelativeRequestTimeoutPolicy_ptr);
     static RelativeRequestTimeoutPolicy_ptr tao_nil (void);
-    static RelativeRequestTimeoutPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RelativeRequestTimeoutPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1373,24 +1349,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
     static RelativeRequestTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RelativeRequestTimeoutPolicy_ptr _nil (void)
       {
         return (RelativeRequestTimeoutPolicy_ptr)0;
       }
 
     virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1456,7 +1429,7 @@ TAO_NAMESPACE  Messaging
     static RelativeRoundtripTimeoutPolicy_ptr tao_duplicate (RelativeRoundtripTimeoutPolicy_ptr);
     static void tao_release (RelativeRoundtripTimeoutPolicy_ptr);
     static RelativeRoundtripTimeoutPolicy_ptr tao_nil (void);
-    static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1510,24 +1483,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj);
     static RelativeRoundtripTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RelativeRoundtripTimeoutPolicy_ptr _nil (void)
       {
         return (RelativeRoundtripTimeoutPolicy_ptr)0;
       }
 
     virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1643,7 +1613,7 @@ TAO_NAMESPACE  Messaging
     static RoutingPolicy_ptr tao_duplicate (RoutingPolicy_ptr);
     static void tao_release (RoutingPolicy_ptr);
     static RoutingPolicy_ptr tao_nil (void);
-    static RoutingPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RoutingPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1697,24 +1667,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
     static RoutingPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RoutingPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RoutingPolicy_ptr _nil (void)
       {
         return (RoutingPolicy_ptr)0;
       }
 
     virtual Messaging::RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1780,7 +1747,7 @@ TAO_NAMESPACE  Messaging
     static MaxHopsPolicy_ptr tao_duplicate (MaxHopsPolicy_ptr);
     static void tao_release (MaxHopsPolicy_ptr);
     static MaxHopsPolicy_ptr tao_nil (void);
-    static MaxHopsPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static MaxHopsPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1834,24 +1801,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
     static MaxHopsPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static MaxHopsPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static MaxHopsPolicy_ptr _nil (void)
       {
         return (MaxHopsPolicy_ptr)0;
       }
 
     virtual CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1917,7 +1881,7 @@ TAO_NAMESPACE  Messaging
     static QueueOrderPolicy_ptr tao_duplicate (QueueOrderPolicy_ptr);
     static void tao_release (QueueOrderPolicy_ptr);
     static QueueOrderPolicy_ptr tao_nil (void);
-    static QueueOrderPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static QueueOrderPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1971,24 +1935,21 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
     static QueueOrderPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static QueueOrderPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static QueueOrderPolicy_ptr _nil (void)
       {
         return (QueueOrderPolicy_ptr)0;
       }
 
     virtual Messaging::Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2505,7 +2466,7 @@ TAO_NAMESPACE  Messaging
     static ReplyHandler_ptr tao_duplicate (ReplyHandler_ptr);
     static void tao_release (ReplyHandler_ptr);
     static ReplyHandler_ptr tao_nil (void);
-    static ReplyHandler_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ReplyHandler_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2565,15 +2526,13 @@ TAO_NAMESPACE  Messaging
     // the static operations
     static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
     static ReplyHandler_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyHandler_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ReplyHandler_ptr _nil (void)
       {
         return (ReplyHandler_ptr)0;
@@ -2582,10 +2541,9 @@ TAO_NAMESPACE  Messaging
     static void _tao_any_destructor (void*);
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     virtual const char* _interface_repository_id (void) const;
@@ -2677,8 +2635,8 @@ class TAO_Export _TAO_ReplyHandler_Proxy_Broker
 public:
   virtual ~_TAO_ReplyHandler_Proxy_Broker (void);
   virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
-    ReplyHandler *object,
-    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+    ReplyHandler *object
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS
   ) = 0;
 
 protected:
@@ -2703,8 +2661,8 @@ public:
   virtual ~_TAO_ReplyHandler_Remote_Proxy_Broker (void);
 
   virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
-    ReplyHandler *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ReplyHandler *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index b987a600450..620f4b1b7d0 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -51,11 +51,11 @@ tao_Messaging_RebindPolicy_nil (
 
 ACE_INLINE Messaging::RebindPolicy_ptr
 tao_Messaging_RebindPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::RebindPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::RebindPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -105,11 +105,11 @@ tao_Messaging_SyncScopePolicy_nil (
 
 ACE_INLINE Messaging::SyncScopePolicy_ptr
 tao_Messaging_SyncScopePolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::SyncScopePolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::SyncScopePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -304,11 +304,11 @@ tao_Messaging_RequestPriorityPolicy_nil (
 
 ACE_INLINE Messaging::RequestPriorityPolicy_ptr
 tao_Messaging_RequestPriorityPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::RequestPriorityPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::RequestPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -354,11 +354,11 @@ tao_Messaging_ReplyPriorityPolicy_nil (
 
 ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
 tao_Messaging_ReplyPriorityPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyPriorityPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::ReplyPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -408,11 +408,11 @@ tao_Messaging_RequestStartTimePolicy_nil (
 
 ACE_INLINE Messaging::RequestStartTimePolicy_ptr
 tao_Messaging_RequestStartTimePolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::RequestStartTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::RequestStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -462,11 +462,11 @@ tao_Messaging_RequestEndTimePolicy_nil (
 
 ACE_INLINE Messaging::RequestEndTimePolicy_ptr
 tao_Messaging_RequestEndTimePolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::RequestEndTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::RequestEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -516,11 +516,11 @@ tao_Messaging_ReplyStartTimePolicy_nil (
 
 ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
 tao_Messaging_ReplyStartTimePolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyStartTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::ReplyStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -570,11 +570,11 @@ tao_Messaging_ReplyEndTimePolicy_nil (
 
 ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
 tao_Messaging_ReplyEndTimePolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyEndTimePolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::ReplyEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -624,11 +624,11 @@ tao_Messaging_RelativeRequestTimeoutPolicy_nil (
 
 ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
 tao_Messaging_RelativeRequestTimeoutPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::RelativeRequestTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::RelativeRequestTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -678,11 +678,11 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_nil (
 
 ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
 tao_Messaging_RelativeRoundtripTimeoutPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -877,11 +877,11 @@ tao_Messaging_RoutingPolicy_nil (
 
 ACE_INLINE Messaging::RoutingPolicy_ptr
 tao_Messaging_RoutingPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::RoutingPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::RoutingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -931,11 +931,11 @@ tao_Messaging_MaxHopsPolicy_nil (
 
 ACE_INLINE Messaging::MaxHopsPolicy_ptr
 tao_Messaging_MaxHopsPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::MaxHopsPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::MaxHopsPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -985,11 +985,11 @@ tao_Messaging_QueueOrderPolicy_nil (
 
 ACE_INLINE Messaging::QueueOrderPolicy_ptr
 tao_Messaging_QueueOrderPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::QueueOrderPolicy::_narrow (p, ACE_TRY_ENV);
+  return Messaging::QueueOrderPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1825,11 +1825,11 @@ tao_Messaging_ReplyHandler_nil (
 
 ACE_INLINE Messaging::ReplyHandler_ptr
 tao_Messaging_ReplyHandler_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyHandler::_narrow (p, ACE_TRY_ENV);
+  return Messaging::ReplyHandler::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging_ORBInitializer.cpp
index 72cc5b4f09e..7d545faa4af 100644
--- a/TAO/tao/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging_ORBInitializer.cpp
@@ -35,17 +35,15 @@ TAO_Messaging_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
-  this->register_policy_factories (info,
-                                   ACE_TRY_ENV);
+  this->register_policy_factories (info
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Messaging_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
   // Register the Messaging policy factories.
 
@@ -74,91 +72,91 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
 
   type = TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
   type = TAO_BUFFERING_CONSTRAINT_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   type = TAO_MESSAGING_REBIND_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 
   type = TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_ROUTING_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_MAX_HOPS_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 this->policy_factory_.in (),
-                                 ACE_TRY_ENV);
+                                 this->policy_factory_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/Messaging_ORBInitializer.h b/TAO/tao/Messaging_ORBInitializer.h
index 459d95cbaee..d8827062e16 100644
--- a/TAO/tao/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging_ORBInitializer.h
@@ -70,8 +70,8 @@ private:
 
   /// Register Messaging policy factories.
   void register_policy_factories (
-    PortableInterceptor::ORBInitInfo_ptr info,
-    CORBA::Environment &ACE_TRY_ENV);
+    PortableInterceptor::ORBInitInfo_ptr info
+    TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging_PolicyFactory.cpp
index d2c835917d4..8b7769da9cd 100644
--- a/TAO/tao/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging_PolicyFactory.cpp
@@ -20,8 +20,6 @@ TAO_Messaging_PolicyFactory::create_policy (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
-  TAO_ENV_ARG_DEFN;
-
   switch (type)
     {
 
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
index b9172202595..d0f1e8c2e60 100644
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging_Policy_i.cpp
@@ -25,14 +25,14 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TA
 }
 
 TimeBase::TimeT
-TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (CORBA::Environment &)
+TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->relative_expiry_;
 }
 
 CORBA::PolicyType
-TAO_RelativeRoundtripTimeoutPolicy::policy_type (CORBA_Environment &)
+TAO_RelativeRoundtripTimeoutPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how this minimizes the
@@ -61,11 +61,11 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
   ACE_TRY_NEW_ENV
     {
       Messaging::RelativeRoundtripTimeoutPolicy_var p =
-        Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy.in (),
-                                                            ACE_TRY_ENV);
+        Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TimeBase::TimeT t = p->relative_expiry (ACE_TRY_ENV);
+      TimeBase::TimeT t = p->relative_expiry (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       TimeBase::TimeT seconds = t / 10000000u;
       TimeBase::TimeT microseconds = (t % 10000000u) / 10;
@@ -92,8 +92,8 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
 }
 
 CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val
+                                            TAO_ENV_ARG_DECL)
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -124,7 +124,7 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::copy (CORBA_Environment &ACE_TRY_ENV)
+TAO_RelativeRoundtripTimeoutPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
@@ -140,7 +140,7 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (CORBA_Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_RelativeRoundtripTimeoutPolicy::destroy (CORBA_Environment &)
+TAO_RelativeRoundtripTimeoutPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -188,7 +188,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
 }
 
 CORBA::PolicyType
-TAO_Sync_Scope_Policy::policy_type (CORBA_Environment &)
+TAO_Sync_Scope_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Messaging::SYNC_SCOPE_POLICY_TYPE;
@@ -241,8 +241,8 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
 }
 
 CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::create (const CORBA::Any& val,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Sync_Scope_Policy::create (const CORBA::Any& val
+                               TAO_ENV_ARG_DECL)
 {
   Messaging::SyncScope synchronization;
   if ((val >>= synchronization) == 0)
@@ -269,14 +269,14 @@ TAO_Sync_Scope_Policy::clone (void) const
 }
 
 Messaging::SyncScope
-TAO_Sync_Scope_Policy::synchronization (CORBA::Environment &)
+TAO_Sync_Scope_Policy::synchronization (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->synchronization_;
 }
 
 CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
+TAO_Sync_Scope_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Sync_Scope_Policy *servant = 0;
@@ -289,7 +289,7 @@ TAO_Sync_Scope_Policy::copy (CORBA_Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Sync_Scope_Policy::destroy (CORBA_Environment &)
+TAO_Sync_Scope_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index bf7372a5aab..96c53cbdbd3 100644
--- a/TAO/tao/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging_Policy_i.h
@@ -54,23 +54,23 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  static CORBA::Policy_ptr create (const CORBA::Any& val
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns a copy of <this>.
   virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const;
 
   // = The Messaging::RelativeRoundtripTimeoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (CORBA::Environment &ACE_TRY_ENV)
+  virtual TimeBase::TimeT relative_expiry (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the CORBA representation to the ACE representation.
@@ -117,26 +117,26 @@ public:
 
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val,
-                                   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  static CORBA::Policy_ptr create (const CORBA::Any& val
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns a copy of <this>.
   virtual TAO_Sync_Scope_Policy *clone (void) const;
 
   // = The Messaging::SyncScopePolicy methods.
 
-  virtual Messaging::SyncScope synchronization (CORBA::Environment &ACE_TRY_ENV)
+  virtual Messaging::SyncScope synchronization (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void get_synchronization (Messaging::SyncScope &synchronization) const;
 
-  virtual CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 3a5855ac536..b2589d0ac54 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -95,21 +95,21 @@ CORBA_NVList::~CORBA_NVList (void)
 
 // add an element and just initialize its flags
 CORBA::NamedValue_ptr
-CORBA_NVList::add (CORBA::Flags flags,
-                   CORBA::Environment &ACE_TRY_ENV)
+CORBA_NVList::add (CORBA::Flags flags
+                   TAO_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags, ACE_TRY_ENV);
+  return this->add_element (flags TAO_ENV_ARG_PARAMETER);
 }
 
 // add an element and just initialize its flags and name
 CORBA::NamedValue_ptr
 CORBA_NVList::add_item (const char *name,
-                        CORBA::Flags flags,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Flags flags
+                        TAO_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
+  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (nv)
@@ -126,11 +126,11 @@ CORBA_NVList::add_item (const char *name,
 CORBA::NamedValue_ptr
 CORBA_NVList::add_value (const char *name,
                          const CORBA::Any &value,
-                         CORBA::Flags flags,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Flags flags
+                         TAO_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
+  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (nv)
     {
@@ -162,12 +162,12 @@ CORBA_NVList::add_value (const char *name,
 // add an element and just initialize its flags and name
 CORBA::NamedValue_ptr
 CORBA_NVList::add_item_consume (char *name,
-                                CORBA::Flags flags,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Flags flags
+                                TAO_ENV_ARG_DECL)
 {
 
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
+  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (nv)
@@ -186,11 +186,11 @@ CORBA_NVList::add_item_consume (char *name,
 CORBA::NamedValue_ptr
 CORBA_NVList::add_value_consume (char * name,
                                  CORBA::Any * value,
-                                 CORBA::Flags flags,
-                                 CORBA::Environment & ACE_TRY_ENV)
+                                 CORBA::Flags flags
+                                 TAO_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags, ACE_TRY_ENV);
+  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (nv)
@@ -211,7 +211,7 @@ CORBA_NVList::add_value_consume (char * name,
 
 //CORBA::Status
 void
-CORBA_NVList::remove (CORBA::ULong /*n*/, CORBA::Environment &/*env*/)
+CORBA_NVList::remove (CORBA::ULong /*n*/ TAO_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   // not implemented
   // @@ (ASG) - TODO
@@ -219,10 +219,10 @@ CORBA_NVList::remove (CORBA::ULong /*n*/, CORBA::Environment &/*env*/)
 
 // Helper method
 CORBA::NamedValue_ptr
-CORBA_NVList::add_element (CORBA::Flags flags,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA_NVList::add_element (CORBA::Flags flags
+                           TAO_ENV_ARG_DECL)
 {
-  this->evaluate (ACE_TRY_ENV);
+  this->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
 
   if (ACE_BIT_DISABLED (flags,
@@ -248,9 +248,9 @@ CORBA_NVList::add_element (CORBA::Flags flags,
 
 // return the item at location n
 CORBA::NamedValue_ptr
-CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &ACE_TRY_ENV)
+CORBA_NVList::item (CORBA::ULong n TAO_ENV_ARG_DECL)
 {
-  this->evaluate (ACE_TRY_ENV);
+  this->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
 
   if (n >= this->max_) // 0 based indexing
@@ -265,8 +265,8 @@ CORBA_NVList::item (CORBA::ULong n, CORBA::Environment &ACE_TRY_ENV)
 void
 CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
                                  int flag,
-                                 int &lazy_evaluation,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 int &lazy_evaluation
+                                 TAO_ENV_ARG_DECL)
 {
   // If the list is empty then using lazy evaluation is the only
   // choice.
@@ -279,8 +279,8 @@ CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
   if (lazy_evaluation == 0)
     {
       this->_tao_decode (cdr,
-                         flag,
-                         ACE_TRY_ENV);
+                         flag
+                          TAO_ENV_ARG_PARAMETER);
       return;
     }
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
@@ -297,8 +297,8 @@ CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
 void
 CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
                            TAO_ORB_Core *orb_core,
-                           int flag,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           int flag
+                           TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
   if (this->incoming_ != 0)
@@ -340,8 +340,8 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
           CORBA::TypeCode_var tc = nv->value ()->type ();
           (void) TAO_Marshal_Object::perform_append (tc.in (),
                                                      this->incoming_,
-                                                     &cdr,
-                                                     ACE_TRY_ENV);
+                                                     &cdr
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -367,16 +367,16 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
         continue;
 
       nv->value ()->_tao_encode (cdr,
-                                 orb_core,
-                                 ACE_TRY_ENV);
+                                 orb_core
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 CORBA_NVList::_tao_decode (TAO_InputCDR &incoming,
-                           int flag,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           int flag
+                           TAO_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 3)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
@@ -404,8 +404,8 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming,
                     nv->name ()?nv->name ():"(no name given)" ));
 
       CORBA::Any_ptr any = nv->value ();
-      any->_tao_decode (incoming,
-                        ACE_TRY_ENV);
+      any->_tao_decode (incoming
+                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -423,7 +423,7 @@ CORBA_NVList::_tao_target_alignment (void)
 }
 
 void
-CORBA_NVList::evaluate (CORBA::Environment &ACE_TRY_ENV)
+CORBA_NVList::evaluate (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
   if (this->incoming_ == 0)
@@ -433,8 +433,8 @@ CORBA_NVList::evaluate (CORBA::Environment &ACE_TRY_ENV)
   this->incoming_ = 0;
 
   this->_tao_decode (*(incoming.get ()),
-                     this->incoming_flag_,
-                     ACE_TRY_ENV);
+                     this->incoming_flag_
+                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index 567da38fc61..0c56ac91a6f 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -181,52 +181,44 @@ public:
   ~CORBA_NVList (void);
 
   /// return the current number of elements in the list
-  CORBA::ULong count (CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ()) const;
+  CORBA::ULong count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// add an element and just initialize the flags
-  CORBA_NamedValue_ptr add (CORBA::Flags,
-                            CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  CORBA_NamedValue_ptr add (CORBA::Flags
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// add an element and initialize its name and flags
   CORBA_NamedValue_ptr add_item (const char *,
-                                 CORBA::Flags,
-                                 CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
+                                 CORBA::Flags
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// initializes a value, name, and flags
   CORBA_NamedValue_ptr add_value (const char *,
                                   const CORBA::Any &,
-                                  CORBA::Flags,
-                                  CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
+                                  CORBA::Flags
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// just like add_item. In addition, memory management of char * name
   /// is taken over by the NVList
   CORBA_NamedValue_ptr add_item_consume (char *,
-                                         CORBA::Flags,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ());
+                                         CORBA::Flags
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// just like add_value. In addition, the NVList controls the memory
   /// management of the char *name and Any *value parameter
   CORBA_NamedValue_ptr add_value_consume (char *,
                                           CORBA::Any_ptr,
-                                          CORBA::Flags,
-                                          CORBA_Environment &ACE_TRY_ENV =
-                                              TAO_default_environment ());
+                                          CORBA::Flags
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// retrieve the item at the nth location. Raises Bounds
-  CORBA_NamedValue_ptr item (CORBA::ULong n,
-                             CORBA_Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ());
+  CORBA_NamedValue_ptr item (CORBA::ULong n
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   //  CORBA::Status
   /// remove element at index n. Raises Bounds
-  void remove (CORBA::ULong n,
-               CORBA_Environment &ACE_TRY_ENV =
-                   TAO_default_environment ());
+  void remove (CORBA::ULong n
+               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // The pseudo object static methods..
   static CORBA_NVList* _duplicate (CORBA_NVList*);
@@ -246,21 +238,20 @@ public:
    */
   void _tao_incoming_cdr (TAO_InputCDR &cdr,
                           int flag,
-                          int &lazy_evaluation,
-                          CORBA::Environment &ACE_TRY_ENV);
+                          int &lazy_evaluation
+                          TAO_ENV_ARG_DECL);
 
   /// Encode the NVList into the CDR stream. <flag> masks the type of
   /// arguments (IN, OUT or INOUT) that are to be marshaled.
   void _tao_encode (TAO_OutputCDR &cdr,
                     TAO_ORB_Core *orb_core,
-                    int flag,
-                    CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                    int flag
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Decode the NVList arguments from the <cdr> stream.
   void _tao_decode (TAO_InputCDR &cdr,
-                    int flag,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    int flag
+                    TAO_ENV_ARG_DECL);
 
   /**
    * Return the required alignment to marshal the NVList without any
@@ -289,13 +280,12 @@ private:
 
   /// helper to increase the list size. This is used by all the add_
   /// methods of the NVList class
-  CORBA_NamedValue_ptr add_element (CORBA::Flags,
-                                    CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  CORBA_NamedValue_ptr add_element (CORBA::Flags
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Lazy evaluation routine to fill up the Anys in the NVList from
   /// the CDR stream.
-  void evaluate (CORBA::Environment &ACE_TRY_ENV);
+  void evaluate (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// internal list of parameters stored as NamedValues
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 1972fc50747..5fab013e9b3 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -135,16 +135,16 @@ void CORBA_ORB::InvalidName::_raise (void)
   TAO_RAISE(*this);
 }
 
-void CORBA_ORB::InvalidName::_tao_encode (TAO_OutputCDR &cdr,
-                                          CORBA::Environment &ACE_TRY_ENV) const
+void CORBA_ORB::InvalidName::_tao_encode (TAO_OutputCDR &cdr
+                                          TAO_ENV_ARG_DECL) const
 {
   if (cdr << *this)
     return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void CORBA_ORB::InvalidName::_tao_decode (TAO_InputCDR &cdr,
-                                          CORBA::Environment &ACE_TRY_ENV)
+void CORBA_ORB::InvalidName::_tao_decode (TAO_InputCDR &cdr
+                                          TAO_ENV_ARG_DECL)
 {
   if (cdr >> *this)
     return;
@@ -185,19 +185,19 @@ CORBA_ORB::~CORBA_ORB (void)
 }
 
 void
-CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion,
-                     CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion
+                     TAO_ENV_ARG_DECL)
 {
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core ()->shutdown (wait_for_completion,
-                               ACE_TRY_ENV);
+  this->orb_core ()->shutdown (wait_for_completion
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CORBA_ORB::destroy (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::destroy (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->orb_core () == 0)
     {
@@ -219,7 +219,7 @@ CORBA_ORB::destroy (CORBA::Environment &ACE_TRY_ENV)
                   this->orb_core ()->orbid ()));
     }
 
-  this->orb_core ()->destroy (ACE_TRY_ENV);
+  this->orb_core ()->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now invalidate the pointer to the ORB_Core that created this
@@ -228,55 +228,55 @@ CORBA_ORB::destroy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CORBA_ORB::run (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->run (0, ACE_TRY_ENV);
+  this->run (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::run (ACE_Time_Value &tv, CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::run (ACE_Time_Value &tv TAO_ENV_ARG_DECL)
 {
-  this->run (&tv, ACE_TRY_ENV);
+  this->run (&tv TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::run (ACE_Time_Value *tv,
-                CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::run (ACE_Time_Value *tv
+                TAO_ENV_ARG_DECL)
 {
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core ()->run (tv, 0, ACE_TRY_ENV);
+  this->orb_core ()->run (tv, 0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::perform_work (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::perform_work (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->perform_work (0, ACE_TRY_ENV);
+  this->perform_work (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::perform_work (ACE_Time_Value &tv, CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::perform_work (ACE_Time_Value &tv TAO_ENV_ARG_DECL)
 {
-  this->perform_work (&tv, ACE_TRY_ENV);
+  this->perform_work (&tv TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::perform_work (ACE_Time_Value *tv,
-                         CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::perform_work (ACE_Time_Value *tv
+                         TAO_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core ()->run (tv, 1, ACE_TRY_ENV);
+  this->orb_core ()->run (tv, 1 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-CORBA_ORB::work_pending (ACE_Time_Value &tv, CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::work_pending (ACE_Time_Value &tv TAO_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int result = this->orb_core_->reactor ()->work_pending (tv);
@@ -290,10 +290,10 @@ CORBA_ORB::work_pending (ACE_Time_Value &tv, CORBA_Environment &ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-CORBA_ORB::work_pending (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::work_pending (TAO_ENV_SINGLE_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int result = this->orb_core_->reactor ()->work_pending ();
@@ -310,8 +310,8 @@ CORBA_ORB::work_pending (CORBA_Environment &ACE_TRY_ENV)
 
 void
 CORBA_ORB::create_list (CORBA::Long count,
-                        CORBA::NVList_ptr &new_list,
-                        CORBA_Environment &ACE_TRY_ENV)
+                        CORBA::NVList_ptr &new_list
+                        TAO_ENV_ARG_DECL)
 {
   ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX);
 
@@ -348,21 +348,21 @@ CORBA_ORB::create_list (CORBA::Long count,
 }
 
 void
-CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &list,
-                                  CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &list
+                                  TAO_ENV_ARG_DECL)
 {
   TAO_Dynamic_Adapter *dynamic_adapter =
     ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
         TAO_ORB_Core::dynamic_adapter_name ()
       );
 
-  dynamic_adapter->create_exception_list (list,
-                                          ACE_TRY_ENV);
+  dynamic_adapter->create_exception_list (list
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::create_environment (CORBA::Environment_ptr &environment,
-                               CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::create_environment (CORBA::Environment_ptr &environment
+                               TAO_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (environment, CORBA::Environment (),
                     CORBA::NO_MEMORY (
@@ -373,8 +373,8 @@ CORBA_ORB::create_environment (CORBA::Environment_ptr &environment,
 }
 
 void
-CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &nv,
-                               CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &nv
+                               TAO_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (nv,
                     CORBA::NamedValue,
@@ -390,8 +390,8 @@ CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &nv,
 
 CORBA::Boolean
 CORBA_ORB::get_service_information (CORBA::ServiceType /* service_type */,
-                                    CORBA::ServiceInformation_out /* service_information */,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::ServiceInformation_out /* service_information */
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA_SystemException::_tao_minor_code (
@@ -402,8 +402,8 @@ CORBA_ORB::get_service_information (CORBA::ServiceType /* service_type */,
 }
 
 void
-CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
-                                CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::create_context_list (CORBA::ContextList_ptr &
+                                TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -413,8 +413,8 @@ CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
 }
 
 void
-CORBA_ORB::get_default_context (CORBA::Context_ptr &,
-                                CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::get_default_context (CORBA::Context_ptr &
+                                TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -424,8 +424,8 @@ CORBA_ORB::get_default_context (CORBA::Context_ptr &,
 }
 
 void
-CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &,
-                                          CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &
+                                          TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -435,8 +435,8 @@ CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &,
 }
 
 void
-CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &,
-                                            CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &
+                                            TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -446,8 +446,8 @@ CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &,
 }
 
 void
-CORBA_ORB::get_next_response (CORBA_Request_ptr &,
-                              CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::get_next_response (CORBA_Request_ptr &
+                              TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -457,7 +457,7 @@ CORBA_ORB::get_next_response (CORBA_Request_ptr &,
 }
 
 CORBA::Boolean
-CORBA_ORB::poll_next_response (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::poll_next_response (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA_SystemException::_tao_minor_code (
@@ -473,8 +473,8 @@ CORBA::TypeCode_ptr
 CORBA_ORB::create_struct_tc (
     const char *id,
     const char *name,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -491,8 +491,8 @@ CORBA_ORB::create_struct_tc (
 
   return adapter->create_struct_tc (id,
                                     name,
-                                    members,
-                                    ACE_TRY_ENV);
+                                    members
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -500,8 +500,8 @@ CORBA_ORB::create_union_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_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))
 {
@@ -519,16 +519,16 @@ CORBA_ORB::create_union_tc (
   return adapter->create_union_tc (id,
                                    name,
                                    discriminator_type,
-                                   members,
-                                   ACE_TRY_ENV);
+                                   members
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_enum_tc (
     const char *id,
     const char *name,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -545,16 +545,16 @@ CORBA_ORB::create_enum_tc (
 
   return adapter->create_enum_tc (id,
                                   name,
-                                  members,
-                                  ACE_TRY_ENV);
+                                  members
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_alias_tc (
     const char *id,
     const char *name,
-    CORBA::TypeCode_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -571,16 +571,16 @@ CORBA_ORB::create_alias_tc (
 
   return adapter->create_alias_tc (id,
                                    name,
-                                   original_type,
-                                   ACE_TRY_ENV);
+                                   original_type
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_exception_tc (
     const char *id,
     const char *name,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -597,15 +597,15 @@ CORBA_ORB::create_exception_tc (
 
   return adapter->create_exception_tc (id,
                                        name,
-                                       members,
-                                       ACE_TRY_ENV);
+                                       members
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_interface_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -621,14 +621,14 @@ CORBA_ORB::create_interface_tc (
     }
 
   return adapter->create_interface_tc (id,
-                                       name,
-                                       ACE_TRY_ENV);
+                                       name
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_string_tc (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -643,14 +643,14 @@ CORBA_ORB::create_string_tc (
                         CORBA::TypeCode::_nil ());
     }
 
-  return adapter->create_string_tc (bound,
-                                    ACE_TRY_ENV);
+  return adapter->create_string_tc (bound
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_wstring_tc (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -665,15 +665,15 @@ CORBA_ORB::create_wstring_tc (
                         CORBA::TypeCode::_nil ());
     }
 
-  return adapter->create_wstring_tc (bound,
-                                     ACE_TRY_ENV);
+  return adapter->create_wstring_tc (bound
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_fixed_tc (
     CORBA::UShort digits,
-    CORBA::UShort scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::UShort scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -689,15 +689,15 @@ CORBA_ORB::create_fixed_tc (
     }
 
   return adapter->create_fixed_tc (digits,
-                                   scale,
-                                   ACE_TRY_ENV);
+                                   scale
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_sequence_tc (
     CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -713,15 +713,15 @@ CORBA_ORB::create_sequence_tc (
     }
 
   return adapter->create_sequence_tc (bound,
-                                      element_type,
-                                      ACE_TRY_ENV);
+                                      element_type
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_array_tc (
     CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -737,8 +737,8 @@ CORBA_ORB::create_array_tc (
     }
 
   return adapter->create_array_tc (length,
-                                   element_type,
-                                   ACE_TRY_ENV);
+                                   element_type
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -747,8 +747,8 @@ CORBA_ORB::create_value_tc (
     const char *name,
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
-    const CORBA_ValueMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -767,16 +767,16 @@ CORBA_ORB::create_value_tc (
                                    name,
                                    type_modifier,
                                    concrete_base,
-                                   members,
-                                   ACE_TRY_ENV);
+                                   members
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_value_box_tc (
     const char *id,
     const char *name,
-    CORBA::TypeCode_ptr boxed_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr boxed_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -793,15 +793,15 @@ CORBA_ORB::create_value_box_tc (
 
   return adapter->create_value_box_tc (id,
                                        name,
-                                       boxed_type,
-                                       ACE_TRY_ENV);
+                                       boxed_type
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_native_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -817,14 +817,14 @@ CORBA_ORB::create_native_tc (
     }
 
   return adapter->create_native_tc (id,
-                                    name,
-                                    ACE_TRY_ENV);
+                                    name
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_recursive_tc (
-    const char *id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -839,15 +839,15 @@ CORBA_ORB::create_recursive_tc (
                         CORBA::TypeCode::_nil ());
     }
 
-  return adapter->create_recursive_tc (id,
-                                       ACE_TRY_ENV);
+  return adapter->create_recursive_tc (id
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_abstract_interface_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -863,15 +863,15 @@ CORBA_ORB::create_abstract_interface_tc (
     }
 
   return adapter->create_abstract_interface_tc (id,
-                                                name,
-                                                ACE_TRY_ENV);
+                                                name
+                                                 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_local_interface_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -887,8 +887,8 @@ CORBA_ORB::create_local_interface_tc (
     }
 
   return adapter->create_local_interface_tc (id,
-                                             name,
-                                             ACE_TRY_ENV);
+                                             name
+                                              TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -896,20 +896,20 @@ CORBA_ORB::create_local_interface_tc (
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_root_poa (CORBA::Environment &ACE_TRY_ENV
+CORBA_ORB::resolve_root_poa (TAO_ENV_SINGLE_ARG_DECL
                              )
 {
-  return this->orb_core_->root_poa (ACE_TRY_ENV);
+  return this->orb_core_->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_poa_current (CORBA::Environment &)
+CORBA_ORB::resolve_poa_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->orb_core_->poa_current ();
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_policy_manager (CORBA::Environment &)
+CORBA_ORB::resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -930,7 +930,7 @@ CORBA_ORB::resolve_policy_manager (CORBA::Environment &)
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_policy_current (CORBA::Environment &)
+CORBA_ORB::resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -949,8 +949,8 @@ CORBA_ORB::resolve_policy_current (CORBA::Environment &)
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_service (MCAST_SERVICEID mcast_service_id,
-                            ACE_Time_Value * /*timeout*/,
-                            CORBA::Environment& ACE_TRY_ENV)
+                            ACE_Time_Value * /*timeout*/
+                            TAO_ENV_ARG_DECL)
 {
   const char * env_service_ior [] =
   {
@@ -972,10 +972,9 @@ CORBA_ORB::resolve_service (MCAST_SERVICEID mcast_service_id,
  if (ACE_OS::strcmp (service_ior.c_str (), "") != 0)
    {
      return_value =
-       this->string_to_object (service_ior.c_str (),
-                               ACE_TRY_ENV);
+       this->string_to_object (service_ior.c_str () TAO_ENV_ARG_PARAMETER);
      ACE_CHECK_RETURN (CORBA_Object::_nil ());
-     
+
      // Return ior.
      return return_value._retn ();
    }
@@ -985,46 +984,46 @@ CORBA_ORB::resolve_service (MCAST_SERVICEID mcast_service_id,
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_initial_references (const char *name,
-                                       CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::resolve_initial_references (const char *name
+                                       TAO_ENV_ARG_DECL)
 {
   return this->resolve_initial_references (name,
-                                           0,
-                                           ACE_TRY_ENV);
+                                           0
+                                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_initial_references (const char *name,
-                                       ACE_Time_Value *timeout,
-                                       CORBA_Environment &ACE_TRY_ENV)
+                                       ACE_Time_Value *timeout
+                                       TAO_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0)
-    return this->resolve_root_poa (ACE_TRY_ENV);
+    return this->resolve_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
-    return this->resolve_poa_current (ACE_TRY_ENV);
+    return this->resolve_poa_current (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
-    return this->resolve_policy_manager (ACE_TRY_ENV);
+    return this->resolve_policy_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0)
-    return this->resolve_policy_current (ACE_TRY_ENV);
+    return this->resolve_policy_current (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
-    return this->orb_core ()->resolve_ior_manipulation (ACE_TRY_ENV);
+    return this->orb_core ()->resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORTABLE) == 0)
-    return this->orb_core ()->resolve_ior_table (ACE_TRY_ENV);
+    return this->orb_core ()->resolve_ior_table (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0)
-    return this->orb_core ()->resolve_dynanyfactory (ACE_TRY_ENV);
+    return this->orb_core ()->resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0)
-    return this->orb_core ()->resolve_typecodefactory (ACE_TRY_ENV);
+    return this->orb_core ()->resolve_typecodefactory (TAO_ENV_SINGLE_ARG_PARAMETER);
 
 
   // -----------------------------------------------------------------
@@ -1033,8 +1032,8 @@ CORBA_ORB::resolve_initial_references (const char *name,
   // the InitRef table search, since it may contain local objects.
   CORBA::Object_var result =
     this->orb_core ()->object_ref_table ().resolve_initial_references (
-      name,
-      ACE_TRY_ENV);
+      name
+       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (!CORBA::is_nil (result.in ()))
@@ -1050,33 +1049,37 @@ CORBA_ORB::resolve_initial_references (const char *name,
   // to find the basic services...
   if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0)
     {
-      result = this->resolve_service (NAMESERVICE, timeout, ACE_TRY_ENV);
+      result = this->resolve_service (NAMESERVICE, timeout
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
-      
+
       if (!CORBA::is_nil (result.in ()))
         return result._retn ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0)
     {
-      result = this->resolve_service (TRADINGSERVICE, timeout, ACE_TRY_ENV);
+      result = this->resolve_service (TRADINGSERVICE, timeout
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
-      
+
       if (!CORBA::is_nil (result.in ()))
         return result._retn ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_IMPLREPOSERVICE) == 0)
     {
-      result = this->resolve_service (IMPLREPOSERVICE, timeout, ACE_TRY_ENV);
+      result = this->resolve_service (IMPLREPOSERVICE, timeout
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
-      
+
       if (!CORBA::is_nil (result.in ()))
         return result._retn ();
     }
   else if (ACE_OS::strcmp (name, TAO_OBJID_INTERFACEREP) == 0)
     {
-      result = this->resolve_service (INTERFACEREPOSERVICE, timeout, ACE_TRY_ENV);
+      result = this->resolve_service (INTERFACEREPOSERVICE, timeout
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
-      
+
       if (!CORBA::is_nil (result.in ()))
         return result._retn ();
     }
@@ -1084,33 +1087,33 @@ CORBA_ORB::resolve_initial_references (const char *name,
   // Is not one of the well known services, try to find it in the
   // InitRef table....check the defaultinitref values also.
 
-  result = this->orb_core ()->resolve_rir (name, ACE_TRY_ENV);
+  result = this->orb_core ()->resolve_rir (name TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (!CORBA::is_nil (result.in ()))
     return result._retn ();
   // -----------------------------------------------------------------
-  
-  
+
+
   ACE_THROW_RETURN (CORBA::ORB::InvalidName (), CORBA::Object::_nil ());
 
 }
 
 CORBA_ORB_ObjectIdList_ptr
-CORBA_ORB::list_initial_services (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::list_initial_services (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->orb_core ()->list_initial_references (ACE_TRY_ENV);
+  return this->orb_core ()->list_initial_references (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::check_shutdown (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ORB::check_shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->orb_core () != 0)
     {
-      this->orb_core ()->check_shutdown (ACE_TRY_ENV);
+      this->orb_core ()->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -1130,7 +1133,7 @@ CORBA_ORB::check_shutdown (CORBA_Environment &ACE_TRY_ENV)
 // ****************************************************************
 
 void
-CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL)
 {
   // This method should be invoked atomically.  It is the caller's
   // responsibility to ensure that this condition is satisfied.
@@ -1149,7 +1152,7 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
   TAO_TypeCodes::init ();
 
   // initialize the system exceptions
-  TAO_Exceptions::init (ACE_TRY_ENV);
+  TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Verify some of the basic implementation requirements.  This test
@@ -1196,8 +1199,8 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
   PortableInterceptor::ORBInitializer_var cf_initializer =
     tmp_cf_initializer;
 
-  PortableInterceptor::register_orb_initializer (cf_initializer.in (),
-                                                 ACE_TRY_ENV);
+  PortableInterceptor::register_orb_initializer (cf_initializer.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // -------------------------------------------------------------
@@ -1221,8 +1224,8 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
   orb_initializer = temp_orb_initializer;
 
-  PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                 ACE_TRY_ENV);
+  PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -1242,8 +1245,8 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
   pi_initializer = temp_pi_initializer;
 
-  PortableInterceptor::register_orb_initializer (pi_initializer.in (),
-                                                 ACE_TRY_ENV);
+  PortableInterceptor::register_orb_initializer (pi_initializer.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
@@ -1298,6 +1301,10 @@ CORBA::ORB_init (int &argc,
                  const char *orbid,
                  CORBA_Environment &ACE_TRY_ENV)
 {
+  // This ugly ifdef will go away once we've merged the two ORB_init's.
+#if defined (TAO_HAS_EXCEPTIONS) && !defined (TAO_LACKS_SUPPRESS_ENV)
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+#endif
 
   // Using ACE_Static_Object_Lock::instance() precludes <ORB_init>
   // from being called within a static object CTOR.
@@ -1309,7 +1316,7 @@ CORBA::ORB_init (int &argc,
   if (TAO_Singleton_Manager::instance ()->init () == -1)
     return CORBA::ORB::_nil ();
 
-  CORBA_ORB::init_orb_globals (ACE_TRY_ENV);
+  CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Make sure the following is done after the global ORB
@@ -1447,12 +1454,12 @@ CORBA::ORB_init (int &argc,
 
   // Call the ORBInitializer::pre_init() on each registered ORB
   // initializer.
-  TAO_ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in (),
-                                                      ACE_TRY_ENV);
+  TAO_ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Initialize the ORB Core instance.
-  result = safe_oc->init (argc, argv, ACE_TRY_ENV);
+  result = safe_oc->init (argc, argv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Check for errors and return nil pseudo-reference on error.
@@ -1466,8 +1473,8 @@ CORBA::ORB_init (int &argc,
 
   // Call the ORBInitializer::post_init() on each registered ORB
   // initializer.
-  TAO_ORBInitializer_Registry::instance ()->post_init (orb_init_info.in (),
-                                                       ACE_TRY_ENV);
+  TAO_ORBInitializer_Registry::instance ()->post_init (orb_init_info.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Invalidate the ORBInitInfo instance to prevent future
@@ -1495,11 +1502,11 @@ CORBA::ORB_init (int &argc,
 
 // Objref stringification.
 char *
-CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
-                             CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::object_to_string (CORBA::Object_ptr obj
+                             TAO_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!CORBA::is_nil (obj) && obj->_is_local ())
@@ -1626,7 +1633,7 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
       // For now we just use the first profile.
       TAO_Profile *profile = mp.get_profile (0);
 
-      return profile->to_string (ACE_TRY_ENV);
+      return profile->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
 }
 
@@ -1634,11 +1641,11 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
 // <resolve_name_service> with an IOR <multicast_to_service>.
 
 CORBA::Object_ptr
-CORBA_ORB::string_to_object (const char *str,
-                             CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::string_to_object (const char *str
+                             TAO_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Check for NULL pointer
@@ -1656,35 +1663,35 @@ CORBA_ORB::string_to_object (const char *str,
   if (ior_parser != 0)
     {
       return ior_parser->parse_string (str,
-                                       this,
-                                       ACE_TRY_ENV);
+                                       this
+                                        TAO_ENV_ARG_PARAMETER);
     }
 
 
   if (ACE_OS::strncmp (str,
                        ior_prefix,
                        sizeof ior_prefix - 1) == 0)
-    return this->ior_string_to_object (str + sizeof ior_prefix - 1,
-                                       ACE_TRY_ENV);
+    return this->ior_string_to_object (str + sizeof ior_prefix - 1
+                                        TAO_ENV_ARG_PARAMETER);
   else
-    return this->url_ior_string_to_object (str, ACE_TRY_ENV);
+    return this->url_ior_string_to_object (str TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 CORBA::Policy_ptr
 CORBA_ORB::create_policy (CORBA::PolicyType type,
-                          const CORBA::Any& val,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          const CORBA::Any& val
+                          TAO_ENV_ARG_DECL)
 {
-  this->check_shutdown (ACE_TRY_ENV);
+  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   /// Attempt to obtain the policy from the policy factory registry.
   return
     this->orb_core_->policy_factory_registry ()->create_policy (type,
-                                                                val,
-                                                                ACE_TRY_ENV);
+                                                                val
+                                                                 TAO_ENV_ARG_PARAMETER);
 }
 
 // Destringify OMG-specified "IOR" string.
@@ -1693,8 +1700,8 @@ CORBA_ORB::create_policy (CORBA::PolicyType type,
 // implementations ...
 
 CORBA::Object_ptr
-CORBA_ORB::ior_string_to_object (const char *str,
-                                 CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::ior_string_to_object (const char *str
+                                 TAO_ENV_ARG_DECL)
 {
   // Unhex the bytes, and make a CDR deencapsulation stream from the
   // resulting data.
@@ -1752,8 +1759,8 @@ CORBA_ORB::ior_string_to_object (const char *str,
 // Convert an URL style IOR in an object
 
 CORBA::Object_ptr
-CORBA_ORB::url_ior_string_to_object (const char* str,
-                                     CORBA::Environment& ACE_TRY_ENV)
+CORBA_ORB::url_ior_string_to_object (const char* str
+                                     TAO_ENV_ARG_DECL)
 {
   TAO_MProfile mprofile;
   // It is safe to declare this on the stack since the contents of
@@ -1764,8 +1771,8 @@ CORBA_ORB::url_ior_string_to_object (const char* str,
 
   int retv =
     this->orb_core_->connector_registry ()->make_mprofile (str,
-                                                           mprofile,
-                                                           ACE_TRY_ENV);
+                                                           mprofile
+                                                            TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (CORBA::Object::_nil ());   // Return nil.
 
@@ -1781,8 +1788,8 @@ CORBA_ORB::url_ior_string_to_object (const char* str,
 
   // Now make the TAO_Stub.
   TAO_Stub *data = this->orb_core_->create_stub ((char *) 0,
-                                                 mprofile,
-                                                 ACE_TRY_ENV);
+                                                 mprofile
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   TAO_Stub_Auto_Ptr safe_objdata (data);
@@ -1864,8 +1871,8 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
 CORBA::ValueFactory_ptr
 CORBA_ORB::register_value_factory (
                             const char *repository_id,
-                            CORBA::ValueFactory_ptr factory,
-                            CORBA_Environment &ACE_TRY_ENV)
+                            CORBA::ValueFactory_ptr factory
+                            TAO_ENV_ARG_DECL)
 {
 // %! guard, and ACE_Null_Mutex in the map
 // do _add_ref here not in map->rebind
@@ -1893,16 +1900,16 @@ CORBA_ORB::register_value_factory (
 }
 
 void
-CORBA_ORB::unregister_value_factory (const char * /* repository_id */,
-                                     CORBA_Environment &)
+CORBA_ORB::unregister_value_factory (const char * /* repository_id */
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_ERROR((LM_ERROR, ACE_TEXT ("(%N:%l) function not implemented\n")));
   // %! TODO
 }
 
 CORBA::ValueFactory_ptr
-CORBA_ORB::lookup_value_factory (const char *repository_id,
-                                 CORBA_Environment &)
+CORBA_ORB::lookup_value_factory (const char *repository_id
+                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
 // %! guard
 // do _add_ref here not in map->find
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index e7d5831da9e..f19eddea896 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -87,10 +87,10 @@ public:
 
     virtual void _raise (void);
 
-    virtual void _tao_encode (TAO_OutputCDR &cdr,
-                              CORBA::Environment &) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr,
-                              CORBA::Environment &);
+    virtual void _tao_encode (TAO_OutputCDR &cdr
+                              TAO_ENV_ARG_DECL_NOT_USED) const;
+    virtual void _tao_decode (TAO_InputCDR &cdr
+                              TAO_ENV_ARG_DECL_NOT_USED);
 
     /// = TAO extension
     static InvalidName* _downcast (CORBA_Exception *ex);
@@ -122,9 +122,8 @@ public:
    * Typically these strings are created using <object_to_string()>,
    * but not necessarily locally.
    */
-  CORBA::Object_ptr string_to_object (const char *str,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  CORBA::Object_ptr string_to_object (const char *str
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Turn an object reference into a string.  Each type of ORB,
@@ -133,25 +132,21 @@ public:
    * this is typically eventually given to <string_to_object()> as an
    * argument.
    */
-  char * object_to_string (CORBA::Object_ptr obj,
-                           CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ());
+  char * object_to_string (CORBA::Object_ptr obj
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 #ifdef TAO_HAS_VALUETYPE
   // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
   CORBA::ValueFactory_ptr register_value_factory (
          const char *repository_id,
-         CORBA::ValueFactory_ptr factory,
-         CORBA_Environment &ACE_TRY_ENV =
-             TAO_default_environment () );
-  void unregister_value_factory (const char * repository_id,
-                                 CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment () );
+         CORBA::ValueFactory_ptr factory
+         TAO_ENV_ARG_DECL_WITH_DEFAULTS );
+  void unregister_value_factory (const char * repository_id
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS );
   CORBA::ValueFactory_ptr lookup_value_factory (
-         const char *repository_id,
-         CORBA_Environment &ACE_TRY_ENV =
-             TAO_default_environment () );
+         const char *repository_id
+         TAO_ENV_ARG_DECL_WITH_DEFAULTS );
 #endif /* TAO_HAS_VALUETYPE */
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -164,145 +159,123 @@ public:
   typedef CORBA_ORB_RequestSeq_out RequestSeq_out;
 
   void create_list (CORBA::Long count,
-                    CORBA::NVList_ptr &new_list,
-                    CORBA_Environment &ACE_TRY_ENV =
-                        TAO_default_environment ());
+                    CORBA::NVList_ptr &new_list
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void create_named_value (CORBA::NamedValue_ptr &nmval,
-                           CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ());
+  void create_named_value (CORBA::NamedValue_ptr &nmval
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void create_exception_list (CORBA::ExceptionList_ptr &exclist,
-                              CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+  void create_exception_list (CORBA::ExceptionList_ptr &exclist
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void create_environment (CORBA::Environment_ptr &new_env,
-                           CORBA_Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  void create_environment (CORBA::Environment_ptr &new_env
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // The following are not implemented and just throw
   // CORBA::NO_IMPLEMENT.
 
-  void create_context_list (CORBA::ContextList_ptr &ctxtlist,
-                            CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+  void create_context_list (CORBA::ContextList_ptr &ctxtlist
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void get_default_context (CORBA::Context_ptr &ctx,
-                            CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+  void get_default_context (CORBA::Context_ptr &ctx
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Boolean get_service_information (CORBA::ServiceType service_type,
-                                          CORBA::ServiceInformation_out service_information,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+                                          CORBA::ServiceInformation_out service_information
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &req ,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
+  void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &req
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &req,
-                                        CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &req
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void get_next_response (CORBA_Request_ptr &req,
-                          CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+  void get_next_response (CORBA_Request_ptr &req
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::Boolean poll_next_response (CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
+  CORBA::Boolean poll_next_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// The ORB TypeCode creation functions.
 
   CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_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::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_interface_tc (
       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));
 
   CORBA::TypeCode_ptr create_string_tc (
-      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 create_wstring_tc (
-      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 create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::UShort scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_value_tc (
@@ -310,51 +283,45 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA::ValueMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const CORBA::ValueMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr boxed_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_native_tc (
       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));
 
   CORBA::TypeCode_ptr create_recursive_tc (
-      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::TypeCode_ptr create_abstract_interface_tc (
       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));
 
 
   CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
-      const char *ame,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const char *ame
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -367,7 +334,7 @@ public:
    * If an error occurs during initialization or at run-time, a CORBA
    * system exception will be thrown.
    */
-  void run (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Instructs the ORB to initialize itself and run its event loop in
@@ -377,8 +344,8 @@ public:
    * exception will be thrown.  <tv> is reduced by the amount of time
    * spent in this call.
    **/
-  void run (ACE_Time_Value &tv,
-            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void run (ACE_Time_Value &tv
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Instructs the ORB to initialize itself and run its event loop in
@@ -390,20 +357,18 @@ public:
    * infinite.  If <tv> is ACE_Time_Value::zero, it specifies to poll
    * and does not block.
    **/
-  void run (ACE_Time_Value *tv,
-            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void run (ACE_Time_Value *tv
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns an indication of whether the ORB needs to perform some
   /// work.
-  CORBA::Boolean work_pending (CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ());
+  CORBA::Boolean work_pending (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns an indication of whether the ORB needs to perform some work
   /// but will look for work pending for no more than the specified time.
   /// This is useful for implementing an event loop with an idle timeout.
-  CORBA::Boolean work_pending (ACE_Time_Value &tv,
-                               CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ());
+  CORBA::Boolean work_pending (ACE_Time_Value &tv
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * This operation performs an implementation-defined unit of work.
@@ -411,14 +376,11 @@ public:
    * not present; this behavior can be modified by passing an
    * appropriate <ACE_Time_Value> as described in run().
    **/
-  void perform_work (CORBA_Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  void perform_work (ACE_Time_Value &,
-                     CORBA_Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  void perform_work (ACE_Time_Value *,
-                     CORBA_Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  void perform_work (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void perform_work (ACE_Time_Value &
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  void perform_work (ACE_Time_Value *
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * This operation instructs the ORB to shut down. Shutting down the
@@ -428,8 +390,8 @@ public:
    * deactivation or other operations associated with object adapters)
    * has completed.
    */
-  void shutdown (CORBA::Boolean wait_for_completion = 0,
-                 CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void shutdown (CORBA::Boolean wait_for_completion = 0
+                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Explicitly destroy the ORB, releasing any resources.  Note that
@@ -442,11 +404,10 @@ public:
    * The results of multi-threaded applications, trying to destroy ()
    * the ORB in one thread and trying to service a request in another
    * thread are not well defined. TAO does not support such cases.  */
-  void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA_Object_ptr resolve_initial_references (const char *name,
-                                               CORBA_Environment &ACE_TRY_ENV =
-                                               TAO_default_environment ());
+  CORBA_Object_ptr resolve_initial_references (const char *name
+                                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * This method acts as a mini-bootstrapping Naming Service, which is
@@ -463,31 +424,28 @@ public:
    * <resolve_initial_references> specification.
    */
   CORBA_Object_ptr resolve_initial_references (const char *name,
-                                               ACE_Time_Value *timeout,
-                                               CORBA_Environment &ACE_TRY_ENV =
-                                               TAO_default_environment ());
+                                               ACE_Time_Value *timeout
+                                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns a sequence of ObjectIds that lists which objects have
   /// references available via the initial references mechanism.
   CORBA_ORB_ObjectIdList_ptr list_initial_services (
-              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any& val,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ());
+                                   const CORBA::Any& val
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // ----------------------------------------------------------------
   // = TAO-specific extensions to the CORBA specification.
   // ----------------------------------------------------------------
 
   /// Resolve the POA.
-  CORBA_Object_ptr resolve_root_poa (CORBA_Environment &ACE_TRY_ENV);
+  CORBA_Object_ptr resolve_root_poa (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Initialize the ORB globals correctly, i.e., only when they
   /// haven't been initialized yet.
-  static void init_orb_globals (CORBA_Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ());
+  static void init_orb_globals (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // The function used by tao to handle the "unexpected" exceptions,
   // It raises CORBA::UNKNOWN.
@@ -531,31 +489,31 @@ protected:
   ~CORBA_ORB (void);
 
   /// Resolve the POA current.
-  CORBA_Object_ptr resolve_poa_current (CORBA_Environment &ACE_TRY_ENV);
+  CORBA_Object_ptr resolve_poa_current (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the Policy Manager for this ORB.
-  CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&);
+  CORBA_Object_ptr resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Resolve the Policy Current for this thread.
-  CORBA_Object_ptr resolve_policy_current (CORBA::Environment&);
+  CORBA_Object_ptr resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
 
   /// Resolve the given service based on the service ID.
   CORBA_Object_ptr resolve_service (MCAST_SERVICEID service_id,
-                                    ACE_Time_Value *timeout,
-                                    CORBA::Environment& ACE_TRY_ENV);
+                                    ACE_Time_Value *timeout
+                                    TAO_ENV_ARG_DECL);
 
   /// Convert an OMG IOR into an object reference.
-  CORBA::Object_ptr ior_string_to_object (const char* ior,
-                                          CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr ior_string_to_object (const char* ior
+                                          TAO_ENV_ARG_DECL);
 
   /// Convert an URL style IOR into an object reference.
-  CORBA::Object_ptr url_ior_string_to_object (const char* ior,
-                                              CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr url_ior_string_to_object (const char* ior
+                                              TAO_ENV_ARG_DECL);
 
   /// Check if ORB has shutdown.  If it has, throw an exception.
-  void check_shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void check_shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// lock required for mutual exclusion between multiple threads.
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
index eed397c2587..ef8173d34cc 100644
--- a/TAO/tao/ORBInitInfo.cpp
+++ b/TAO/tao/ORBInitInfo.cpp
@@ -34,10 +34,10 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
 }
 
 CORBA::StringSeq *
-TAO_ORBInitInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORBInitInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // In accordance with the C++ mapping for sequences, it is up to the
@@ -65,10 +65,10 @@ TAO_ORBInitInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
 }
 
 char *
-TAO_ORBInitInfo::orb_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORBInitInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // In accordance with the C++ mapping for strings, return a copy.
@@ -77,7 +77,7 @@ TAO_ORBInitInfo::orb_id (CORBA::Environment &ACE_TRY_ENV)
 }
 
 IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORBInitInfo::codec_factory (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The CodecFactory is stateless and reentrant, so share a single
@@ -108,12 +108,12 @@ TAO_ORBInitInfo::codec_factory (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_ORBInitInfo::register_initial_reference (
     const char * id,
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (id == 0)
@@ -124,18 +124,18 @@ TAO_ORBInitInfo::register_initial_reference (
 
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
 
-  table.register_initial_reference (id, obj, ACE_TRY_ENV);
+  table.register_initial_reference (id, obj TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Object_ptr
 TAO_ORBInitInfo::resolve_initial_references (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (id == 0)
@@ -149,23 +149,23 @@ TAO_ORBInitInfo::resolve_initial_references (
   // is reached so just use the ORB's resolve_initial_references()
   // mechanism.
   return
-    this->orb_core_->orb ()->resolve_initial_references (id,
-                                                         ACE_TRY_ENV);
+    this->orb_core_->orb ()->resolve_initial_references (id
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    CORBA::Environment &ACE_TRY_ENV)
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core_->add_interceptor (interceptor,
-                                    ACE_TRY_ENV);
+  this->orb_core_->add_interceptor (interceptor
+                                     TAO_ENV_ARG_PARAMETER);
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_THROW (CORBA::NO_IMPLEMENT (
@@ -178,17 +178,17 @@ TAO_ORBInitInfo::add_client_request_interceptor (
 
 void
 TAO_ORBInitInfo::add_server_request_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-    CORBA::Environment &ACE_TRY_ENV)
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core_->add_interceptor (interceptor,
-                                    ACE_TRY_ENV);
+  this->orb_core_->add_interceptor (interceptor
+                                     TAO_ENV_ARG_PARAMETER);
 
 #else
   ACE_UNUSED_ARG (interceptor);
@@ -202,23 +202,23 @@ TAO_ORBInitInfo::add_server_request_interceptor (
 
 void
 TAO_ORBInitInfo::add_ior_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor,
-    CORBA::Environment &ACE_TRY_ENV)
+    PortableInterceptor::IORInterceptor_ptr interceptor
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core_->add_interceptor (interceptor,
-                                    ACE_TRY_ENV);
+  this->orb_core_->add_interceptor (interceptor
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::SlotId
-TAO_ORBInitInfo::allocate_slot_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORBInitInfo::allocate_slot_id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -236,27 +236,27 @@ TAO_ORBInitInfo::allocate_slot_id (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_ORBInitInfo::register_policy_factory (
     CORBA::PolicyType type,
-    PortableInterceptor::PolicyFactory_ptr policy_factory,
-    CORBA::Environment &ACE_TRY_ENV)
+    PortableInterceptor::PolicyFactory_ptr policy_factory
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PolicyFactory_Registry *registry =
     this->orb_core_->policy_factory_registry ();
 
   registry->register_policy_factory (type,
-                                     policy_factory,
-                                     ACE_TRY_ENV);
+                                     policy_factory
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 size_t
-TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (ACE_TRY_ENV);
+  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   size_t slot_id = 0;
@@ -276,7 +276,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup,
 }
 
 void
-TAO_ORBInitInfo::check_validity (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORBInitInfo::check_validity (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->orb_core_ == 0)
     {
@@ -292,16 +292,16 @@ TAO_ORBInitInfo::check_validity (CORBA_Environment &ACE_TRY_ENV)
 }
 
 TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO_ORBInitInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return TAO_ORBInitInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -389,11 +389,11 @@ tao_TAO_ORBInitInfo_nil (
 
 TAO_ORBInitInfo_ptr
 tao_TAO_ORBInitInfo_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO_ORBInitInfo::_narrow (p, ACE_TRY_ENV);
+  return TAO_ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -516,11 +516,11 @@ TAO_ORBInitInfo_var::nil (void)
 
 TAO_ORBInitInfo_ptr
 TAO_ORBInitInfo_var::narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::TAO_ORBInitInfo::_narrow (p, ACE_TRY_ENV);
+  return ::TAO_ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
index 09763397449..c73143cf756 100644
--- a/TAO/tao/ORBInitInfo.h
+++ b/TAO/tao/ORBInitInfo.h
@@ -79,18 +79,18 @@ public:
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
   virtual CORBA::StringSeq * arguments (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ORBid for the ORB currently being initialized.
   virtual char * orb_id (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
   virtual IOP::CodecFactory_ptr codec_factory (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a mapping between a string and a corresponding object
@@ -105,8 +105,8 @@ public:
    */
   virtual void register_initial_reference (
       const char * id,
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
@@ -114,47 +114,47 @@ public:
   /// via the usual CORBA::ORB::resolve_initial_references() mechanism
   /// since the ORB may not be fully initialized yet.
   virtual CORBA::Object_ptr resolve_initial_references (
-      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,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
   /// Register a client request interceptor with the ORB currently
   /// being initialized.
   virtual void add_client_request_interceptor (
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
   /// Register a server request interceptor with the ORB currently
   /// being initialized.
   virtual void add_server_request_interceptor (
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
   /// Register an IOR interceptor with the ORB currently being
   /// initialized.
   virtual void add_ior_interceptor (
-      PortableInterceptor::IORInterceptor_ptr interceptor,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      PortableInterceptor::IORInterceptor_ptr interceptor
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
   virtual PortableInterceptor::SlotId allocate_slot_id (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a policy factory of the given policy type with the ORB
   /// currently being initialized.
   virtual void register_policy_factory (
       CORBA::PolicyType type,
-      PortableInterceptor::PolicyFactory_ptr policy_factory,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      PortableInterceptor::PolicyFactory_ptr policy_factory
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -177,8 +177,8 @@ public:
    * be registered.
    */
   size_t allocate_tss_slot_id (
-      ACE_CLEANUP_FUNC cleanup,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      ACE_CLEANUP_FUNC cleanup
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a pointer to the ORB Core associated with the ORB being
@@ -205,16 +205,14 @@ public:
   static TAO_ORBInitInfo_ptr _duplicate (TAO_ORBInitInfo_ptr obj);
 
   static TAO_ORBInitInfo_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static TAO_ORBInitInfo_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static TAO_ORBInitInfo_ptr _nil (void)
     {
@@ -235,7 +233,7 @@ protected:
   /// Check if this ORBInitInfo instance is valid.  Once post_init()
   /// has been called on each of the ORBInitializers, this ORBInitInfo
   /// is no longer valid.  Throw an exception in that case.
-  void check_validity (CORBA::Environment &ACE_TRY_ENV);
+  void check_validity (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -294,8 +292,8 @@ public:
   static void release (TAO_ORBInitInfo_ptr);
   static TAO_ORBInitInfo_ptr nil (void);
   static TAO_ORBInitInfo_ptr narrow (
-      CORBA::Object *,
-      CORBA::Environment &
+      CORBA::Object *
+      TAO_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * upcast (void *);
 
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index ec471b97583..8ffb366b552 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -16,8 +16,8 @@ ACE_RCSID(tao, ORBInitializer_Registry, "$Id$")
 
 void
 PortableInterceptor::register_orb_initializer (
-  PortableInterceptor::ORBInitializer_ptr init,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitializer_ptr init
+  TAO_ENV_ARG_DECL)
 {
   // Using ACE_Static_Object_Lock::instance() precludes
   // <register_orb_initializer> from being called within a static
@@ -33,15 +33,15 @@ PortableInterceptor::register_orb_initializer (
                   ACE_TEXT ("Unable to pre-initialize TAO\n")));
     }
 
-  CORBA_ORB::init_orb_globals (ACE_TRY_ENV);
+  CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Make sure the following is done after the global ORB
   // initialization since we need to have exceptions initialized.
 
   TAO_ORBInitializer_Registry::instance ()->register_orb_initializer (
-    init,
-    ACE_TRY_ENV);
+    init
+     TAO_ENV_ARG_PARAMETER);
 }
 
 // ------------------------------------------------------------------
@@ -60,8 +60,8 @@ TAO_ORBInitializer_Registry::~TAO_ORBInitializer_Registry (void)
 
 void
 TAO_ORBInitializer_Registry::register_orb_initializer (
-  PortableInterceptor::ORBInitializer_ptr init,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitializer_ptr init
+  TAO_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (init))
     {
@@ -88,10 +88,9 @@ TAO_ORBInitializer_Registry::register_orb_initializer (
 
 void
 TAO_ORBInitializer_Registry::pre_init (
-  PortableInterceptor::ORBInitInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
-  ACE_UNUSED_ARG(ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
   size_t initializer_count = this->initializers_.size ();
   for (size_t i = 0; i < initializer_count; ++i)
     {
@@ -103,10 +102,9 @@ TAO_ORBInitializer_Registry::pre_init (
 
 void
 TAO_ORBInitializer_Registry::post_init (
-  PortableInterceptor::ORBInitInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
-  ACE_UNUSED_ARG(ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
   size_t initializer_count = this->initializers_.size ();
   for (size_t i = 0; i < initializer_count; ++i)
     {
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index acfaae8175f..fe424016056 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -35,8 +35,8 @@ class TAO_Export TAO_ORBInitializer_Registry
 {
   friend class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>;
   friend void PortableInterceptor::register_orb_initializer (
-                  PortableInterceptor::ORBInitializer_ptr init,
-                                  CORBA::Environment &);
+                  PortableInterceptor::ORBInitializer_ptr init
+                                  TAO_ENV_ARG_DECL_NOT_USED);
   friend CORBA::ORB_ptr CORBA::ORB_init (int &,
                                          char *argv[],
                                          const char *,
@@ -54,18 +54,18 @@ protected:
   ///< Register an ORBInitializer with the underlying ORBInitializer
   ///< array.
   void register_orb_initializer (
-    PortableInterceptor::ORBInitializer_ptr init,
-    CORBA::Environment &ACE_TRY_ENV);
+    PortableInterceptor::ORBInitializer_ptr init
+    TAO_ENV_ARG_DECL);
 
   /// Begin initialization of all registered ORBInitializers before
   /// the ORB itself is initialized.
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
+                 TAO_ENV_ARG_DECL);
 
   /// Complete initialization of all registered ORBInitializers after
   /// the ORB has been initialized.
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info,
-                  CORBA::Environment &ACE_TRY_ENV);
+  void post_init (PortableInterceptor::ORBInitInfo_ptr info
+                  TAO_ENV_ARG_DECL);
 
   /// Return a unique singleton instance.
   static TAO_ORBInitializer_Registry *instance (void);
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 87f09cfc238..ba4c58526b8 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -57,7 +57,7 @@ ACE_RCSID(tao, ORB_Core, "$Id$")
 
 // ****************************************************************
 
-CORBA::Environment &
+CORBA::Environment&
 TAO_default_environment ()
 {
   return *TAO_TSS_RESOURCES::instance ()->default_environment_;
@@ -240,7 +240,7 @@ TAO_ORB_Core::default_buffering_constraint (void) const
 
 
 int
-TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL)
 {
   // Right now, this code expects to begin parsing in argv[1] rather
   // than argv[0].  I don't think that's wise.  I think we need to
@@ -1031,10 +1031,10 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   // registries!
 
   // Set ORB-level policy defaults.
-  TAO_Protocols_Hooks *tph = this->get_protocols_hooks (ACE_TRY_ENV);
+  TAO_Protocols_Hooks *tph = this->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  int status = tph->set_default_policies (ACE_TRY_ENV);
+  int status = tph->set_default_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (status != 0)
@@ -1063,7 +1063,7 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 
   // Look for BiDirectional library here. If the user has svc.conf
   // file, load the library at this point.
-  int ret = this->bidirectional_giop_init (ACE_TRY_ENV);
+  int ret = this->bidirectional_giop_init (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ret == -1)
@@ -1086,8 +1086,8 @@ TAO_ORB_Core::fini (void)
   ACE_TRY_NEW_ENV
     {
       // Shutdown the ORB and block until the shutdown is complete.
-      this->shutdown (1,
-                      ACE_TRY_ENV);
+      this->shutdown (1
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1315,7 +1315,7 @@ TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks)
 }
 
 TAO_Protocols_Hooks *
-TAO_ORB_Core::get_protocols_hooks (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Check if there is a cached reference.
   if (this->protocols_hooks_ != 0)
@@ -1327,14 +1327,14 @@ TAO_ORB_Core::get_protocols_hooks (CORBA::Environment &ACE_TRY_ENV)
     (TAO_ORB_Core::protocols_hooks_name_);
 
   // Initialize the protocols hooks instance.
-  this->protocols_hooks_->init_hooks (this,
-                                      ACE_TRY_ENV);
+  this->protocols_hooks_->init_hooks (this
+                                       TAO_ENV_ARG_PARAMETER);
 
   return this->protocols_hooks_;
 }
 
 int
-TAO_ORB_Core::bidirectional_giop_init (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->bidir_adapter_ == 0)
     {
@@ -1345,20 +1345,20 @@ TAO_ORB_Core::bidirectional_giop_init (CORBA::Environment &ACE_TRY_ENV)
   if (this->bidir_adapter_)
     return this->bidir_adapter_->activate (this->orb_.in (),
                                            0,
-                                           0,
-                                           ACE_TRY_ENV);
+                                           0
+                                            TAO_ENV_ARG_PARAMETER);
   else
     return 0;
 }
 
 int
-TAO_ORB_Core::parse_bidir_policy (CORBA::Policy_ptr policy,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::parse_bidir_policy (CORBA::Policy_ptr policy
+                                  TAO_ENV_ARG_DECL)
 {
   if (this->bidir_adapter_)
     return this->bidir_adapter_->parse_policy (this,
-                                               policy,
-                                               ACE_TRY_ENV);
+                                               policy
+                                                TAO_ENV_ARG_PARAMETER);
   else
     // @@ The BiDirectional library hasn't been loaded. What do we do?
     // We are just returning an error which will be processd by the
@@ -1379,15 +1379,15 @@ TAO_ORB_Core::services_callbacks_init (void)
 
 int
 TAO_ORB_Core::service_raise_comm_failure (TAO_GIOP_Invocation *invoke,
-                                          TAO_Profile *profile,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          TAO_Profile *profile
+                                          TAO_ENV_ARG_DECL)
 {
   if (this->ft_service_.service_callback ())
     {
       return this->ft_service_.service_callback ()->
                  raise_comm_failure (invoke,
-                                     profile,
-                                     ACE_TRY_ENV);
+                                     profile
+                                      TAO_ENV_ARG_PARAMETER);
     }
 
   invoke->close_connection ();
@@ -1402,15 +1402,15 @@ TAO_ORB_Core::service_raise_comm_failure (TAO_GIOP_Invocation *invoke,
 
 int
 TAO_ORB_Core::service_raise_transient_failure (TAO_GIOP_Invocation *invoke,
-                                               TAO_Profile *profile,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               TAO_Profile *profile
+                                               TAO_ENV_ARG_DECL)
 {
   if (this->ft_service_.service_callback ())
     {
       return this->ft_service_.service_callback ()->
                  raise_transient_failure (invoke,
-                                          profile,
-                                          ACE_TRY_ENV);
+                                          profile
+                                           TAO_ENV_ARG_PARAMETER);
     }
 
   ACE_THROW_RETURN (CORBA::TRANSIENT (
@@ -1426,8 +1426,8 @@ void
 TAO_ORB_Core::service_context_list (
     TAO_Stub *stub,
     TAO_Service_Context &service_context,
-    CORBA::Boolean restart,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Boolean restart
+    TAO_ENV_ARG_DECL)
 {
   // @@ We look at the services if they are loaded. But if more
   // services offer this feature we may want to keep expanding the
@@ -1437,15 +1437,15 @@ TAO_ORB_Core::service_context_list (
     {
       this->ft_service_.service_callback ()->service_context_list (stub,
                                                                    service_context.service_info (),
-                                                                   restart,
-                                                                   ACE_TRY_ENV);
+                                                                   restart
+                                                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->protocols_hooks_->rt_service_context (stub,
                                               service_context,
-                                              restart,
-                                              ACE_TRY_ENV);
+                                              restart
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1495,7 +1495,7 @@ TAO_ORB_Core::inherit_from_parent_thread (
 }
 
 CORBA::Object_ptr
-TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::root_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->root_poa_.in ()))
     return CORBA::Object::_duplicate (this->root_poa_.in ());
@@ -1518,12 +1518,12 @@ TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV)
 
   // @@ Not exception safe
   TAO_Adapter *poa_adapter = factory->create (this);
-  poa_adapter->open (ACE_TRY_ENV);
+  poa_adapter->open (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   this->root_poa_ = poa_adapter->root ();
 
-  this->adapter_registry_.insert (poa_adapter, ACE_TRY_ENV);
+  this->adapter_registry_.insert (poa_adapter TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return CORBA::Object::_duplicate (this->root_poa_.in ());
@@ -1546,14 +1546,14 @@ TAO_ORB_Core::poa_adapter (void)
 
 TAO_Stub *
 TAO_ORB_Core::create_stub (const char *repository_id,
-                           const TAO_MProfile &profiles,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           const TAO_MProfile &profiles
+                           TAO_ENV_ARG_DECL)
 {
   TAO_Stub *retval =
     this->stub_factory ()->create_stub (repository_id,
                                         profiles,
-                                        this,
-                                        ACE_TRY_ENV);
+                                        this
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(0);
   return retval;
 }
@@ -1562,8 +1562,8 @@ TAO_ORB_Core::create_stub (const char *repository_id,
 TAO_Stub *
 TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
                                   const char *type_id,
-                                  CORBA::PolicyList *policy_list,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::PolicyList *policy_list
+                                  TAO_ENV_ARG_DECL)
 {
   // Add the Polices contained in "policy_list" to each profile so
   // that those policies will be exposed to the client in the IOR.  In
@@ -1581,7 +1581,7 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
         {
           // Get the ith profile
           profile = mprofile.get_profile (i);
-          profile->policies (policy_list, ACE_TRY_ENV);
+          profile->policies (policy_list TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
@@ -1589,11 +1589,11 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
   // for this servant.
-  this->establish_components (mprofile, policy_list, ACE_TRY_ENV);
+  this->establish_components (mprofile, policy_list TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Done creating profiles.  Initialize a TAO_Stub object with them.
-  TAO_Stub *stub = this->create_stub (type_id, mprofile, ACE_TRY_ENV);
+  TAO_Stub *stub = this->create_stub (type_id, mprofile TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (stub);
 
   stub->base_profiles ().policy_list (policy_list);
@@ -1603,8 +1603,8 @@ TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
 
 void
 TAO_ORB_Core::establish_components (TAO_MProfile &mp,
-                                    CORBA::PolicyList *policy_list,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::PolicyList *policy_list
+                                    TAO_ENV_ARG_DECL)
 {
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
@@ -1765,8 +1765,8 @@ TAO_ORB_Core::lf_strategy (void)
 
 int
 TAO_ORB_Core::run (ACE_Time_Value *tv,
-                   int perform_work,
-                   CORBA::Environment &)
+                   int perform_work
+                   TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level >= 3)
     ACE_DEBUG ((LM_DEBUG,
@@ -1862,17 +1862,17 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
 
 
 void
-TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
+                        TAO_ENV_ARG_DECL)
 {
   if (this->has_shutdown () == 0)
     {
-      this->adapter_registry_.check_close (wait_for_completion,
-                                           ACE_TRY_ENV);
+      this->adapter_registry_.check_close (wait_for_completion
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->adapter_registry_.close (wait_for_completion,
-                                     ACE_TRY_ENV);
+      this->adapter_registry_.close (wait_for_completion
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Set the shutdown flag
@@ -1892,7 +1892,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion,
         tm->wait ();
 
       // Invoke Interceptor::destroy() on all registered interceptors.
-      this->destroy_interceptors (ACE_TRY_ENV);
+      this->destroy_interceptors (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Explicitly destroy the object reference table since it
@@ -1903,7 +1903,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion,
 }
 
 void
-TAO_ORB_Core::destroy (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Core::destroy (TAO_ENV_SINGLE_ARG_DECL)
 {
   //
   // All destroy() should do is (a) call shutdown() and (b) unbind()
@@ -1920,7 +1920,7 @@ TAO_ORB_Core::destroy (CORBA_Environment &ACE_TRY_ENV)
   //
 
   // Shutdown the ORB and block until the shutdown is complete.
-  this->shutdown (1, ACE_TRY_ENV);
+  this->shutdown (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now remove it from the ORB table so that it's ORBid may be
@@ -1933,7 +1933,7 @@ TAO_ORB_Core::destroy (CORBA_Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_ORB_Core::destroy_interceptors (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL)
 {
   size_t len = 0;
 
@@ -1959,10 +1959,6 @@ TAO_ORB_Core::destroy_interceptors (CORBA::Environment &ACE_TRY_ENV)
     }
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-#ifdef TAO_HAS_EXCEPTIONS
-  ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
-#endif  /* TAO_HAS_EXCEPTIONS */
-
   TAO_IORInterceptor_List::TYPE &ior_interceptors =
     this->ior_interceptors_.interceptors ();
 
@@ -1981,7 +1977,7 @@ TAO_ORB_Core::lane_resources (void)
 }
 
 void
-TAO_ORB_Core::resolve_typecodefactory_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance ("TypeCodeFactory_Loader");
@@ -1995,11 +1991,11 @@ TAO_ORB_Core::resolve_typecodefactory_i (CORBA::Environment &ACE_TRY_ENV)
         ACE_THROW (CORBA::ORB::InvalidName ());
     }
   this->typecode_factory_ =
-    loader->create_object (this->orb_.in (), 0, 0, ACE_TRY_ENV);
+    loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_ORB_Core::resolve_dynanyfactory_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance ("DynamicAny_Loader");
@@ -2013,11 +2009,11 @@ TAO_ORB_Core::resolve_dynanyfactory_i (CORBA::Environment &ACE_TRY_ENV)
         ACE_THROW (CORBA::ORB::InvalidName ());
     }
   this->dynany_factory_ =
-    loader->create_object (this->orb_.in (), 0, 0, ACE_TRY_ENV);
+    loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_ORB_Core::resolve_iormanipulation_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance ("IORManip_Loader");
@@ -2032,11 +2028,11 @@ TAO_ORB_Core::resolve_iormanipulation_i (CORBA::Environment &ACE_TRY_ENV)
         ACE_THROW (CORBA::ORB::InvalidName ());
     }
   this->ior_manip_factory_ =
-    loader->create_object (this->orb_.in (), 0, 0, ACE_TRY_ENV);
+    loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_ORB_Core::resolve_ior_table_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Adapter_Factory *factory =
     ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_IORTable");
@@ -2052,18 +2048,18 @@ TAO_ORB_Core::resolve_ior_table_i (CORBA::Environment &ACE_TRY_ENV)
 
   // @@ Not exception safe
   TAO_Adapter *iortable_adapter = factory->create (this);
-  this->adapter_registry_.insert (iortable_adapter, ACE_TRY_ENV);
+  this->adapter_registry_.insert (iortable_adapter TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  iortable_adapter->open (ACE_TRY_ENV);
+  iortable_adapter->open (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->ior_table_ = iortable_adapter->root ();
 }
 
 CORBA::Object_ptr
-TAO_ORB_Core::resolve_rir (const char *name,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_rir (const char *name
+                           TAO_ENV_ARG_DECL)
 {
   // Get the table of initial references specified through
   // -ORBInitRef.
@@ -2072,7 +2068,7 @@ TAO_ORB_Core::resolve_rir (const char *name,
 
   // Is the service name in the IOR Table.
   if (this->init_ref_map_.find (object_id, ior) == 0)
-    return this->orb ()->string_to_object (ior.c_str (), ACE_TRY_ENV);
+    return this->orb ()->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER);
 
   // Get the list of initial reference prefixes specified through
   // -ORBDefaultInitRef.
@@ -2116,15 +2112,15 @@ TAO_ORB_Core::resolve_rir (const char *name,
 
       list_of_profiles += object_id;
 
-      return this->orb ()->string_to_object (list_of_profiles.c_str (),
-                                             ACE_TRY_ENV);
+      return this->orb ()->string_to_object (list_of_profiles.c_str ()
+                                              TAO_ENV_ARG_PARAMETER);
     }
 
   return CORBA::Object::_nil ();
 }
 
 CORBA::ORB::ObjectIdList_ptr
-TAO_ORB_Core::list_initial_references (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::list_initial_references (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Unsupported initial services should NOT be included in the below list!
   const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES };
@@ -2551,7 +2547,7 @@ TAO_ORB_Core::implrepo_service (void)
 
       ACE_TRY_NEW_ENV
         {
-          CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService", ACE_TRY_ENV);
+          CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ());
@@ -2818,10 +2814,10 @@ TAO_ORB_Core_instance (void)
           CORBA::ORB_var orb;
 
           int argc = 0;
-          ACE_DECLARE_NEW_CORBA_ENV;
+          TAO_ENV_DECLARE_NEW_ENV;
           ACE_TRY
             {
-              orb = CORBA::ORB_init (argc, 0, 0, ACE_TRY_ENV);
+              orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -2837,8 +2833,8 @@ TAO_ORB_Core_instance (void)
 
 
 int
-TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
+                                    TAO_ENV_ARG_DECL)
 {
 
   TAO_Stub *stub = object->_stubobj ();
@@ -2849,8 +2845,8 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object,
         stub->servant_orb_var ()->orb_core ();
 
       int collocated =
-        orb_core->collocation_resolver ().is_collocated (object,
-                                                         ACE_TRY_ENV);
+        orb_core->collocation_resolver ().is_collocated (object
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (collocated)
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 47621ec8385..cc9b7403a95 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -241,7 +241,7 @@ public:
   ACE_Thread_Manager *thr_mgr (void);
 
   /// Return the RootPOA, or try to load it if not initialized already.
-  CORBA::Object_ptr root_poa (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr root_poa (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Get the adapter registry
   TAO_Adapter_Registry *adapter_registry (void);
@@ -268,8 +268,8 @@ public:
    * @note
    * No-Collocation is a special case of collocation.
    */
-  static int collocation_strategy (CORBA::Object_ptr object,
-                                   CORBA::Environment &ACE_TRY_ENV);
+  static int collocation_strategy (CORBA::Object_ptr object
+                                   TAO_ENV_ARG_DECL);
   //@}
 
   /**
@@ -399,7 +399,7 @@ public:
                     const char *poa_factory_directive);
 
   /// Gets the value of TAO_ORB_Core::protocols_hooks__
-  TAO_Protocols_Hooks * get_protocols_hooks (CORBA::Environment &ACE_TRY_ENV);
+  TAO_Protocols_Hooks * get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_.
   static void dynamic_adapter_name (const char *name);
@@ -620,21 +620,21 @@ public:
 
   /// Run the event loop.
   int run (ACE_Time_Value *tv,
-           int perform_work,
-           CORBA::Environment &ACE_TRY_ENV);
+           int perform_work
+           TAO_ENV_ARG_DECL);
 
   /// End the event loop
-  void shutdown (CORBA::Boolean wait_for_completion,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (CORBA::Boolean wait_for_completion
+                 TAO_ENV_ARG_DECL);
 
   /// Get the shutdown flag value
   int has_shutdown (void);
 
   /// Shutdown the ORB and free resources
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Check if ORB has shutdown.  If it has, throw an exception.
-  void check_shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void check_shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Returns the <timeout> value used by the server threads to poll
   /// the shutdown flag. If the return value is zero then the server
@@ -645,23 +645,23 @@ public:
   /// based on the endpoint.
   TAO_Stub *create_stub_object (TAO_MProfile &mprofile,
                                 const char *type_id,
-                                CORBA::PolicyList *policy_list,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                CORBA::PolicyList *policy_list
+                                TAO_ENV_ARG_DECL);
 
   /// Factory method that create the "right" Stub depending on
   /// wheather RTCORBA is loaded or not. The factory used to create
   /// the stub, is loaded at ORB initialization, and its type depends
   /// on the fact that RTCORBA is being used or not.
   TAO_Stub *create_stub (const char *repository_id,
-                         const TAO_MProfile &profiles,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         const TAO_MProfile &profiles
+                         TAO_ENV_ARG_DECL);
 
 
   /// Give each registered IOR interceptor the opportunity to add
   /// tagged components to profiles of each created servant.
   void establish_components (TAO_MProfile &mp,
-                             CORBA::PolicyList *policy_list,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             CORBA::PolicyList *policy_list
+                             TAO_ENV_ARG_DECL);
 
   /// Create a new object, use the adapter registry to create a
   /// collocated object, if not possible then create a regular
@@ -678,30 +678,30 @@ public:
   //@}
 
   /// Resolve the TypeCodeFactory DLL.
-  CORBA::Object_ptr resolve_typecodefactory (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the Dynamic Any Factory
-  CORBA::Object_ptr resolve_dynanyfactory (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the IOR Manipulation reference for this ORB.
-  CORBA::Object_ptr resolve_ior_manipulation (CORBA::Environment&);
+  CORBA::Object_ptr resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Resolve the IOR Table reference for this ORB.
-  CORBA::Object_ptr resolve_ior_table (CORBA::Environment&);
+  CORBA::Object_ptr resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Resolve an initial reference via the -ORBInitRef and
   // -ORBDefaultInitRef options.
-  CORBA::Object_ptr resolve_rir (const char *name,
-                                 CORBA::Environment &);
+  CORBA::Object_ptr resolve_rir (const char *name
+                                 TAO_ENV_ARG_DECL_NOT_USED);
 
   /// Resolve the RT ORB reference for this ORB.
-  CORBA::Object_ptr resolve_rt_orb (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the RT Current flyweight for this ORB.
-  CORBA::Object_ptr resolve_rt_current (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL);
 
   /// List all the service known by the ORB
-  CORBA_ORB_ObjectIdList_ptr list_initial_references (CORBA::Environment &);
+  CORBA_ORB_ObjectIdList_ptr list_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Reference counting...
   CORBA::ULong _incr_refcnt (void);
@@ -759,8 +759,8 @@ public:
   /// whether they would like to add something to the list.
   void service_context_list (TAO_Stub *stub,
                              TAO_Service_Context &service_context,
-                             CORBA::Boolean retstart,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             CORBA::Boolean retstart
+                             TAO_ENV_ARG_DECL);
 
   /// Return a reference to the Fault Tolerant service object.
   TAO_Fault_Tolerance_Service &fault_tolerance_service (void);
@@ -769,15 +769,15 @@ public:
   /// delegate to the service to see what the service has to do for
   /// this case.
   int service_raise_comm_failure (TAO_GIOP_Invocation *invoke,
-                                  TAO_Profile *profile,
-                                  CORBA::Environment &ACE_TRY_ENV);
+                                  TAO_Profile *profile
+                                  TAO_ENV_ARG_DECL);
 
   /// Raise a transient failure exception if a service is not loaded,
   /// else delegate to the service to see what the service has to do
   /// for this case.
   int service_raise_transient_failure (TAO_GIOP_Invocation *invoke,
-                                       TAO_Profile *profile,
-                                       CORBA::Environment &ACE_TRY_ENV);
+                                       TAO_Profile *profile
+                                       TAO_ENV_ARG_DECL);
 
   /// Hook for logging of messages by the Logging & Recovery service
   /// of an FT service.
@@ -811,13 +811,13 @@ public:
 
   /// Register a client request interceptor.
   void add_interceptor (
-    PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-    CORBA_Environment &ACE_TRY_ENV);
+    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+    TAO_ENV_ARG_DECL);
 
   /// Register a server request interceptor.
   void add_interceptor (
-    PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-    CORBA_Environment &ACE_TRY_ENV);
+    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+    TAO_ENV_ARG_DECL);
 
   /// Return the array of client-side interceptors specific to this
   /// ORB.
@@ -833,16 +833,16 @@ public:
 
   /// Register an IOR interceptor.
   void add_interceptor (
-    PortableInterceptor::IORInterceptor_ptr interceptor,
-    CORBA_Environment &ACE_TRY_ENV);
+    PortableInterceptor::IORInterceptor_ptr interceptor
+    TAO_ENV_ARG_DECL);
 
   /// Return the array of IOR interceptors specific to this ORB.
   TAO_IORInterceptor_List::TYPE & ior_interceptors (void);
   //@}
 
   /// Call the bidir_giop library to parse the policy.
-  int parse_bidir_policy (CORBA::Policy_ptr policy,
-                          CORBA::Environment &ACE_TRY_ENV);
+  int parse_bidir_policy (CORBA::Policy_ptr policy
+                          TAO_ENV_ARG_DECL);
 
   /// Set and Get methods to indicate whether a BiDir IIOP policy has
   /// been set in the POA.
@@ -874,7 +874,7 @@ protected:
 
   /// Initialize the guts of the ORB Core.  It is intended that this be
   /// called by <CORBA::ORB_init>.
-  int init (int &argc, char **argv, CORBA::Environment &ACE_TRY_ENV);
+  int init (int &argc, char **argv TAO_ENV_ARG_DECL);
 
   /// Final termination hook, typically called by CORBA::ORB's
   /// destructor.
@@ -895,17 +895,17 @@ protected:
                                        ACE_Lock *lock);
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_typecodefactory_i (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_dynanyfactory_i (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Obtain and cache the IORManipulation factory object reference.
-  void resolve_iormanipulation_i (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Search the Dynamic service list for BiDirectional options that
   /// can be dynamically loaded.
-  int bidirectional_giop_init (CORBA::Environment &ACE_TRY_ENV);
+  int bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Search the Dynamic service list for well known services that has
   /// callbacks  which can be dynamically loaded.
@@ -913,7 +913,7 @@ protected:
 
   /// Helper method that invokes Interceptor::destroy() on all
   /// registered interceptors when ORB::destroy() is called.
-  void destroy_interceptors (CORBA::Environment &ACE_TRY_ENV);
+  void destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -924,7 +924,7 @@ private:
   //@}
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_ior_table_i (CORBA::Environment &ACE_TRY_ENV);
+  void resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Try to create a new collocated object, using <other_orb> as the
   /// target ORB.  If not possible return 0.
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 7b4e6ad56fe..1af755111c7 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -351,7 +351,7 @@ TAO_ORB_Core::has_shutdown (void)
 }
 
 ACE_INLINE void
-TAO_ORB_Core::check_shutdown (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Core::check_shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->has_shutdown ())
     {
@@ -385,52 +385,52 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_typecodefactory (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->typecode_factory_))
     {
-      this->resolve_typecodefactory_i (ACE_TRY_ENV);
+      this->resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->typecode_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_dynanyfactory (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->dynany_factory_))
     {
-      this->resolve_dynanyfactory_i (ACE_TRY_ENV);
+      this->resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->dynany_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_manipulation (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_manip_factory_))
     {
-      this->resolve_iormanipulation_i (ACE_TRY_ENV);
+      this->resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->ior_manip_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_table (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_table_))
     {
-      this->resolve_ior_table_i (ACE_TRY_ENV);
+      this->resolve_ior_table_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->ior_table_);
@@ -481,7 +481,7 @@ TAO_ORB_Core::poa_current (void)
         {
           // @@ This is a hack.  FIXME!
           // This forces the POACurrent to be initialized.
-          CORBA::Object_var root = this->root_poa (ACE_TRY_ENV);
+          CORBA::Object_var root = this->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -525,7 +525,7 @@ TAO_ORB_Core::default_environment (CORBA_Environment *env)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_orb (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->rt_orb_.in ()))
     {
@@ -536,8 +536,8 @@ TAO_ORB_Core::resolve_rt_orb (CORBA::Environment &ACE_TRY_ENV)
           // Save a reference to the priority mapping manager.
           this->rt_orb_ =
               this->object_ref_table ().resolve_initial_references (
-              TAO_OBJID_RTORB,
-              ACE_TRY_ENV);
+              TAO_OBJID_RTORB
+               TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Object::_nil ());
         }
     }
@@ -546,7 +546,7 @@ TAO_ORB_Core::resolve_rt_orb (CORBA::Environment &ACE_TRY_ENV)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_current (CORBA::Environment &ACE_TRY_ENV)
+TAO_ORB_Core::resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->rt_current_.in ()))
     {
@@ -557,8 +557,8 @@ TAO_ORB_Core::resolve_rt_current (CORBA::Environment &ACE_TRY_ENV)
           // Save a reference to the priority mapping manager.
           this->rt_current_ =
               this->object_ref_table ().resolve_initial_references (
-              TAO_OBJID_RTCURRENT,
-              ACE_TRY_ENV);
+              TAO_OBJID_RTCURRENT
+               TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Object::_nil ());
         }
     }
@@ -586,20 +586,20 @@ TAO_ORB_Core::pi_current (TAO_PICurrent *current)
 
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
-   PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-   CORBA_Environment &ACE_TRY_ENV)
+   PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+   TAO_ENV_ARG_DECL)
 {
-  this->client_request_interceptors_.add_interceptor (interceptor,
-                                                      ACE_TRY_ENV);
+  this->client_request_interceptors_.add_interceptor (interceptor
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
-   PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-   CORBA_Environment &ACE_TRY_ENV)
+   PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+   TAO_ENV_ARG_DECL)
 {
-  this->server_request_interceptors_.add_interceptor (interceptor,
-                                                      ACE_TRY_ENV);
+  this->server_request_interceptors_.add_interceptor (interceptor
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 // ------
@@ -625,11 +625,11 @@ TAO_ORB_Core::server_request_interceptors (void)
 
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
-   PortableInterceptor::IORInterceptor_ptr interceptor,
-   CORBA_Environment &ACE_TRY_ENV)
+   PortableInterceptor::IORInterceptor_ptr interceptor
+   TAO_ENV_ARG_DECL)
 {
-  this->ior_interceptors_.add_interceptor (interceptor,
-                                           ACE_TRY_ENV);
+  this->ior_interceptors_.add_interceptor (interceptor
+                                            TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_IORInterceptor_List::TYPE &
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index c4bc05bad4c..0c0db0bd8da 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -84,8 +84,8 @@ CORBA_Object::_servant (void) const
 // logical type ID is passed as a parameter.
 
 CORBA::Boolean
-CORBA_Object::_is_a (const char *type_id,
-                     CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_is_a (const char *type_id
+                     TAO_ENV_ARG_DECL)
 {
   // NOTE: if istub->type_id is nonzero and we have local knowledge of
   // it, we can answer this question without a costly remote call.
@@ -115,11 +115,11 @@ CORBA_Object::_is_a (const char *type_id,
 
   // Get the right Proxy Implementation.
   TAO_Object_Proxy_Impl &the_proxy =
-    this->proxy_broker_->select_proxy (this, ACE_TRY_ENV);
+    this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Preform the Call.
-  _tao_retval = the_proxy._is_a (this, type_id, ACE_TRY_ENV);
+  _tao_retval = the_proxy._is_a (this, type_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return _tao_retval;
@@ -147,11 +147,11 @@ CORBA_Object::_is_local (void) const
 // create hash tables.
 
 CORBA::ULong
-CORBA_Object::_hash (CORBA::ULong maximum,
-                     CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_hash (CORBA::ULong maximum
+                     TAO_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_ != 0)
-    return this->protocol_proxy_->hash (maximum, ACE_TRY_ENV);
+    return this->protocol_proxy_->hash (maximum TAO_ENV_ARG_PARAMETER);
   else
     // @@ I really don't know how to support this for
     //    a locality constrained object.  -- nw.
@@ -165,8 +165,8 @@ CORBA_Object::_hash (CORBA::ULong maximum,
 // such as strcmp(), to allow more comparison algorithms.
 
 CORBA::Boolean
-CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
-                              CORBA::Environment &)
+CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC (())
 {
   if (other_obj == this)
@@ -183,7 +183,7 @@ CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj,
 // TAO's extensions
 
 TAO_ObjectKey *
-CORBA::Object::_key (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Object::_key (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->_stubobj () && this->_stubobj ()->profile_in_use ())
     return this->_stubobj ()->profile_in_use ()->_key ();
@@ -254,8 +254,8 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                                CORBA::NVList_ptr arg_list,
                                CORBA::NamedValue_ptr result,
                                CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Flags req_flags
+                               TAO_ENV_ARG_DECL)
 {
   // Since we don't really support Context, anything but a null pointer
   // is a no-no.
@@ -279,8 +279,8 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                        result,
                        0,
                        request,
-                       req_flags,
-                       ACE_TRY_ENV
+                       req_flags
+                        TAO_ENV_ARG_PARAMETER
                      );
 }
 
@@ -292,8 +292,8 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::ContextList_ptr,
                                CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Flags req_flags
+                               TAO_ENV_ARG_DECL)
 {
   // Since we don't really support Context, anything but a null pointer
   // is a no-no.
@@ -317,14 +317,14 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                        result,
                        exceptions,
                        request,
-                       req_flags,
-                       ACE_TRY_ENV
+                       req_flags
+                        TAO_ENV_ARG_PARAMETER
                      );
 }
 
 CORBA::Request_ptr
-CORBA_Object::_request (const char *operation,
-                        CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_request (const char *operation
+                        TAO_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
     {
@@ -336,8 +336,8 @@ CORBA_Object::_request (const char *operation,
       return dynamic_adapter->request (
                                   this,
                                   this->protocol_proxy_->orb_core ()->orb (),
-                                  operation,
-                                  ACE_TRY_ENV
+                                  operation
+                                   TAO_ENV_ARG_PARAMETER
                                 );
     }
   else
@@ -352,17 +352,17 @@ CORBA_Object::_request (const char *operation,
 // the latter case, return FALSE.
 
 CORBA::Boolean
-CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
   // Get the right Proxy.
   TAO_Object_Proxy_Impl &the_proxy =
-    this->proxy_broker_->select_proxy (this, ACE_TRY_ENV);
+    this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Perform the Call.
-  _tao_retval = the_proxy._non_existent (this, ACE_TRY_ENV);
+  _tao_retval = the_proxy._non_existent (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return _tao_retval;
@@ -370,19 +370,19 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
 
 
 CORBA_InterfaceDef_ptr
-CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_get_interface (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get the right Proxy.
   TAO_Object_Proxy_Impl &the_proxy =
-    this->proxy_broker_->select_proxy (this, ACE_TRY_ENV);
+    this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Perform the Call.
-  return the_proxy._get_interface (this, ACE_TRY_ENV);
+  return the_proxy._get_interface (this TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::ImplementationDef_ptr
-CORBA_Object::_get_implementation (CORBA::Environment &)
+CORBA_Object::_get_implementation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return 0;
 }
@@ -399,22 +399,22 @@ CORBA_Object::_get_implementation (CORBA::Environment &)
 
 CORBA::Policy_ptr
 CORBA_Object::_get_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::PolicyType type
+    TAO_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy (type, ACE_TRY_ENV);
+    return this->protocol_proxy_->get_policy (type TAO_ENV_ARG_PARAMETER);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
 
 CORBA::Policy_ptr
 CORBA_Object::_get_client_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::PolicyType type
+    TAO_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
-    return this->_stubobj ()->get_client_policy (type, ACE_TRY_ENV);
+    return this->_stubobj ()->get_client_policy (type TAO_ENV_ARG_PARAMETER);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
@@ -422,16 +422,16 @@ CORBA_Object::_get_client_policy (
 CORBA::Object_ptr
 CORBA_Object::_set_policy_overrides (
     const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::SetOverrideType set_add
+    TAO_ENV_ARG_DECL)
 {
   if (!this->protocol_proxy_)
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 
   TAO_Stub* stub =
     this->protocol_proxy_->set_policy_overrides (policies,
-                                                 set_add,
-                                                 ACE_TRY_ENV);
+                                                 set_add
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -454,35 +454,35 @@ CORBA_Object::_set_policy_overrides (
 }
 
 CORBA::PolicyList *
-CORBA_Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types,
-                                     CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types
+                                     TAO_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy_overrides (types, ACE_TRY_ENV);
+    return this->protocol_proxy_->get_policy_overrides (types TAO_ENV_ARG_PARAMETER);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-CORBA_Object::_validate_connection (CORBA::PolicyList_out inconsistent_policies,
-                                    CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_validate_connection (CORBA::PolicyList_out inconsistent_policies
+                                    TAO_ENV_ARG_DECL)
 {
   inconsistent_policies = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 1)
 
-  ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 
 #else
 
   // If the object is collocated then use non_existent to see whether
   // it's there.
   if (this->is_collocated_)
-      return !(this->_non_existent (ACE_TRY_ENV));
+      return !(this->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER));
 
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->validate_connection (inconsistent_policies,
-                                                       ACE_TRY_ENV);
+    return this->protocol_proxy_->validate_connection (inconsistent_policies
+                                                        TAO_ENV_ARG_PARAMETER);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -592,12 +592,12 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
 
   TAO_Stub *objdata = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       objdata = orb_core->create_stub (type_hint.in (),
-                                       mp,
-                                       ACE_TRY_ENV);
+                                       mp
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 3e238f4352f..c1c99e1d7b1 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -51,12 +51,10 @@ public:
 
   /// No-op it is just here to simplify some templates.
   ACE_INLINE_FOR_GNUC
-  static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
-  static CORBA_Object_ptr _unchecked_narrow (CORBA_Object_ptr obj,
-                                             CORBA_Environment &ACE_TRY_ENV =
-                                                 TAO_default_environment ());
+  static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  static CORBA_Object_ptr _unchecked_narrow (CORBA_Object_ptr obj
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Used in the implementation of CORBA::Any
   static void _tao_any_destructor (void*);
@@ -71,9 +69,8 @@ public:
   // appropriate.
 
   /// determine if we are of the type specified by the "logical_type_id"
-  virtual CORBA::Boolean _is_a (const char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+  virtual CORBA::Boolean _is_a (const char *logical_type_id
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// The repository ID for the most derived class, this is an
   /// implementation method and does no remote invocations!
@@ -89,21 +86,18 @@ public:
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// This method is deprecated in the CORBA 2.2 spec, we just return 0
   /// every time.
   virtual CORBA::ImplementationDef_ptr _get_implementation (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Get info about the object from the Interface Repository.
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   // DII operations to create a request.
   //
@@ -116,9 +110,8 @@ public:
                                 CORBA::NVList_ptr arg_list,
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+                                CORBA::Flags req_flags
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void _create_request (CORBA::Context_ptr ctx,
                                 const char *operation,
@@ -127,49 +120,42 @@ public:
                                 CORBA::ExceptionList_ptr exclist,
                                 CORBA::ContextList_ptr ctxtlist,
                                 CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+                                CORBA::Flags req_flags
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // The default implementation of this method uses the same simple,
   // multi-protocol remote invocation interface as is assumed by the
   // calls above ... that's how it can have a default implementation.
 
   /// DII operation to create a request.
-  virtual CORBA::Request_ptr _request (const char *operation,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  virtual CORBA::Request_ptr _request (const char *operation
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
   CORBA::Policy_ptr _get_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::PolicyType type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::Policy_ptr _get_client_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::PolicyType type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::Object_ptr _set_policy_overrides (
       const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::SetOverrideType set_add
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::PolicyList * _get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      const CORBA::PolicyTypeSeq & types
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::Boolean _validate_connection (
-      CORBA::PolicyList_out inconsistent_policies,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::PolicyList_out inconsistent_policies
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -180,9 +166,8 @@ public:
    * different ORB protocols are in use) there is no default
    * implementation.
    */
-  virtual CORBA::ULong _hash (CORBA::ULong maximum,
-                              CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  virtual CORBA::ULong _hash (CORBA::ULong maximum
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Try to determine if this object is the same as <other_obj>.  This
@@ -190,14 +175,13 @@ public:
    * private state.  Since that changes easily (when different ORB
    * protocols are in use) there is no default implementation.
    */
-  virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ())
+  virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (());
 
   /// Return the object key as an out parameter.  Caller should release
   /// return value when finished with it.
-  virtual TAO_ObjectKey *_key (CORBA_Environment &ACE_TRY_ENV);
+  virtual TAO_ObjectKey *_key (TAO_ENV_SINGLE_ARG_DECL);
 
   /**
    * Return a reference to the object key of profile in-use.
@@ -312,7 +296,7 @@ public:
   static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr);
   static void tao_release (CORBA::Object_ptr);
   static CORBA::Object_ptr tao_nil (void);
-  static CORBA::Object_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index b2376125f61..3e5d8b7b77b 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -75,7 +75,7 @@ CORBA_Object::_nil (void)
 }
 
 ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment &)
+CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return CORBA::Object::_nil ();
@@ -91,9 +91,9 @@ CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj, CORBA::Environment &)
 }
 
 ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_narrow (CORBA_Object_ptr obj, CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL)
 {
-  return CORBA_Object::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Object::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_Stub *
@@ -220,8 +220,8 @@ CORBA_Object_var::tao_nil (void)
 
 ACE_INLINE CORBA_Object_ptr
 CORBA_Object_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   return CORBA_Object::_duplicate (p);
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
index 23e3e73b4b1..c1eb1715d19 100644
--- a/TAO/tao/ObjectIDList.cpp
+++ b/TAO/tao/ObjectIDList.cpp
@@ -152,7 +152,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::ORB::_tc_ObjectIdList, ACE_TRY_ENV)) return 0; // not equal
+    if (!type->equal (CORBA::ORB::_tc_ObjectIdList TAO_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index d7603d3d7fc..5f2625b854f 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -46,8 +46,8 @@ public:
    */
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv [],
-                                           CORBA::Environment &)
+                                           char *argv []
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index b5dd2031d01..f6e116cffbd 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -34,8 +34,8 @@ public:
   // -- Ctor/Dtor --
   virtual ~TAO_Object_Proxy_Broker (void);
 
-  virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object,
-                                               CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object
+                                               TAO_ENV_ARG_DECL) = 0;
 
 protected:
   TAO_Object_Proxy_Broker (void);
diff --git a/TAO/tao/Object_Proxy_Impl.h b/TAO/tao/Object_Proxy_Impl.h
index 97a28bee81d..2770d12355d 100644
--- a/TAO/tao/Object_Proxy_Impl.h
+++ b/TAO/tao/Object_Proxy_Impl.h
@@ -36,17 +36,17 @@ public:
 
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
-                                const CORBA::Char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV) = 0;
+                                const CORBA::Char *logical_type_id
+                                TAO_ENV_ARG_DECL) = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target,
-                                        CORBA_Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
+                                        TAO_ENV_ARG_DECL) = 0;
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      const CORBA::Object_ptr target,
-      CORBA_Environment &ACE_TRY_ENV
+      const CORBA::Object_ptr target
+      TAO_ENV_ARG_DECL
     ) = 0;
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index f4eb8eec30d..b4840ba79e2 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -32,8 +32,8 @@ TAO_Object_Ref_Table::~TAO_Object_Ref_Table (void)
 void
 TAO_Object_Ref_Table::register_initial_reference (
   const char *id,
-  CORBA::Object_ptr obj,
-  CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr obj
+  TAO_ENV_ARG_DECL)
 {
   if (id == 0)
     ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 27,
@@ -75,8 +75,8 @@ TAO_Object_Ref_Table::register_initial_reference (
 
 CORBA::Object_ptr
 TAO_Object_Ref_Table::resolve_initial_references (
-  const char *id,
-  CORBA::Environment &)
+  const char *id
+  TAO_ENV_ARG_DECL_NOT_USED)
 {
   return this->find (id);  // Returns a duplicate.
 }
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index af4f57055d9..8dd4f0e30ca 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -61,14 +61,14 @@ public:
   /// Register an object reference with the table, and map the given
   /// ID to it.
   void register_initial_reference (const char * id,
-                                   CORBA::Object_ptr obj,
-                                   CORBA::Environment &ACE_TRY_ENV);
+                                   CORBA::Object_ptr obj
+                                   TAO_ENV_ARG_DECL);
 
   /// Return the object reference associated with the given ID.
   /// A duplicate is returned.
   CORBA::Object_ptr resolve_initial_references (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV);
+    const char * id
+    TAO_ENV_ARG_DECL);
 
   /// Explicitly destroy the contents of the object reference table.
   void destroy (void);
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 9c54fb65283..cc2c749821f 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -145,7 +145,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV);
+      type->equivalent (CORBA::_tc_OctetSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp
index 438faa3c26d..3c297609585 100644
--- a/TAO/tao/PICurrent.cpp
+++ b/TAO/tao/PICurrent.cpp
@@ -31,12 +31,12 @@ TAO_PICurrent::~TAO_PICurrent (void)
 }
 
 CORBA::Any *
-TAO_PICurrent::get_slot (PortableInterceptor::SlotId id,
-			 CORBA::Environment &ACE_TRY_ENV)
+TAO_PICurrent::get_slot (PortableInterceptor::SlotId id
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::InvalidSlot))
+                   PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (id, ACE_TRY_ENV);
+  this->check_validity (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_PICurrent_Impl *impl = this->tsc ();
@@ -48,17 +48,17 @@ TAO_PICurrent::get_slot (PortableInterceptor::SlotId id,
                         0);
     }
 
-  return impl->get_slot (id, ACE_TRY_ENV);
+  return impl->get_slot (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_PICurrent::set_slot (PortableInterceptor::SlotId id,
-			 const CORBA::Any & data,
-			 CORBA::Environment &ACE_TRY_ENV)
+                         const CORBA::Any & data
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::InvalidSlot))
+                   PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (id, ACE_TRY_ENV);
+  this->check_validity (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PICurrent_Impl *impl = this->tsc ();
@@ -69,7 +69,7 @@ TAO_PICurrent::set_slot (PortableInterceptor::SlotId id,
                                        CORBA::COMPLETED_NO));
     }
 
-  impl->set_slot (id, data, ACE_TRY_ENV);
+  impl->set_slot (id, data TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -108,10 +108,10 @@ TAO_PICurrent_Impl::~TAO_PICurrent_Impl (void)
 }
 
 CORBA::Any *
-TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id,
-			      CORBA::Environment &ACE_TRY_ENV)
+TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::InvalidSlot))
+                   PortableInterceptor::InvalidSlot))
 {
   // No need to check validity of SlotId.  It is validated before this
   // method is invoked.
@@ -127,12 +127,12 @@ TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id,
       // return an Any with a TCKind of tk_null.  A default
       // constructed Any has that TCKind.
       ACE_NEW_THROW_EX (any,
-			CORBA::Any,
-			CORBA::NO_MEMORY (
-			  CORBA_SystemException::_tao_minor_code (
+                        CORBA::Any,
+                        CORBA::NO_MEMORY (
+                          CORBA_SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
-			    ENOMEM),
-			  CORBA::COMPLETED_NO));
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
 
       return any;
@@ -154,10 +154,10 @@ TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id,
 
 void
 TAO_PICurrent_Impl::set_slot (PortableInterceptor::SlotId id,
-			      const CORBA::Any & data,
-			      CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA::Any & data
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
-		   PortableInterceptor::InvalidSlot))
+                   PortableInterceptor::InvalidSlot))
 {
   // No need to check validity of SlotId.  It is validated before this
   // method is invoked.
@@ -217,7 +217,7 @@ TAO_PICurrent_Impl::set_slot (PortableInterceptor::SlotId id,
   ACE_NEW_THROW_EX (any,
                     CORBA::Any (data),  // Make a copy.
                     CORBA::NO_MEMORY (
-		      CORBA_SystemException::_tao_minor_code (
+                      CORBA_SystemException::_tao_minor_code (
                         TAO_DEFAULT_MINOR_CODE,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
@@ -238,13 +238,13 @@ TAO_PICurrent_Impl::copy (TAO_PICurrent_Impl &rhs, CORBA::Boolean deep_copy)
 
       this->slot_table_.size (new_size);
 
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           for (size_t i = 0; i < new_size; ++i)
             {
               this->slot_table_[i] =
-                rhs.get_slot (i, ACE_TRY_ENV);  // Deep copy
+                rhs.get_slot (i TAO_ENV_ARG_PARAMETER);  // Deep copy
               ACE_TRY_CHECK;
             }
         }
diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PICurrent.h
index 0a2e2467551..0965b8cd2b9 100644
--- a/TAO/tao/PICurrent.h
+++ b/TAO/tao/PICurrent.h
@@ -69,19 +69,17 @@ public:
   //@{
   /// Retrieve information stored in the slot table at the given
   /// SlotId.
-  virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id,
-				 CORBA::Environment &ACE_TRY_ENV =
-				   TAO_default_environment ())
+  virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::InvalidSlot));
+                     PortableInterceptor::InvalidSlot));
 
   /// Set information in the slot table at the given SlotId.
   virtual void set_slot (PortableInterceptor::SlotId id,
-			 const CORBA::Any & data,
-			 CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+                         const CORBA::Any & data
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::InvalidSlot));
+                     PortableInterceptor::InvalidSlot));
   //@}
 
   /// Allocate a new SlotId.
@@ -99,8 +97,8 @@ public:
   TAO_PICurrent_Impl * tsc (void);
 
   /// Verify the validity of the given SlotId.
-  void check_validity (const PortableInterceptor::SlotId &id,
-		       CORBA::Environment &ACE_TRY_ENV);
+  void check_validity (const PortableInterceptor::SlotId &id
+                       TAO_ENV_ARG_DECL);
 
 protected:
 
@@ -166,17 +164,17 @@ public:
 
   /// Retrieve information stored in the slot table at the given
   /// SlotId.
-  CORBA::Any * get_slot (PortableInterceptor::SlotId id,
-			 CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Any * get_slot (PortableInterceptor::SlotId id
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::InvalidSlot));
+                     PortableInterceptor::InvalidSlot));
 
   /// Set information in the slot table at the given SlotId.
   void set_slot (PortableInterceptor::SlotId id,
-		 const CORBA::Any & data,
-		 CORBA::Environment &ACE_TRY_ENV)
+                 const CORBA::Any & data
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
-		     PortableInterceptor::InvalidSlot));
+                     PortableInterceptor::InvalidSlot));
 
 
   /// Get the PICurrent peer associated with this PICurrent
diff --git a/TAO/tao/PICurrent.inl b/TAO/tao/PICurrent.inl
index a48e98038f8..2c03f3722b0 100644
--- a/TAO/tao/PICurrent.inl
+++ b/TAO/tao/PICurrent.inl
@@ -9,8 +9,8 @@ TAO_PICurrent::slot_count (void) const
 }
 
 ACE_INLINE void
-TAO_PICurrent::check_validity (const PortableInterceptor::SlotId &id,
-			       CORBA::Environment &ACE_TRY_ENV)
+TAO_PICurrent::check_validity (const PortableInterceptor::SlotId &id
+                               TAO_ENV_ARG_DECL)
 {
   // No need to acquire a lock for this check.  At this point, these
   // attributes are read only.
diff --git a/TAO/tao/PICurrent_ORBInitializer.cpp b/TAO/tao/PICurrent_ORBInitializer.cpp
index 2bf36a7ea07..51cd34636d2 100644
--- a/TAO/tao/PICurrent_ORBInitializer.cpp
+++ b/TAO/tao/PICurrent_ORBInitializer.cpp
@@ -20,10 +20,8 @@ TAO_PICurrent_ORBInitializer::pre_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info, ACE_TRY_ENV);
+    TAO_ORBInitInfo::_narrow (info TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_ORB_Core *orb_core = tao_info->orb_core ();
@@ -43,8 +41,8 @@ TAO_PICurrent_ORBInitializer::pre_init (
   // The PICurrent is stateless and reentrant, so share a single
   // instance between all ORBs.
   info->register_initial_reference ("PICurrent",
-                                    current.in (),
-                                    ACE_TRY_ENV);
+                                    current.in ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Cache the downcasted pointer in the ORB Core.
diff --git a/TAO/tao/PICurrent_ORBInitializer.h b/TAO/tao/PICurrent_ORBInitializer.h
index 485d7b15559..e64715c7840 100644
--- a/TAO/tao/PICurrent_ORBInitializer.h
+++ b/TAO/tao/PICurrent_ORBInitializer.h
@@ -27,7 +27,7 @@
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "PortableInterceptorC.h"
-#include "PICurrent.h" 
+#include "PICurrent.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index a4fe66973b7..c1ba4b23516 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -35,8 +35,8 @@ TAO_Connector::~TAO_Connector (void)
 
 int
 TAO_Connector::make_mprofile (const char *string,
-                              TAO_MProfile &mprofile,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              TAO_MProfile &mprofile
+                              TAO_ENV_ARG_DECL)
 {
   // This method utilizes the "Template Method" design pattern to
   // parse the given URL style IOR for the protocol being used
@@ -167,14 +167,14 @@ TAO_Connector::make_mprofile (const char *string,
           // or
           //    `endpoint/object_key'
 
-          TAO_Profile *profile = this->make_profile (ACE_TRY_ENV);
+          TAO_Profile *profile = this->make_profile (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           // Failure:  Problem during profile creation
 
           // Initialize a Profile using the individual endpoint
           // string.
           // @@ Not exception safe!  We need a TAO_Profile_var!
-          profile->parse_string (endpoint.c_str (), ACE_TRY_ENV);
+          profile->parse_string (endpoint.c_str () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           // Give up ownership of the profile.
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index 4d9228cd64f..d57c7ac83b4 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -160,8 +160,8 @@ public:
   /// Parse a string containing a URL style IOR and return an
   /// MProfile.
   int make_mprofile (const char *ior,
-                     TAO_MProfile &mprofile,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     TAO_MProfile &mprofile
+                     TAO_ENV_ARG_DECL);
 
   ///  Initialize object and register with reactor.
   virtual int open (TAO_ORB_Core *orb_core) = 0;
@@ -175,8 +175,8 @@ public:
    * actual transport protocol in use.
    */
   virtual int connect (TAO_GIOP_Invocation *invocation,
-                       TAO_Transport_Descriptor_Interface *desc,
-                       CORBA::Environment &ACE_TRY_ENV) = 0;
+                       TAO_Transport_Descriptor_Interface *desc
+                       TAO_ENV_ARG_DECL) = 0;
 
   /// Initial set of connections to be established.
   virtual int preconnect (const char *preconnections) = 0;
@@ -195,7 +195,7 @@ public:
 protected:
 
   /// Create a profile with a given endpoint.
-  virtual TAO_Profile *make_profile (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Set the ORB Core pointer
   void orb_core (TAO_ORB_Core *orb_core);
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 5bc15ed4337..cffb7e72d30 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -118,8 +118,8 @@ void CORBA::PolicyError::_raise ()
 }
 
 void CORBA::PolicyError::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -131,8 +131,8 @@ void CORBA::PolicyError::_tao_encode (
 }
 
 void CORBA::PolicyError::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -314,8 +314,8 @@ void CORBA_InvalidPolicies::_raise ()
 }
 
 void CORBA_InvalidPolicies::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -327,8 +327,8 @@ void CORBA_InvalidPolicies::_tao_encode (
 }
 
 void CORBA_InvalidPolicies::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -387,11 +387,11 @@ tao_CORBA_Policy_nil (
 
 CORBA::Policy_ptr
 tao_CORBA_Policy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA::Policy::_narrow (p, ACE_TRY_ENV);
+  return CORBA::Policy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -514,11 +514,11 @@ CORBA_Policy_var::tao_nil (void)
 
 ::CORBA::Policy_ptr
 CORBA_Policy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA::Policy::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA::Policy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -595,27 +595,23 @@ class TAO_ClientRequestInfo_CORBA_Policy_policy_type_get : public TAO_ClientRequ
 public:
   TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::PolicyType result);
@@ -629,31 +625,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_policy_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_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_policy_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;
@@ -661,13 +657,13 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (CORBA::Environme
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_policy_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;
@@ -688,27 +684,23 @@ class TAO_ClientRequestInfo_CORBA_Policy_copy : public TAO_ClientRequestInfo
 public:
   TAO_ClientRequestInfo_CORBA_Policy_copy (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
   void result (CORBA::Policy_ptr result);
@@ -722,31 +714,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_copy::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_ClientRequestInfo_CORBA_Policy_copy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_copy::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;
@@ -754,13 +746,13 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (CORBA::Environment &ACE_TRY
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Policy_copy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_copy::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;
@@ -781,27 +773,23 @@ class TAO_ClientRequestInfo_CORBA_Policy_destroy : public TAO_ClientRequestInfo
 public:
   TAO_ClientRequestInfo_CORBA_Policy_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
 private:
@@ -813,31 +801,31 @@ private:
 
 TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_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_ClientRequestInfo_CORBA_Policy_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_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;
@@ -845,13 +833,13 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (CORBA::Environment &ACE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Policy_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_CORBA_Policy_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;
@@ -872,8 +860,8 @@ CORBA_TAO_Policy_Remote_Proxy_Impl::CORBA_TAO_Policy_Remote_Proxy_Impl (void)
 // Remote Implementation of the IDL interface methods
 
 CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -914,8 +902,8 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+         TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -930,8 +918,8 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -943,17 +931,17 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -969,8 +957,8 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                   TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -996,8 +984,8 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1006,13 +994,13 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1023,7 +1011,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1038,8 +1026,8 @@ return _tao_retval;
 }
 
 CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1081,8 +1069,8 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_copy ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+         TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1097,8 +1085,8 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1110,17 +1098,17 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1136,8 +1124,8 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                   TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1164,8 +1152,8 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1174,13 +1162,13 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1191,7 +1179,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1206,8 +1194,8 @@ return _tao_safe_retval._retn ();
 }
 
 void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1248,8 +1236,8 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_CORBA_Policy_destroy ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+         TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -1264,8 +1252,8 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1277,17 +1265,17 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+               TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1302,8 +1290,8 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                   TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1316,8 +1304,8 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
 
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+             TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1326,13 +1314,13 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
@@ -1343,7 +1331,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1397,8 +1385,8 @@ CORBA_TAO_Policy_Remote_Proxy_Broker::~CORBA_TAO_Policy_Remote_Proxy_Broker (voi
 
 CORBA_TAO_Policy_Proxy_Impl&
 CORBA_TAO_Policy_Remote_Proxy_Broker::select_proxy (
-  ::CORBA::Policy *,
-  CORBA::Environment &
+  ::CORBA::Policy *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -1438,25 +1426,25 @@ void CORBA_Policy::_tao_any_destructor (void *x)
 }
 
 CORBA::Policy_ptr CORBA_Policy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Policy::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Policy::_nil ());
       if (is_a == 0)
         return CORBA_Policy::_nil ();
     }
-  return CORBA_Policy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Policy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr CORBA_Policy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1513,14 +1501,14 @@ CORBA_Policy::_duplicate (CORBA_Policy_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type)
@@ -1570,53 +1558,53 @@ CORBA_Policy::_tao_scope (void) const
 }
 
 CORBA::PolicyType CORBA_Policy::policy_type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   CORBA_TAO_Policy_Proxy_Impl &proxy =
-    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.policy_type (
-      this,
-      ACE_TRY_ENV
+      this
+       TAO_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Policy_ptr CORBA_Policy::copy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   CORBA_TAO_Policy_Proxy_Impl &proxy =
-    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.copy (
-      this,
-      ACE_TRY_ENV
+      this
+       TAO_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA::Policy::destroy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   CORBA_TAO_Policy_Proxy_Impl &proxy =
-    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.destroy (
-      this,
-      ACE_TRY_ENV
+      this
+       TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -1692,12 +1680,12 @@ void CORBA::Policy::destroy (
   void
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast (
       void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
+      CORBA_Object *src
+      TAO_ENV_ARG_DECL
     )
   {
     CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target);
-    *tmp = CORBA::Policy::_narrow (src, ACE_TRY_ENV);
+    *tmp = CORBA::Policy::_narrow (src TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -1881,11 +1869,11 @@ tao_CORBA_PolicyManager_nil (
 
 CORBA_PolicyManager_ptr
 tao_CORBA_PolicyManager_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_PolicyManager::_narrow (p, ACE_TRY_ENV);
+  return CORBA_PolicyManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2008,11 +1996,11 @@ CORBA_PolicyManager_var::tao_nil (void)
 
 ::CORBA_PolicyManager_ptr
 CORBA_PolicyManager_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PolicyManager::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_PolicyManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2093,16 +2081,16 @@ CORBA_PolicyManager::~CORBA_PolicyManager (void)
 {}
 
 CORBA_PolicyManager_ptr CORBA_PolicyManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA::PolicyManager::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA::PolicyManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2178,11 +2166,11 @@ tao_CORBA_PolicyCurrent_nil (
 
 CORBA_PolicyCurrent_ptr
 tao_CORBA_PolicyCurrent_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_PolicyCurrent::_narrow (p, ACE_TRY_ENV);
+  return CORBA_PolicyCurrent::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2305,11 +2293,11 @@ CORBA_PolicyCurrent_var::tao_nil (void)
 
 ::CORBA_PolicyCurrent_ptr
 CORBA_PolicyCurrent_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PolicyCurrent::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_PolicyCurrent::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2390,16 +2378,16 @@ CORBA_PolicyCurrent::~CORBA_PolicyCurrent (void)
 {}
 
 CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_PolicyCurrent::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_PolicyCurrent::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2513,7 +2501,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2603,7 +2591,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolic
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2676,7 +2664,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_
     _tao_elem = CORBA::Policy::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2759,7 +2747,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2850,7 +2838,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyTypeS
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2913,7 +2901,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3015,8 +3003,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       CORBA::Policy::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+           TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 44ab47d83a9..3b762cf53c6 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -85,13 +85,13 @@ public:
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
 
     static CORBA_PolicyError *_downcast (CORBA::Exception *);
@@ -218,13 +218,13 @@ public:
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
 
     static CORBA_InvalidPolicies *_downcast (CORBA::Exception *);
@@ -270,7 +270,7 @@ public:
     static CORBA_Policy_ptr tao_duplicate (CORBA_Policy_ptr);
     static void tao_release (CORBA_Policy_ptr);
     static CORBA_Policy_ptr tao_nil (void);
-    static CORBA_Policy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA_Policy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -332,15 +332,13 @@ class TAO_Export CORBA_Policy
     // the static operations
     static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
     static CORBA_Policy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static CORBA_Policy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static CORBA_Policy_ptr _nil (void)
       {
         return (CORBA_Policy_ptr)0;
@@ -349,34 +347,30 @@ class TAO_Export CORBA_Policy
     static void _tao_any_destructor (void*);
 
     virtual CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     virtual const char* _interface_repository_id (void) const;
@@ -433,24 +427,24 @@ class TAO_Export CORBA_Policy
     virtual ~CORBA_TAO_Policy_Proxy_Impl (void) { }
 
         virtual CORBA::PolicyType policy_type (
-        CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Object_ptr _collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Policy_ptr copy (
-        CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Object_ptr _collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void destroy (
-        CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Object_ptr _collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -479,24 +473,24 @@ public:
   virtual ~CORBA_TAO_Policy_Remote_Proxy_Impl (void) { }
 
   virtual CORBA::PolicyType policy_type (
-      CORBA::Object_ptr _collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr _collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
 virtual CORBA::Policy_ptr copy (
-      CORBA::Object_ptr _collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr _collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
 virtual void destroy (
-      CORBA::Object_ptr _collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Object_ptr _collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -525,8 +519,8 @@ class TAO_Export CORBA_TAO_Policy_Proxy_Broker
 public:
   virtual ~CORBA_TAO_Policy_Proxy_Broker (void);
   virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
-    CORBA_Policy *object,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Policy *object
+    TAO_ENV_ARG_DECL
   ) = 0;
 
 protected:
@@ -551,8 +545,8 @@ public:
   virtual ~CORBA_TAO_Policy_Remote_Proxy_Broker (void);
 
   virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
-    CORBA_Policy *object,
-    CORBA_Environment &ACE_TRY_ENV
+    CORBA_Policy *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -604,10 +598,9 @@ public:
     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
     virtual void _downcast (
         void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA_Object *src
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     virtual CORBA_Object* _upcast (void *src) const;
 
   };
@@ -901,7 +894,7 @@ public:
   static CORBA_PolicyManager_ptr tao_duplicate (CORBA_PolicyManager_ptr);
   static void tao_release (CORBA_PolicyManager_ptr);
   static CORBA_PolicyManager_ptr tao_nil (void);
-  static CORBA_PolicyManager_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_PolicyManager_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -955,35 +948,31 @@ public:
   // the static operations
   static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj);
   static CORBA_PolicyManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_PolicyManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_PolicyManager_ptr _nil (void)
     {
       return (CORBA_PolicyManager_ptr)0;
     }
 
   virtual CORBA::PolicyList * get_policy_overrides (
-      const CORBA::PolicyTypeSeq & ts,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const CORBA::PolicyTypeSeq & ts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
   virtual void set_policy_overrides (
       const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::SetOverrideType set_add
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       CORBA::InvalidPolicies
@@ -1035,7 +1024,7 @@ public:
   static CORBA_PolicyCurrent_ptr tao_duplicate (CORBA_PolicyCurrent_ptr);
   static void tao_release (CORBA_PolicyCurrent_ptr);
   static CORBA_PolicyCurrent_ptr tao_nil (void);
-  static CORBA_PolicyCurrent_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_PolicyCurrent_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -1089,15 +1078,13 @@ public:
   // the static operations
   static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj);
   static CORBA_PolicyCurrent_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_PolicyCurrent_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_PolicyCurrent_ptr _nil (void)
     {
       return (CORBA_PolicyCurrent_ptr)0;
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index 22066d1bcd7..063df75db86 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -26,8 +26,8 @@ TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void)
 void
 TAO_PolicyFactory_Registry::register_policy_factory (
   CORBA::PolicyType type,
-  PortableInterceptor::PolicyFactory_ptr policy_factory,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::PolicyFactory_ptr policy_factory
+  TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (policy_factory))
     ACE_THROW (CORBA::BAD_PARAM (
@@ -58,8 +58,8 @@ TAO_PolicyFactory_Registry::register_policy_factory (
 
 CORBA::Policy_ptr
 TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
-                                           const CORBA::Any &value,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           const CORBA::Any &value
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h
index 4d262e0d8dd..04f3b15e32c 100644
--- a/TAO/tao/PolicyFactory_Registry.h
+++ b/TAO/tao/PolicyFactory_Registry.h
@@ -65,14 +65,14 @@ public:
   /// initialization.
   void register_policy_factory (
     CORBA::PolicyType type,
-    PortableInterceptor::PolicyFactory_ptr policy_factory,
-    CORBA::Environment &ACE_TRY_ENV);
+    PortableInterceptor::PolicyFactory_ptr policy_factory
+    TAO_ENV_ARG_DECL);
 
   /// Construct a policy of the given type with the information
   /// contained in the CORBA::Any <value>.
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any &value,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const CORBA::Any &value
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 51c5b740bf3..39f8d95f6d8 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -37,18 +37,18 @@ TAO_Policy_Current::implementation (void) const
 void
 TAO_Policy_Current_Impl::set_policy_overrides (
         const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
+        CORBA::SetOverrideType set_add
+        TAO_ENV_ARG_DECL)
 {
-  this->manager_impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
+  this->manager_impl_.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::PolicyList *
 TAO_Policy_Current_Impl::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL)
 {
-  return this->manager_impl_.get_policy_overrides (ts, ACE_TRY_ENV);
+  return this->manager_impl_.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 9635219bee9..029d27c9c9b 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -48,24 +48,21 @@ public:
   TAO_Policy_Manager (void);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()
-    );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   // = The CORBA::PolicyManager operations
 
   virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_policy_overrides (const CORBA::PolicyList & policies,
-                                     CORBA::SetOverrideType set_add,
-                                     CORBA::Environment &ACE_TRY_ENV =
-                                     CORBA::Environment::default_environment ()
+                                     CORBA::SetOverrideType set_add
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS
                                      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA_InvalidPolicies));
@@ -90,22 +87,19 @@ public:
   TAO_Policy_Current_Impl (void);
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()
-    );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   // = The CORBA::PolicyManager operations
 
   CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       );
   void set_policy_overrides (const CORBA::PolicyList & policies,
-                             CORBA::SetOverrideType set_add,
-                             CORBA::Environment &ACE_TRY_ENV =
-                             CORBA::Environment::default_environment ());
+                             CORBA::SetOverrideType set_add
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Obtain a single cached policy.
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
@@ -127,25 +121,22 @@ public:
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::PolicyType policy
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   // = The CORBA::PolicyManager operations
 
   virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
+        CORBA::SetOverrideType set_add
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA_InvalidPolicies));
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index e4252dbd222..478156475fc 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -8,37 +8,37 @@ TAO_Policy_Manager::TAO_Policy_Manager (void)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Manager::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::PolicyType policy
+      TAO_ENV_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy (policy, ACE_TRY_ENV);
+  return this->impl_.get_policy (policy TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::PolicyList *
 TAO_Policy_Manager::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
                        CORBA::SystemException
                        ))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV);
+  return this->impl_.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_Policy_Manager::set_policy_overrides (
         const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
+        CORBA::SetOverrideType set_add
+        TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
                        CORBA::SystemException,
                        CORBA_InvalidPolicies
                        ))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-  this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
+  this->impl_.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
@@ -72,10 +72,10 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Current_Impl::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::PolicyType policy
+      TAO_ENV_ARG_DECL)
 {
-  return this->manager_impl_.get_policy (policy, ACE_TRY_ENV);
+  return this->manager_impl_.get_policy (policy TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
@@ -88,36 +88,36 @@ TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type)
 
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Current::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
+      CORBA::PolicyType policy
+      TAO_ENV_ARG_DECL)
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy (policy, ACE_TRY_ENV);
+  return impl.get_policy (policy TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::PolicyList *
 TAO_Policy_Current::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
+        const CORBA::PolicyTypeSeq & ts
+        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy_overrides (ts, ACE_TRY_ENV);
+  return impl.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::SetOverrideType set_add
+                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA_InvalidPolicies))
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  impl.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
+  impl.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index b4adc644827..e0e1b2cc115 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -11,10 +11,10 @@ ACE_RCSID(tao, Policy_Set, "$Id$")
 
 TAO_Policy_Set::~TAO_Policy_Set (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->cleanup_i (ACE_TRY_ENV);
+      this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -45,7 +45,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
           if (CORBA::is_nil (policy))
             continue;
 
-          CORBA::Policy_var copy = policy->copy (ACE_TRY_ENV);
+          CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Add the "cacheable" policies into the cache.
@@ -69,13 +69,13 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
 }
 
 void
-TAO_Policy_Set::copy_from (TAO_Policy_Set *source,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_Policy_Set::copy_from (TAO_Policy_Set *source
+                                    TAO_ENV_ARG_DECL)
 {
   if (source == 0)
     return;
 
-  this->cleanup_i (ACE_TRY_ENV);
+  this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0;
@@ -89,7 +89,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source,
       if (! this->compatible_scope (policy->_tao_scope()))
         ACE_THROW (CORBA::NO_PERMISSION ());
 
-      CORBA::Policy_var copy = policy->copy (ACE_TRY_ENV);
+      CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::ULong length = this->policy_list_.length ();
@@ -104,7 +104,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source,
 }
 
 void
-TAO_Policy_Set::cleanup_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Policy_Set::cleanup_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong i;
 
@@ -113,7 +113,7 @@ TAO_Policy_Set::cleanup_i (CORBA::Environment &ACE_TRY_ENV)
        i < this->policy_list_.length ();
        ++i)
     {
-      this->policy_list_[i]->destroy (ACE_TRY_ENV);
+      this->policy_list_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       this->policy_list_[i] = CORBA::Policy::_nil ();
     }
@@ -128,8 +128,8 @@ TAO_Policy_Set::cleanup_i (CORBA::Environment &ACE_TRY_ENV)
 void
 TAO_Policy_Set::set_policy_overrides (
     const CORBA::PolicyList &policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::SetOverrideType set_add
+    TAO_ENV_ARG_DECL)
 {
   // @@ The spec does not say what to do on this case.
   if (set_add != CORBA::SET_OVERRIDE
@@ -138,7 +138,7 @@ TAO_Policy_Set::set_policy_overrides (
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
-      this->cleanup_i (ACE_TRY_ENV);
+      this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -157,7 +157,7 @@ TAO_Policy_Set::set_policy_overrides (
       if (CORBA::is_nil (policy.in ()))
         continue;
 
-      CORBA::PolicyType policy_type = policy->policy_type (ACE_TRY_ENV);
+      CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (policy_type == TAO_RT_SERVER_PROTOCOL_POLICY_TYPE)
@@ -173,22 +173,22 @@ TAO_Policy_Set::set_policy_overrides (
           server_protocol_set = 1;
         }
 
-      this->set_policy (policy.in (), ACE_TRY_ENV);
+      this->set_policy (policy.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
+                                     TAO_ENV_ARG_DECL)
 {
   if (! this->compatible_scope (policy->_tao_scope()))
     ACE_THROW (CORBA::NO_PERMISSION ());
 
-  CORBA::PolicyType policy_type = policy->policy_type (ACE_TRY_ENV);
+  CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Policy_var copy = policy->copy (ACE_TRY_ENV);
+  CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -197,12 +197,12 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy,
   while (j != length)
     {
       CORBA::ULong current =
-        this->policy_list_[j]->policy_type (ACE_TRY_ENV);
+        this->policy_list_[j]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (current == policy_type)
         {
-          this->policy_list_[j]->destroy (ACE_TRY_ENV);
+          this->policy_list_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->policy_list_[j] = copy.ptr ();
           break;
@@ -227,8 +227,8 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy,
 
 CORBA::PolicyList *
 TAO_Policy_Set::get_policy_overrides (
-    const CORBA::PolicyTypeSeq &types,
-    CORBA::Environment &ACE_TRY_ENV)
+    const CORBA::PolicyTypeSeq &types
+    TAO_ENV_ARG_DECL)
 {
   CORBA::ULong types_length = types.length ();
 
@@ -267,7 +267,7 @@ TAO_Policy_Set::get_policy_overrides (
            ++i)
         {
           CORBA::ULong current =
-            this->policy_list_[i]->policy_type (ACE_TRY_ENV);
+            this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (current != slot)
@@ -283,8 +283,8 @@ TAO_Policy_Set::get_policy_overrides (
 }
 
 CORBA::Policy_ptr
-TAO_Policy_Set::get_policy (CORBA::PolicyType type,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_Policy_Set::get_policy (CORBA::PolicyType type
+                                     TAO_ENV_ARG_DECL)
 {
   CORBA::ULong length = this->policy_list_.length ();
   for (CORBA::ULong i = 0;
@@ -292,7 +292,7 @@ TAO_Policy_Set::get_policy (CORBA::PolicyType type,
        ++i)
     {
       CORBA::ULong current =
-        this->policy_list_[i]->policy_type (ACE_TRY_ENV);
+        this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (current != type)
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 85d1b43aae8..72be1d9c21a 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -51,8 +51,8 @@ public:
 
   /// Copy the state from <source>, it uses the copy() operator to
   /// obtain independent copies of all the policies.
-  void copy_from (TAO_Policy_Set* source,
-                  CORBA::Environment &ACE_TRY_ENV);
+  void copy_from (TAO_Policy_Set* source
+                  TAO_ENV_ARG_DECL);
 
   /**
    * Modify the list of policies to include <policies>.
@@ -62,23 +62,20 @@ public:
    * No attempt is made to validate the policies for consistency.
    */
   void set_policy_overrides (const CORBA::PolicyList & policies,
-                             CORBA::SetOverrideType set_add,
-                             CORBA::Environment &ACE_TRY_ENV =
-                             TAO_default_environment ()
-    );
+                             CORBA::SetOverrideType set_add
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Get the values (if any) for the policies in <types>, if <types>
   /// is an empty list the method returns *all* the current policies.
-  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types,
-                                            CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ()
-    );
+  CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types
+                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Obtain a single policy.
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()
-    );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   /// Obtain a cached policy for speedy lookups.
   /// This method just returns a const reference to the policy to
@@ -93,8 +90,8 @@ public:
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   /// Utility method to set a single policy.
-  void set_policy (const CORBA::Policy_ptr policy,
-                   CORBA::Environment &ACE_TRY_ENV);
+  void set_policy (const CORBA::Policy_ptr policy
+                   TAO_ENV_ARG_DECL);
 
   /// Returns the policy at the specified index.
   /// CORBA::Policy::_nil () is returned if the policy doesn't exist
@@ -107,7 +104,7 @@ private:
 
   /// Remove and destroy all the policy objects owned by this policy
   /// manager.
-  void cleanup_i (CORBA::Environment &ACE_TRY_ENV);
+  void cleanup_i (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Utility method to determine if a policy's scope is compatible with ours.
   CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const;
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index e17cb9acf47..4368660f227 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -83,7 +83,7 @@ CORBA_Pollable_var::operator const ::CORBA_Pollable_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast 
+CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -143,11 +143,11 @@ CORBA_Pollable_var::tao_nil (void)
 
 ::CORBA_Pollable_ptr
 CORBA_Pollable_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Pollable::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_Pollable::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -227,16 +227,16 @@ CORBA_Pollable::~CORBA_Pollable (void)
 {}
 
 CORBA_Pollable_ptr CORBA_Pollable::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_Pollable::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Pollable::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -335,7 +335,7 @@ CORBA_DIIPollable_var::operator const ::CORBA_DIIPollable_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast 
+CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -395,11 +395,11 @@ CORBA_DIIPollable_var::tao_nil (void)
 
 ::CORBA_DIIPollable_ptr
 CORBA_DIIPollable_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_DIIPollable::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_DIIPollable::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -479,16 +479,16 @@ CORBA_DIIPollable::~CORBA_DIIPollable (void)
 {}
 
 CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_DIIPollable::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_DIIPollable::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_DIIPollable_ptr CORBA_DIIPollable::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -599,7 +599,7 @@ CORBA_PollableSet_var::operator const ::CORBA_PollableSet_ptr &() const // cast
   return this->ptr_;
 }
 
-CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast 
+CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -659,11 +659,11 @@ CORBA_PollableSet_var::tao_nil (void)
 
 ::CORBA_PollableSet_ptr
 CORBA_PollableSet_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PollableSet::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_PollableSet::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -743,16 +743,16 @@ CORBA_PollableSet::~CORBA_PollableSet (void)
 {}
 
 CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_PollableSet::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_PollableSet::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -790,7 +790,7 @@ void *CORBA_PollableSet::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -846,16 +846,16 @@ void CORBA_PollableSet::NoPossiblePollable::_raise ()
 }
 
 void CORBA_PollableSet::NoPossiblePollable::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void CORBA_PollableSet::NoPossiblePollable::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -914,16 +914,16 @@ void CORBA_PollableSet::UnknownPollable::_raise ()
 }
 
 void CORBA_PollableSet::UnknownPollable::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 void CORBA_PollableSet::UnknownPollable::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 7928a329abd..eb498987691 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -1,4 +1,4 @@
-// -*- C++ -*- 
+// -*- C++ -*-
 //
 // $Id$
 
@@ -98,7 +98,7 @@ public:
   static CORBA_PollableSet_ptr tao_duplicate (CORBA_PollableSet_ptr);
   static void tao_release (CORBA_PollableSet_ptr);
   static CORBA_PollableSet_ptr tao_nil (void);
-  static CORBA_PollableSet_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_PollableSet_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -174,7 +174,7 @@ public:
   static CORBA_Pollable_ptr tao_duplicate (CORBA_Pollable_ptr);
   static void tao_release (CORBA_Pollable_ptr);
   static CORBA_Pollable_ptr tao_nil (void);
-  static CORBA_Pollable_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_Pollable_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -228,33 +228,29 @@ public:
   // the static operations
   static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj);
   static CORBA_Pollable_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_Pollable_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_Pollable_ptr _nil (void)
     {
       return (CORBA_Pollable_ptr)0;
     }
 
   virtual CORBA::Boolean is_ready (
-      CORBA::ULong timeout,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong timeout
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
   virtual CORBA_PollableSet_ptr create_pollable_set (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
@@ -314,7 +310,7 @@ public:
   static CORBA_DIIPollable_ptr tao_duplicate (CORBA_DIIPollable_ptr);
   static void tao_release (CORBA_DIIPollable_ptr);
   static CORBA_DIIPollable_ptr tao_nil (void);
-  static CORBA_DIIPollable_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_DIIPollable_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -368,15 +364,13 @@ public:
   // the static operations
   static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj);
   static CORBA_DIIPollable_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_DIIPollable_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_DIIPollable_ptr _nil (void)
     {
       return (CORBA_DIIPollable_ptr)0;
@@ -424,15 +418,13 @@ public:
   // the static operations
   static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj);
   static CORBA_PollableSet_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_PollableSet_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_PollableSet_ptr _nil (void)
     {
       return (CORBA_PollableSet_ptr)0;
@@ -448,27 +440,27 @@ public:
 
     NoPossiblePollable (void);
     // Default constructor.
-    
+
     NoPossiblePollable (const NoPossiblePollable &);
     // Copy constructor.
-    
+
     ~NoPossiblePollable (void);
     // Destructor.
-    
+
     NoPossiblePollable &operator= (const NoPossiblePollable &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static NoPossiblePollable *_downcast (CORBA::Exception *);
 
 
@@ -489,27 +481,27 @@ public:
 
     UnknownPollable (void);
     // Default constructor.
-    
+
     UnknownPollable (const UnknownPollable &);
     // Copy constructor.
-    
+
     ~UnknownPollable (void);
     // Destructor.
-    
+
     UnknownPollable &operator= (const UnknownPollable &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static UnknownPollable *_downcast (CORBA::Exception *);
 
 
@@ -521,46 +513,41 @@ public:
 #endif /* end #if !defined */
 
 virtual CORBA_DIIPollable_ptr create_dii_pollable (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
+    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
   ACE_THROW_SPEC ((
     CORBA::SystemException
   )) = 0;
 
 virtual void add_pollable (
-    CORBA_Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
+    CORBA_Pollable_ptr potential
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
   ACE_THROW_SPEC ((
     CORBA::SystemException
   )) = 0;
 
 virtual CORBA_Pollable_ptr poll (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
+    CORBA::ULong timeout
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     CORBA_PollableSet::NoPossiblePollable
   )) = 0;
 
 virtual void remove (
-    CORBA_Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
+    CORBA_Pollable_ptr potential
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     CORBA_PollableSet::UnknownPollable
   )) = 0;
 
 virtual CORBA::UShort number_left (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
+    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
   ACE_THROW_SPEC ((
     CORBA::SystemException
   )) = 0;
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
index 15ab3737c09..152cda10df6 100644
--- a/TAO/tao/PollableC.i
+++ b/TAO/tao/PollableC.i
@@ -49,11 +49,11 @@ tao_CORBA_Pollable_nil (
 
 ACE_INLINE CORBA_Pollable_ptr
 tao_CORBA_Pollable_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_Pollable::_narrow (p, ACE_TRY_ENV);
+  return CORBA_Pollable::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -99,11 +99,11 @@ tao_CORBA_DIIPollable_nil (
 
 ACE_INLINE CORBA_DIIPollable_ptr
 tao_CORBA_DIIPollable_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_DIIPollable::_narrow (p, ACE_TRY_ENV);
+  return CORBA_DIIPollable::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -156,11 +156,11 @@ tao_CORBA_PollableSet_nil (
 
 ACE_INLINE CORBA_PollableSet_ptr
 tao_CORBA_PollableSet_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_PollableSet::_narrow (p, ACE_TRY_ENV);
+  return CORBA_PollableSet::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 94d43157e06..ab231eaf9fe 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -81,7 +81,7 @@ PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Inte
   return this->ptr_;
 }
 
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
+PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -141,11 +141,11 @@ PortableInterceptor::Interceptor_var::tao_nil (void)
 
 ::PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::Interceptor::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::Interceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -225,16 +225,16 @@ PortableInterceptor::Interceptor::~Interceptor (void)
 {}
 
 PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Interceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Interceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -338,8 +338,8 @@ void PortableInterceptor::ForwardRequest::_raise ()
 }
 
 void PortableInterceptor::ForwardRequest::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -351,8 +351,8 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
 }
 
 void PortableInterceptor::ForwardRequest::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -385,45 +385,45 @@ static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x73743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0
   15,
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
   8,
-  ACE_NTOHL (0x666f7277), 
+  ACE_NTOHL (0x666f7277),
   ACE_NTOHL (0x61726400),  // name = forward
   CORBA::tk_objref,
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     29,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f62), 
-    ACE_NTOHL (0x6a656374), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f62),
+    ACE_NTOHL (0x6a656374),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
     7,
-    ACE_NTOHL (0x4f626a65), 
+    ACE_NTOHL (0x4f626a65),
     ACE_NTOHL (0x63740000),  // name = Object
 
   10,
-  ACE_NTOHL (0x7065726d), 
-  ACE_NTOHL (0x616e656e), 
+  ACE_NTOHL (0x7065726d),
+  ACE_NTOHL (0x616e656e),
   ACE_NTOHL (0x74000000),  // name = permanent
   CORBA::tk_boolean,
 
@@ -452,19 +452,19 @@ static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x7475733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
+  ACE_NTOHL (0x7475733a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0
   12,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
   ACE_NTOHL (0x74757300),  // name = ReplyStatus
   CORBA::tk_short,
 
@@ -511,17 +511,17 @@ static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x536c6f74), 
-  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x536c6f74),
+  ACE_NTOHL (0x49643a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/SlotId:1.0
   7,
-  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x536c6f74),
   ACE_NTOHL (0x49640000),  // name = SlotId
   CORBA::tk_ulong,
 
@@ -591,8 +591,8 @@ void PortableInterceptor::InvalidSlot::_raise ()
 }
 
 void PortableInterceptor::InvalidSlot::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -604,8 +604,8 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
 }
 
 void PortableInterceptor::InvalidSlot::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -628,19 +628,19 @@ static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
-  ACE_NTOHL (0x6c6f743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
+  ACE_NTOHL (0x6c6f743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0
   12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
 };
@@ -714,7 +714,7 @@ PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_
   return this->ptr_;
 }
 
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
+PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -774,11 +774,11 @@ PortableInterceptor::Current_var::tao_nil (void)
 
 ::PortableInterceptor::Current_ptr
 PortableInterceptor::Current_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::Current::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -858,16 +858,16 @@ PortableInterceptor::Current::~Current (void)
 {}
 
 PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Current::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::Current_ptr PortableInterceptor::Current::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -979,7 +979,7 @@ PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::Requ
   return this->ptr_;
 }
 
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
+PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1039,11 +1039,11 @@ PortableInterceptor::RequestInfo_var::tao_nil (void)
 
 ::PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::RequestInfo::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::RequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1123,16 +1123,16 @@ PortableInterceptor::RequestInfo::~RequestInfo (void)
 {}
 
 PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1232,7 +1232,7 @@ PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
+PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1292,11 +1292,11 @@ PortableInterceptor::ClientRequestInfo_var::tao_nil (void)
 
 ::PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ClientRequestInfo::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::ClientRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1376,16 +1376,16 @@ PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
 {}
 
 PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ClientRequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ClientRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1497,7 +1497,7 @@ PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
+PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1557,11 +1557,11 @@ PortableInterceptor::ServerRequestInfo_var::tao_nil (void)
 
 ::PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ServerRequestInfo::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::ServerRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1641,16 +1641,16 @@ PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
 {}
 
 PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ServerRequestInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServerRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1762,7 +1762,7 @@ PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
+PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1822,11 +1822,11 @@ PortableInterceptor::ClientRequestInterceptor_var::tao_nil (void)
 
 ::PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1906,16 +1906,16 @@ PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
 {}
 
 PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ClientRequestInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ClientRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2027,7 +2027,7 @@ PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
+PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2087,11 +2087,11 @@ PortableInterceptor::ServerRequestInterceptor_var::tao_nil (void)
 
 ::PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2171,16 +2171,16 @@ PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
 {}
 
 PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ServerRequestInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServerRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2292,7 +2292,7 @@ PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_
   return this->ptr_;
 }
 
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
+PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2352,11 +2352,11 @@ PortableInterceptor::IORInfo_var::tao_nil (void)
 
 ::PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::IORInfo::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::IORInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2436,16 +2436,16 @@ PortableInterceptor::IORInfo::~IORInfo (void)
 {}
 
 PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return IORInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return IORInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2545,7 +2545,7 @@ PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::I
   return this->ptr_;
 }
 
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
+PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2605,11 +2605,11 @@ PortableInterceptor::IORInterceptor_var::tao_nil (void)
 
 ::PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::IORInterceptor::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::IORInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2689,16 +2689,16 @@ PortableInterceptor::IORInterceptor::~IORInterceptor (void)
 {}
 
 PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return IORInterceptor::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return IORInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2810,7 +2810,7 @@ PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::Po
   return this->ptr_;
 }
 
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
+PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2870,11 +2870,11 @@ PortableInterceptor::PolicyFactory_var::tao_nil (void)
 
 ::PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::PolicyFactory::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::PolicyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2954,16 +2954,16 @@ PortableInterceptor::PolicyFactory::~PolicyFactory (void)
 {}
 
 PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return PolicyFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PolicyFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3063,7 +3063,7 @@ PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBI
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
+PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3123,11 +3123,11 @@ PortableInterceptor::ORBInitInfo_var::tao_nil (void)
 
 ::PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ORBInitInfo::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3207,16 +3207,16 @@ PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
 {}
 
 PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ORBInitInfo::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ORBInitInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3312,16 +3312,16 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_raise ()
 }
 
 void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3388,16 +3388,16 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_raise ()
 }
 
 void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3462,7 +3462,7 @@ PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::O
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
+PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3522,11 +3522,11 @@ PortableInterceptor::ORBInitializer_var::tao_nil (void)
 
 ::PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ORBInitializer::_narrow (p, ACE_TRY_ENV);
+  return ::PortableInterceptor::ORBInitializer::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3606,16 +3606,16 @@ PortableInterceptor::ORBInitializer::~ORBInitializer (void)
 {}
 
 PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ORBInitializer::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ORBInitializer::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3711,7 +3711,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV);
+      type->equivalent (PortableInterceptor::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3803,7 +3803,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV);
+      type->equivalent (PortableInterceptor::_tc_InvalidSlot TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 75f5f989c37..33bbaf33d9b 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -100,7 +100,7 @@ TAO_NAMESPACE  PortableInterceptor
     static Interceptor_ptr tao_duplicate (Interceptor_ptr);
     static void tao_release (Interceptor_ptr);
     static Interceptor_ptr tao_nil (void);
-    static Interceptor_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static Interceptor_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -154,15 +154,13 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     // the static operations
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
     static Interceptor_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Interceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Interceptor_ptr _nil (void)
       {
         return (Interceptor_ptr)0;
@@ -224,13 +222,13 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
 
     static ForwardRequest *_downcast (CORBA::Exception *);
@@ -294,13 +292,13 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
 
     static InvalidSlot *_downcast (CORBA::Exception *);
@@ -355,7 +353,7 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     static Current_ptr tao_duplicate (Current_ptr);
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static Current_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -409,25 +407,22 @@ class TAO_Export Current: public virtual CORBA::Current
     // the static operations
     static Current_ptr _duplicate (Current_ptr obj);
     static Current_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
 
     virtual CORBA::Any * get_slot (
-        PortableInterceptor::SlotId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableInterceptor::SlotId id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
@@ -435,10 +430,9 @@ class TAO_Export Current: public virtual CORBA::Current
 
     virtual void set_slot (
         PortableInterceptor::SlotId id,
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const CORBA::Any & data
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
@@ -499,7 +493,7 @@ class TAO_Export Current: public virtual CORBA::Current
     static RequestInfo_ptr tao_duplicate (RequestInfo_ptr);
     static void tao_release (RequestInfo_ptr);
     static RequestInfo_ptr tao_nil (void);
-    static RequestInfo_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RequestInfo_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -553,80 +547,70 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
     // the static operations
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
     static RequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestInfo_ptr _nil (void)
       {
         return (RequestInfo_ptr)0;
       }
 
     virtual CORBA::ULong request_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * operation (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual Dynamic::ContextList * contexts (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual Dynamic::RequestContext * operation_context (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean response_expected (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -634,9 +618,8 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
 #if TAO_HAS_CORBA_MESSAGING == 1
 
     virtual Messaging::SyncScope sync_scope (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -644,45 +627,40 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
     virtual PortableInterceptor::ReplyStatus reply_status (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Object_ptr forward_reference (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Any * get_slot (
-        PortableInterceptor::SlotId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableInterceptor::SlotId id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
       )) = 0;
 
     virtual IOP::ServiceContext * get_request_service_context (
-        IOP::ServiceId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        IOP::ServiceId id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual IOP::ServiceContext * get_reply_service_context (
-        IOP::ServiceId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        IOP::ServiceId id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -742,7 +720,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
     static ClientRequestInfo_ptr tao_duplicate (ClientRequestInfo_ptr);
     static void tao_release (ClientRequestInfo_ptr);
     static ClientRequestInfo_ptr tao_nil (void);
-    static ClientRequestInfo_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ClientRequestInfo_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -796,93 +774,82 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     // the static operations
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
     static ClientRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ClientRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ClientRequestInfo_ptr _nil (void)
       {
         return (ClientRequestInfo_ptr)0;
       }
 
     virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Object_ptr effective_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual IOP::TaggedProfile * effective_profile (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Any * received_exception (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * received_exception_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual IOP::TaggedComponent * get_effective_component (
-        IOP::ComponentId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        IOP::ComponentId id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual IOP::TaggedComponentSeq * get_effective_components (
-        IOP::ComponentId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        IOP::ComponentId id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Policy_ptr get_request_policy (
-        CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::PolicyType type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void add_request_service_context (
         const IOP::ServiceContext & service_context,
-        CORBA::Boolean replace,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean replace
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -942,7 +909,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     static ServerRequestInfo_ptr tao_duplicate (ServerRequestInfo_ptr);
     static void tao_release (ServerRequestInfo_ptr);
     static ServerRequestInfo_ptr tao_nil (void);
-    static ServerRequestInfo_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ServerRequestInfo_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -996,87 +963,77 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     // the static operations
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
     static ServerRequestInfo_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServerRequestInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServerRequestInfo_ptr _nil (void)
       {
         return (ServerRequestInfo_ptr)0;
       }
 
     virtual CORBA::Any * sending_exception (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::OctetSeq * object_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::OctetSeq * adapter_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     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
       )) = 0;
 
     virtual CORBA::Policy_ptr get_server_policy (
-        CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::PolicyType type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void set_slot (
         PortableInterceptor::SlotId id,
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const CORBA::Any & data
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
       )) = 0;
 
     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
       )) = 0;
 
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
-        CORBA::Boolean replace,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean replace
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1136,7 +1093,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     static ClientRequestInterceptor_ptr tao_duplicate (ClientRequestInterceptor_ptr);
     static void tao_release (ClientRequestInterceptor_ptr);
     static ClientRequestInterceptor_ptr tao_nil (void);
-    static ClientRequestInterceptor_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ClientRequestInterceptor_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1190,15 +1147,13 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     // the static operations
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
     static ClientRequestInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ClientRequestInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ClientRequestInterceptor_ptr _nil (void)
       {
         return (ClientRequestInterceptor_ptr)0;
@@ -1302,7 +1257,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     static ServerRequestInterceptor_ptr tao_duplicate (ServerRequestInterceptor_ptr);
     static void tao_release (ServerRequestInterceptor_ptr);
     static ServerRequestInterceptor_ptr tao_nil (void);
-    static ServerRequestInterceptor_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ServerRequestInterceptor_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1356,15 +1311,13 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     // the static operations
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
     static ServerRequestInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServerRequestInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServerRequestInterceptor_ptr _nil (void)
       {
         return (ServerRequestInterceptor_ptr)0;
@@ -1469,7 +1422,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     static IORInfo_ptr tao_duplicate (IORInfo_ptr);
     static void tao_release (IORInfo_ptr);
     static IORInfo_ptr tao_nil (void);
-    static IORInfo_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static IORInfo_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1523,44 +1476,39 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     // the static operations
     static IORInfo_ptr _duplicate (IORInfo_ptr obj);
     static IORInfo_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IORInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IORInfo_ptr _nil (void)
       {
         return (IORInfo_ptr)0;
       }
 
     virtual CORBA::Policy_ptr get_effective_policy (
-        CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::PolicyType type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void add_ior_component (
-        const IOP::TaggedComponent & component,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const IOP::TaggedComponent & component
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void add_ior_component_to_profile (
         const IOP::TaggedComponent & component,
-        IOP::ProfileId profile_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        IOP::ProfileId profile_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1620,7 +1568,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr);
     static void tao_release (IORInterceptor_ptr);
     static IORInterceptor_ptr tao_nil (void);
-    static IORInterceptor_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static IORInterceptor_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1674,15 +1622,13 @@ class TAO_Export IORInterceptor: public virtual Interceptor
     // the static operations
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
     static IORInterceptor_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IORInterceptor_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IORInterceptor_ptr _nil (void)
       {
         return (IORInterceptor_ptr)0;
@@ -1751,7 +1697,7 @@ class TAO_Export IORInterceptor: public virtual Interceptor
     static PolicyFactory_ptr tao_duplicate (PolicyFactory_ptr);
     static void tao_release (PolicyFactory_ptr);
     static PolicyFactory_ptr tao_nil (void);
-    static PolicyFactory_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static PolicyFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1805,15 +1751,13 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
     // the static operations
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
     static PolicyFactory_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static PolicyFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static PolicyFactory_ptr _nil (void)
       {
         return (PolicyFactory_ptr)0;
@@ -1884,7 +1828,7 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
     static ORBInitInfo_ptr tao_duplicate (ORBInitInfo_ptr);
     static void tao_release (ORBInitInfo_ptr);
     static ORBInitInfo_ptr tao_nil (void);
-    static ORBInitInfo_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ORBInitInfo_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1938,15 +1882,13 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     // the static operations
     static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
     static ORBInitInfo_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ORBInitInfo_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ORBInitInfo_ptr _nil (void)
       {
         return (ORBInitInfo_ptr)0;
@@ -1978,13 +1920,13 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static DuplicateName *_downcast (CORBA::Exception *);
@@ -2022,13 +1964,13 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static InvalidName *_downcast (CORBA::Exception *);
@@ -2042,94 +1984,84 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual CORBA::StringSeq * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * orb_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual IOP::CodecFactory_ptr codec_factory (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void register_initial_reference (
         const char * id,
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
 
     virtual CORBA::Object_ptr resolve_initial_references (
-        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,
         PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
 
     virtual void add_client_request_interceptor (
-        PortableInterceptor::ClientRequestInterceptor_ptr interceptor,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableInterceptor::ClientRequestInterceptor_ptr interceptor
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
 
     virtual void add_server_request_interceptor (
-        PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableInterceptor::ServerRequestInterceptor_ptr interceptor
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
 
     virtual void add_ior_interceptor (
-        PortableInterceptor::IORInterceptor_ptr interceptor,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableInterceptor::IORInterceptor_ptr interceptor
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
 
     virtual PortableInterceptor::SlotId allocate_slot_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void register_policy_factory (
         CORBA::PolicyType type,
-        PortableInterceptor::PolicyFactory_ptr policy_factory,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableInterceptor::PolicyFactory_ptr policy_factory
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2189,7 +2121,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     static ORBInitializer_ptr tao_duplicate (ORBInitializer_ptr);
     static void tao_release (ORBInitializer_ptr);
     static ORBInitializer_ptr tao_nil (void);
-    static ORBInitializer_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ORBInitializer_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2243,15 +2175,13 @@ class TAO_Export ORBInitializer : public virtual CORBA_Object
    // the static operations
     static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
     static ORBInitializer_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ORBInitializer_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ORBInitializer_ptr _nil (void)
       {
         return (ORBInitializer_ptr)0;
@@ -2292,8 +2222,8 @@ class TAO_Export ORBInitializer : public virtual CORBA_Object
 /// Register an ORBInitializer with the global ORBInitializer
 /// table.
 TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
-  ORBInitializer_ptr init,
-  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  ORBInitializer_ptr init
+  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index ad51917c359..ddc96f25a4f 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -49,11 +49,11 @@ tao_PortableInterceptor_Interceptor_nil (
 
 ACE_INLINE PortableInterceptor::Interceptor_ptr
 tao_PortableInterceptor_Interceptor_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::Interceptor::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::Interceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -107,11 +107,11 @@ tao_PortableInterceptor_Current_nil (
 
 ACE_INLINE PortableInterceptor::Current_ptr
 tao_PortableInterceptor_Current_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::Current::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -157,11 +157,11 @@ tao_PortableInterceptor_RequestInfo_nil (
 
 ACE_INLINE PortableInterceptor::RequestInfo_ptr
 tao_PortableInterceptor_RequestInfo_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::RequestInfo::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::RequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -207,11 +207,11 @@ tao_PortableInterceptor_ClientRequestInfo_nil (
 
 ACE_INLINE PortableInterceptor::ClientRequestInfo_ptr
 tao_PortableInterceptor_ClientRequestInfo_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ClientRequestInfo::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::ClientRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -257,11 +257,11 @@ tao_PortableInterceptor_ServerRequestInfo_nil (
 
 ACE_INLINE PortableInterceptor::ServerRequestInfo_ptr
 tao_PortableInterceptor_ServerRequestInfo_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ServerRequestInfo::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::ServerRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -307,11 +307,11 @@ tao_PortableInterceptor_ClientRequestInterceptor_nil (
 
 ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr
 tao_PortableInterceptor_ClientRequestInterceptor_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ClientRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::ClientRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -357,11 +357,11 @@ tao_PortableInterceptor_ServerRequestInterceptor_nil (
 
 ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr
 tao_PortableInterceptor_ServerRequestInterceptor_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ServerRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::ServerRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -407,11 +407,11 @@ tao_PortableInterceptor_IORInfo_nil (
 
 ACE_INLINE PortableInterceptor::IORInfo_ptr
 tao_PortableInterceptor_IORInfo_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::IORInfo::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::IORInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -457,11 +457,11 @@ tao_PortableInterceptor_IORInterceptor_nil (
 
 ACE_INLINE PortableInterceptor::IORInterceptor_ptr
 tao_PortableInterceptor_IORInterceptor_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::IORInterceptor::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::IORInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -507,11 +507,11 @@ tao_PortableInterceptor_PolicyFactory_nil (
 
 ACE_INLINE PortableInterceptor::PolicyFactory_ptr
 tao_PortableInterceptor_PolicyFactory_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::PolicyFactory::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::PolicyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -565,11 +565,11 @@ tao_PortableInterceptor_ORBInitInfo_nil (
 
 ACE_INLINE PortableInterceptor::ORBInitInfo_ptr
 tao_PortableInterceptor_ORBInitInfo_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ORBInitInfo::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -615,11 +615,11 @@ tao_PortableInterceptor_ORBInitializer_nil (
 
 ACE_INLINE PortableInterceptor::ORBInitializer_ptr
 tao_PortableInterceptor_ORBInitializer_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ORBInitializer::_narrow (p, ACE_TRY_ENV);
+  return PortableInterceptor::ORBInitializer::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 972483260bc..652536ff186 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -83,8 +83,8 @@ TAO_Active_Object_Map::set_system_id_size
 TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
                                               int unique_id_policy,
                                               int persistent_id_policy,
-                                              const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                                              CORBA_Environment &ACE_TRY_ENV)
+                                              const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
+                                              TAO_ENV_ARG_DECL)
   : user_id_map_ (0),
     servant_map_ (0),
     id_uniqueness_strategy_ (0),
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 9722c2d6ffc..0e28031dc06 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -76,8 +76,8 @@ public:
   TAO_Active_Object_Map (int user_id_policy,
                          int unique_id_policy,
                          int persistent_id_policy,
-                         const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                         CORBA_Environment &ACE_TRY_ENV);
+                         const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
+                         TAO_ENV_ARG_DECL);
   // Constructor.
 
   ~TAO_Active_Object_Map (void);
diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp
index 944a336a861..30f5e9f4400 100644
--- a/TAO/tao/PortableServer/Collocated_Object.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object.cpp
@@ -24,8 +24,8 @@ TAO_Collocated_Object::_servant (void) const
 }
 */
 TAO_Collocated_Object *
-TAO_Collocated_Object::_narrow (CORBA::Object_ptr object,
-                                CORBA::Environment &)
+TAO_Collocated_Object::_narrow (CORBA::Object_ptr object
+                                TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (object == 0)
     return 0;
@@ -39,12 +39,12 @@ TAO_Collocated_Object::_narrow (CORBA::Object_ptr object,
 }
 
 CORBA::Boolean
-TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id,
-                              CORBA_Environment &ACE_TRY_ENV)
+TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id
+                              TAO_ENV_ARG_DECL)
 {
   // If the object is collocated then try locally....
   if (!this->_is_collocated ())
-    return this->CORBA_Object::_is_a (logical_type_id, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
 
   if (this->_stubobj ()->type_id.in () != 0
       && ACE_OS::strcmp (logical_type_id,
@@ -64,27 +64,27 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id,
       CORBA::Object_var forward_to;
       servant_upcall.prepare_for_upcall (this->_object_key (),
                                          "_is_a",
-                                         forward_to.out (),
-                                         ACE_TRY_ENV);
+                                         forward_to.out ()
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      return servant_upcall.servant ()->_is_a (logical_type_id, ACE_TRY_ENV);
+      return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
     }
 
   // Direct collocation strategy is used.
   if (this->servant_ != 0)
-    return this->servant_->_is_a (logical_type_id, ACE_TRY_ENV);
+    return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
 
   // @@ Maybe we want to change this exception...
   ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
 }
 
 CORBA::Boolean
-TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj
+                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   CORBA::Boolean equivalent =
-    this->CORBA_Object::_is_equivalent (other_obj, ACE_TRY_ENV);
+    this->CORBA_Object::_is_equivalent (other_obj TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (equivalent)
@@ -106,7 +106,7 @@ TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj,
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 CORBA::Boolean
-TAO_Collocated_Object::_non_existent (CORBA_Environment &ACE_TRY_ENV)
+TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
@@ -114,7 +114,7 @@ TAO_Collocated_Object::_non_existent (CORBA_Environment &ACE_TRY_ENV)
     {
       // If the object is collocated then try locally....
       if (!this->_is_collocated ())
-        return this->CORBA_Object::_non_existent (ACE_TRY_ENV);
+        return this->CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       TAO_Stub *stub = this->_stubobj ();
 
@@ -130,15 +130,15 @@ TAO_Collocated_Object::_non_existent (CORBA_Environment &ACE_TRY_ENV)
           CORBA::Object_var forward_to;
           servant_upcall.prepare_for_upcall (this->_object_key (),
                                              "_non_existent",
-                                             forward_to.out (),
-                                             ACE_TRY_ENV);
+                                             forward_to.out ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          return servant_upcall.servant ()->_non_existent (ACE_TRY_ENV);
+          return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
         }
 
       // Direct collocation strategy is used.
       if (this->servant_ != 0)
-        return this->servant_->_non_existent (ACE_TRY_ENV);
+        return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       // @@ Maybe we want to change this exception...
       ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h
index 8949a219e8a..5326817da53 100644
--- a/TAO/tao/PortableServer/Collocated_Object.h
+++ b/TAO/tao/PortableServer/Collocated_Object.h
@@ -43,21 +43,18 @@ public:
   // return the associated servant (if one exists)
 */
 
-  static TAO_Collocated_Object *_narrow (CORBA::Object_ptr object,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ());
+  static TAO_Collocated_Object *_narrow (CORBA::Object_ptr object
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Downcast operation
 
   // = The CORBA_Object methods, check the tao/Object.h file for details
-  virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
-  virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj,
-                                         CORBA::Environment &)
+  virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj
+                                         TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC (());
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 #endif /* TAO_HAS_MINIMUM_CORBA */
   virtual void *_tao_QueryInterface(ptr_arith_t type);
 
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index b53222baed7..d468d286d39 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -17,27 +17,27 @@ TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void)
 }
 
 void
-TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
-                                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
+                                                 TAO_ENV_ARG_DECL)
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION);
   PortableServer::ServantRetentionPolicy_var srp =
-    PortableServer::ServantRetentionPolicy::_narrow (policy.in (),
-                                                     ACE_TRY_ENV);
+    PortableServer::ServantRetentionPolicy::_narrow (policy.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ServantRetentionPolicyValue servant_retention =
-    srp->value (ACE_TRY_ENV);
+    srp->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING);
   PortableServer::RequestProcessingPolicy_var rpp =
-    PortableServer::RequestProcessingPolicy::_narrow (policy.in (),
-                                                      ACE_TRY_ENV);
+    PortableServer::RequestProcessingPolicy::_narrow (policy.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::RequestProcessingPolicyValue request_processing =
-    rpp->value (ACE_TRY_ENV);
+    rpp->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
@@ -55,30 +55,30 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
 
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS);
   PortableServer::IdUniquenessPolicy_var iup =
-    PortableServer::IdUniquenessPolicy::_narrow (policy.in (),
-                                                 ACE_TRY_ENV);
+    PortableServer::IdUniquenessPolicy::_narrow (policy.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::IdUniquenessPolicyValue id_uniqueness =
-    iup->value (ACE_TRY_ENV);
+    iup->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION);
   PortableServer::ImplicitActivationPolicy_var iap =
-    PortableServer::ImplicitActivationPolicy::_narrow (policy.in (),
-                                                       ACE_TRY_ENV);
+    PortableServer::ImplicitActivationPolicy::_narrow (policy.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ImplicitActivationPolicyValue implicit_activation =
-    iap->value (ACE_TRY_ENV);
+    iap->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT);
   PortableServer::IdAssignmentPolicy_var idap =
-    PortableServer::IdAssignmentPolicy::_narrow (policy.in (),
-                                                 ACE_TRY_ENV);
+    PortableServer::IdAssignmentPolicy::_narrow (policy.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::IdAssignmentPolicyValue id_assignment =
-    idap->value (ACE_TRY_ENV);
+    idap->value (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -94,7 +94,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
       ACE_THROW (PortableServer::POA::InvalidPolicy ());
 #else /* TAO_HAS_MINIMUM_POA == 0 */
   ACE_UNUSED_ARG (policies);
-  ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 }
 
@@ -112,7 +112,7 @@ TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 }
 
 void
-TAO_POA_Default_Policy_Validator::merge_policies_impl (TAO_Policy_Set &,
-                                                       CORBA::Environment &)
+TAO_POA_Default_Policy_Validator::merge_policies_impl (TAO_Policy_Set &
+                                                       TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index 19191498ed2..87907d6a0f0 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -39,12 +39,12 @@ protected:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  void validate_impl (TAO_Policy_Set &policies,
-                      CORBA::Environment &ACE_TRY_ENV);
+  void validate_impl (TAO_Policy_Set &policies
+                      TAO_ENV_ARG_DECL);
 
   /// Add/merge policies.
-  void merge_policies_impl (TAO_Policy_Set &policies,
-                            CORBA::Environment &ACE_TRY_ENV);
+  void merge_policies_impl (TAO_Policy_Set &policies
+                            TAO_ENV_ARG_DECL);
 
   /**
    * Return whether the specified policy type is legal for the
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index bdda43c16c5..b4aea740b64 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -12,12 +12,12 @@ TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
 void
 TAO_Default_Servant_Dispatcher::dispatch (
   TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-  TAO_ServerRequest &req,
-  CORBA::Environment &ACE_TRY_ENV)
+  TAO_ServerRequest &req
+  TAO_ENV_ARG_DECL)
 {
   servant_upcall.servant ()->_dispatch (req,
-                                        &servant_upcall,
-                                        ACE_TRY_ENV);
+                                        &servant_upcall
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_POA *
@@ -28,8 +28,8 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name,
                                             ACE_Lock &lock,
                                             TAO_SYNCH_MUTEX &thread_lock,
                                             TAO_ORB_Core &orb_core,
-                                            TAO_Object_Adapter *object_adapter,
-                                            CORBA_Environment &ACE_TRY_ENV)
+                                            TAO_Object_Adapter *object_adapter
+                                            TAO_ENV_ARG_DECL)
 {
   TAO_POA *poa;
 
@@ -41,8 +41,8 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter,
-                             ACE_TRY_ENV),
+                             object_adapter
+                             TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index 4f0da7c6691..339747a9645 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -39,8 +39,8 @@ public:
 
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                         TAO_ServerRequest &req,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         TAO_ServerRequest &req
+                         TAO_ENV_ARG_DECL);
 
   /// Factory method for creating new POA's.
   virtual TAO_POA *create_POA (const ACE_CString &name,
@@ -50,8 +50,8 @@ public:
                                ACE_Lock &lock,
                                TAO_SYNCH_MUTEX &thread_lock,
                                TAO_ORB_Core &orb_core,
-                               TAO_Object_Adapter *object_adapter,
-                               CORBA_Environment &ACE_TRY_ENV);
+                               TAO_Object_Adapter *object_adapter
+                               TAO_ENV_ARG_DECL);
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
index 1d0abbacf2a..c86f002de75 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
@@ -19,26 +19,26 @@ TAO_Direct_Object_Proxy_Impl::~TAO_Direct_Object_Proxy_Impl (void)
 
 CORBA::Boolean
 TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
-                                     const CORBA::Char *logical_type_id,
-                                     CORBA_Environment &ACE_TRY_ENV )
+                                     const CORBA::Char *logical_type_id
+                                     TAO_ENV_ARG_DECL )
 {
 
-  return target->_servant ()->_is_a (logical_type_id,
-                                     ACE_TRY_ENV);
+  return target->_servant ()->_is_a (logical_type_id
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 CORBA::Boolean
-TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
-                                             CORBA_Environment &ACE_TRY_ENV)
+TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
+                                             TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
   ACE_TRY
     {
       if (target->_servant () != 0)
-        return target->_servant ()->_non_existent (ACE_TRY_ENV);
+        return target->_servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       // @@ Maybe we want to change this exception...
       ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
@@ -57,13 +57,13 @@ TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
 }
 
 CORBA_InterfaceDef_ptr
-TAO_Direct_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target,
-                                              CORBA_Environment &ACE_TRY_ENV)
+TAO_Direct_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
+                                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       if (target->_servant () != 0)
-        return target->_servant ()->_get_interface (ACE_TRY_ENV);
+        return target->_servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       // @@ Maybe we want to change this exception...
       ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
index c8bd14f1a39..bb6927fdad3 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
@@ -34,7 +34,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_PortableServer_Export TAO_Direct_Object_Proxy_Impl : 
+class TAO_PortableServer_Export TAO_Direct_Object_Proxy_Impl :
   public virtual TAO_Object_Proxy_Impl
 {
   // = TITLE
@@ -50,17 +50,17 @@ public:
   virtual ~TAO_Direct_Object_Proxy_Impl (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
-                                const CORBA::Char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV);
+                                const CORBA::Char *logical_type_id
+                                TAO_ENV_ARG_DECL);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target,
-                                        CORBA_Environment &ACE_TRY_ENV);
+  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
+                                        TAO_ENV_ARG_DECL);
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      const CORBA::Object_ptr target,
-      CORBA_Environment &ACE_TRY_ENV
+      const CORBA::Object_ptr target
+      TAO_ENV_ARG_DECL
     );
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 5f395427bcd..d8ae103334e 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -89,7 +89,7 @@ ImplementationRepository::ServerObject_var::operator const ::ImplementationRepos
   return this->ptr_;
 }
 
-ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast 
+ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -149,11 +149,11 @@ ImplementationRepository::ServerObject_var::tao_nil (void)
 
 ::ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV);
+  return ::ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -229,79 +229,75 @@ class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public
 public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
 private:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
 
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::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_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::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_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::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;
 }
 
@@ -310,86 +306,82 @@ class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : pub
 public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
 private:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
 
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::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_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::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_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::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;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void)
@@ -401,22 +393,22 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject
 // Remote Implementation of the IDL interface methods
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
-  
-  
-  
+
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "ping",
@@ -424,151 +416,151 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
 }
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
-  
-  
-  
+
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown",
@@ -576,129 +568,129 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -706,7 +698,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -744,8 +736,8 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::~_TAO_ServerObj
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl&
 ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::ServerObject *,
-  CORBA::Environment &
+  ::ImplementationRepository::ServerObject *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -785,25 +777,25 @@ void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_voi
 }
 
 ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ServerObject::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ServerObject::_nil ());
       if (is_a == 0)
         return ServerObject::_nil ();
     }
-  return ServerObject::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServerObject::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -832,7 +824,7 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec
               ServerObject::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -845,10 +837,10 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec
               ServerObject::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast
         (
@@ -872,14 +864,14 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type)
@@ -892,7 +884,7 @@ void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -904,36 +896,36 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo
 }
 
 void ImplementationRepository::ServerObject::ping (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy = 
-    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_ServerObject_Proxy_Impl &proxy =
+    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.ping (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::ServerObject::shutdown (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy = 
-    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_ServerObject_Proxy_Impl &proxy =
+    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.shutdown (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -941,22 +933,22 @@ static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x7665724f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x7665724f),
+  ACE_NTOHL (0x626a6563),
+  ACE_NTOHL (0x743a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
   13,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65724f62), 
-  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x65724f62),
+  ACE_NTOHL (0x6a656374),
   ACE_NTOHL (0x0),  // name = ServerObject
 };
 
@@ -977,36 +969,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f456e76), 
-  ACE_NTOHL (0x69726f6e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x56617269), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f456e76),
+  ACE_NTOHL (0x69726f6e),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x56617269),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
   20,
-  ACE_NTOHL (0x456e7669), 
-  ACE_NTOHL (0x726f6e6d), 
-  ACE_NTOHL (0x656e7456), 
-  ACE_NTOHL (0x61726961), 
+  ACE_NTOHL (0x456e7669),
+  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e7456),
+  ACE_NTOHL (0x61726961),
   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
   5,
-  ACE_NTOHL (0x6e616d65), 
+  ACE_NTOHL (0x6e616d65),
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   6,
-  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x76616c75),
   ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -1033,21 +1025,21 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f416464), 
-  ACE_NTOHL (0x72657373), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f416464),
+  ACE_NTOHL (0x72657373),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
   8,
-  ACE_NTOHL (0x41646472), 
+  ACE_NTOHL (0x41646472),
   ACE_NTOHL (0x65737300),  // name = Address
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -1075,17 +1067,17 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 {
   ImplementationRepository::EnvironmentVariable* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp[i] = old[i];
-    
+
     if (this->release_)
       _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
-    
+
   }
   this->buffer_ = tmp;
 }
@@ -1095,12 +1087,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
-  
+
   ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
-  
+
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
   this->buffer_ = 0;
-} 
+}
 
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor.
 {
@@ -1111,7 +1103,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
@@ -1123,30 +1115,30 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 ImplementationRepository::EnvironmentList::EnvironmentList (void)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor
@@ -1164,23 +1156,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f456e76), 
-  ACE_NTOHL (0x69726f6e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f456e76),
+  ACE_NTOHL (0x69726f6e),
+  ACE_NTOHL (0x6d656e74),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
   16,
-  ACE_NTOHL (0x456e7669), 
-  ACE_NTOHL (0x726f6e6d), 
-  ACE_NTOHL (0x656e744c), 
+  ACE_NTOHL (0x456e7669),
+  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e744c),
   ACE_NTOHL (0x69737400),  // name = EnvironmentList
   CORBA::tk_sequence, // typecode kind
   148, // encapsulation length
@@ -1189,36 +1181,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
     132, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       53,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f456e76), 
-      ACE_NTOHL (0x69726f6e), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x56617269), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f456e76),
+      ACE_NTOHL (0x69726f6e),
+      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x56617269),
+      ACE_NTOHL (0x61626c65),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
       20,
-      ACE_NTOHL (0x456e7669), 
-      ACE_NTOHL (0x726f6e6d), 
-      ACE_NTOHL (0x656e7456), 
-      ACE_NTOHL (0x61726961), 
+      ACE_NTOHL (0x456e7669),
+      ACE_NTOHL (0x726f6e6d),
+      ACE_NTOHL (0x656e7456),
+      ACE_NTOHL (0x61726961),
       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
       5,
-      ACE_NTOHL (0x6e616d65), 
+      ACE_NTOHL (0x6e616d65),
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       6,
-      ACE_NTOHL (0x76616c75), 
+      ACE_NTOHL (0x76616c75),
       ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
 
     0U,
@@ -1242,37 +1234,37 @@ static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f416374), 
-  ACE_NTOHL (0x69766174), 
-  ACE_NTOHL (0x696f6e4d), 
-  ACE_NTOHL (0x6f64653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f416374),
+  ACE_NTOHL (0x69766174),
+  ACE_NTOHL (0x696f6e4d),
+  ACE_NTOHL (0x6f64653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
   15,
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76617469), 
-  ACE_NTOHL (0x6f6e4d6f), 
+  ACE_NTOHL (0x41637469),
+  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x6f6e4d6f),
   ACE_NTOHL (0x64650000),  // name = ActivationMode
   4, // member count
   7,
-  ACE_NTOHL (0x4e4f524d), 
+  ACE_NTOHL (0x4e4f524d),
   ACE_NTOHL (0x414c0000),  // name = NORMAL
   7,
-  ACE_NTOHL (0x4d414e55), 
+  ACE_NTOHL (0x4d414e55),
   ACE_NTOHL (0x414c0000),  // name = MANUAL
   11,
-  ACE_NTOHL (0x5045525f), 
-  ACE_NTOHL (0x434c4945), 
+  ACE_NTOHL (0x5045525f),
+  ACE_NTOHL (0x434c4945),
   ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
   11,
-  ACE_NTOHL (0x4155544f), 
-  ACE_NTOHL (0x5f535441), 
+  ACE_NTOHL (0x4155544f),
+  ACE_NTOHL (0x5f535441),
   ACE_NTOHL (0x52540000),  // name = AUTO_START
 };
 
@@ -1293,56 +1285,56 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f537461), 
-  ACE_NTOHL (0x72747570), 
-  ACE_NTOHL (0x4f707469), 
-  ACE_NTOHL (0x6f6e733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f537461),
+  ACE_NTOHL (0x72747570),
+  ACE_NTOHL (0x4f707469),
+  ACE_NTOHL (0x6f6e733a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
   15,
-  ACE_NTOHL (0x53746172), 
-  ACE_NTOHL (0x7475704f), 
-  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x53746172),
+  ACE_NTOHL (0x7475704f),
+  ACE_NTOHL (0x7074696f),
   ACE_NTOHL (0x6e730000),  // name = StartupOptions
   4, // member count
   13,
-  ACE_NTOHL (0x636f6d6d), 
-  ACE_NTOHL (0x616e645f), 
-  ACE_NTOHL (0x6c696e65), 
+  ACE_NTOHL (0x636f6d6d),
+  ACE_NTOHL (0x616e645f),
+  ACE_NTOHL (0x6c696e65),
   ACE_NTOHL (0x0),  // name = command_line
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   12,
-  ACE_NTOHL (0x656e7669), 
-  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e7669),
+  ACE_NTOHL (0x726f6e6d),
   ACE_NTOHL (0x656e7400),  // name = environment
   CORBA::tk_alias, // typecode kind for typedefs
   236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     49,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f456e76), 
-    ACE_NTOHL (0x69726f6e), 
-    ACE_NTOHL (0x6d656e74), 
-    ACE_NTOHL (0x4c697374), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f456e76),
+    ACE_NTOHL (0x69726f6e),
+    ACE_NTOHL (0x6d656e74),
+    ACE_NTOHL (0x4c697374),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
     16,
-    ACE_NTOHL (0x456e7669), 
-    ACE_NTOHL (0x726f6e6d), 
-    ACE_NTOHL (0x656e744c), 
+    ACE_NTOHL (0x456e7669),
+    ACE_NTOHL (0x726f6e6d),
+    ACE_NTOHL (0x656e744c),
     ACE_NTOHL (0x69737400),  // name = EnvironmentList
     CORBA::tk_sequence, // typecode kind
     148, // encapsulation length
@@ -1351,88 +1343,88 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
       132, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         53,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f456e76), 
-        ACE_NTOHL (0x69726f6e), 
-        ACE_NTOHL (0x6d656e74), 
-        ACE_NTOHL (0x56617269), 
-        ACE_NTOHL (0x61626c65), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x496d706c),
+        ACE_NTOHL (0x656d656e),
+        ACE_NTOHL (0x74617469),
+        ACE_NTOHL (0x6f6e5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x2f456e76),
+        ACE_NTOHL (0x69726f6e),
+        ACE_NTOHL (0x6d656e74),
+        ACE_NTOHL (0x56617269),
+        ACE_NTOHL (0x61626c65),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
         20,
-        ACE_NTOHL (0x456e7669), 
-        ACE_NTOHL (0x726f6e6d), 
-        ACE_NTOHL (0x656e7456), 
-        ACE_NTOHL (0x61726961), 
+        ACE_NTOHL (0x456e7669),
+        ACE_NTOHL (0x726f6e6d),
+        ACE_NTOHL (0x656e7456),
+        ACE_NTOHL (0x61726961),
         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
         5,
-        ACE_NTOHL (0x6e616d65), 
+        ACE_NTOHL (0x6e616d65),
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
         6,
-        ACE_NTOHL (0x76616c75), 
+        ACE_NTOHL (0x76616c75),
         ACE_NTOHL (0x65000000),  // name = value
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       0U,
 
 
   18,
-  ACE_NTOHL (0x776f726b), 
-  ACE_NTOHL (0x696e675f), 
-  ACE_NTOHL (0x64697265), 
-  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x776f726b),
+  ACE_NTOHL (0x696e675f),
+  ACE_NTOHL (0x64697265),
+  ACE_NTOHL (0x63746f72),
   ACE_NTOHL (0x79000000),  // name = working_directory
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   11,
-  ACE_NTOHL (0x61637469), 
-  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x61637469),
+  ACE_NTOHL (0x76617469),
   ACE_NTOHL (0x6f6e0000),  // name = activation
   CORBA::tk_enum, // typecode kind
   136, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f416374), 
-    ACE_NTOHL (0x69766174), 
-    ACE_NTOHL (0x696f6e4d), 
-    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f416374),
+    ACE_NTOHL (0x69766174),
+    ACE_NTOHL (0x696f6e4d),
+    ACE_NTOHL (0x6f64653a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
     15,
-    ACE_NTOHL (0x41637469), 
-    ACE_NTOHL (0x76617469), 
-    ACE_NTOHL (0x6f6e4d6f), 
+    ACE_NTOHL (0x41637469),
+    ACE_NTOHL (0x76617469),
+    ACE_NTOHL (0x6f6e4d6f),
     ACE_NTOHL (0x64650000),  // name = ActivationMode
     4, // member count
     7,
-    ACE_NTOHL (0x4e4f524d), 
+    ACE_NTOHL (0x4e4f524d),
     ACE_NTOHL (0x414c0000),  // name = NORMAL
     7,
-    ACE_NTOHL (0x4d414e55), 
+    ACE_NTOHL (0x4d414e55),
     ACE_NTOHL (0x414c0000),  // name = MANUAL
     11,
-    ACE_NTOHL (0x5045525f), 
-    ACE_NTOHL (0x434c4945), 
+    ACE_NTOHL (0x5045525f),
+    ACE_NTOHL (0x434c4945),
     ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
     11,
-    ACE_NTOHL (0x4155544f), 
-    ACE_NTOHL (0x5f535441), 
+    ACE_NTOHL (0x4155544f),
+    ACE_NTOHL (0x5f535441),
     ACE_NTOHL (0x52540000),  // name = AUTO_START
 
 };
@@ -1460,95 +1452,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e3a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x76657249),
+  ACE_NTOHL (0x6e666f72),
+  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x6f6e3a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
   18,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6572496e),
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x6174696f),
   ACE_NTOHL (0x6e000000),  // name = ServerInformation
   4, // member count
   15,
-  ACE_NTOHL (0x6c6f6769), 
-  ACE_NTOHL (0x63616c5f), 
-  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x6c6f6769),
+  ACE_NTOHL (0x63616c5f),
+  ACE_NTOHL (0x73657276),
   ACE_NTOHL (0x65720000),  // name = logical_server
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   7,
-  ACE_NTOHL (0x73657276), 
+  ACE_NTOHL (0x73657276),
   ACE_NTOHL (0x65720000),  // name = server
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   8,
-  ACE_NTOHL (0x73746172), 
+  ACE_NTOHL (0x73746172),
   ACE_NTOHL (0x74757000),  // name = startup
   CORBA::tk_struct, // typecode kind
   560, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f537461), 
-    ACE_NTOHL (0x72747570), 
-    ACE_NTOHL (0x4f707469), 
-    ACE_NTOHL (0x6f6e733a), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f537461),
+    ACE_NTOHL (0x72747570),
+    ACE_NTOHL (0x4f707469),
+    ACE_NTOHL (0x6f6e733a),
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
     15,
-    ACE_NTOHL (0x53746172), 
-    ACE_NTOHL (0x7475704f), 
-    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x53746172),
+    ACE_NTOHL (0x7475704f),
+    ACE_NTOHL (0x7074696f),
     ACE_NTOHL (0x6e730000),  // name = StartupOptions
     4, // member count
     13,
-    ACE_NTOHL (0x636f6d6d), 
-    ACE_NTOHL (0x616e645f), 
-    ACE_NTOHL (0x6c696e65), 
+    ACE_NTOHL (0x636f6d6d),
+    ACE_NTOHL (0x616e645f),
+    ACE_NTOHL (0x6c696e65),
     ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
     12,
-    ACE_NTOHL (0x656e7669), 
-    ACE_NTOHL (0x726f6e6d), 
+    ACE_NTOHL (0x656e7669),
+    ACE_NTOHL (0x726f6e6d),
     ACE_NTOHL (0x656e7400),  // name = environment
     CORBA::tk_alias, // typecode kind for typedefs
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       49,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f456e76), 
-      ACE_NTOHL (0x69726f6e), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x4c697374), 
-      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f456e76),
+      ACE_NTOHL (0x69726f6e),
+      ACE_NTOHL (0x6d656e74),
+      ACE_NTOHL (0x4c697374),
+      ACE_NTOHL (0x3a312e30),
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
       16,
-      ACE_NTOHL (0x456e7669), 
-      ACE_NTOHL (0x726f6e6d), 
-      ACE_NTOHL (0x656e744c), 
+      ACE_NTOHL (0x456e7669),
+      ACE_NTOHL (0x726f6e6d),
+      ACE_NTOHL (0x656e744c),
       ACE_NTOHL (0x69737400),  // name = EnvironmentList
       CORBA::tk_sequence, // typecode kind
       148, // encapsulation length
@@ -1557,114 +1549,114 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
         132, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           53,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f456e76), 
-          ACE_NTOHL (0x69726f6e), 
-          ACE_NTOHL (0x6d656e74), 
-          ACE_NTOHL (0x56617269), 
-          ACE_NTOHL (0x61626c65), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x496d706c),
+          ACE_NTOHL (0x656d656e),
+          ACE_NTOHL (0x74617469),
+          ACE_NTOHL (0x6f6e5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x2f456e76),
+          ACE_NTOHL (0x69726f6e),
+          ACE_NTOHL (0x6d656e74),
+          ACE_NTOHL (0x56617269),
+          ACE_NTOHL (0x61626c65),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
           20,
-          ACE_NTOHL (0x456e7669), 
-          ACE_NTOHL (0x726f6e6d), 
-          ACE_NTOHL (0x656e7456), 
-          ACE_NTOHL (0x61726961), 
+          ACE_NTOHL (0x456e7669),
+          ACE_NTOHL (0x726f6e6d),
+          ACE_NTOHL (0x656e7456),
+          ACE_NTOHL (0x61726961),
           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
           5,
-          ACE_NTOHL (0x6e616d65), 
+          ACE_NTOHL (0x6e616d65),
           ACE_NTOHL (0x0),  // name = name
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
           6,
-          ACE_NTOHL (0x76616c75), 
+          ACE_NTOHL (0x76616c75),
           ACE_NTOHL (0x65000000),  // name = value
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         0U,
 
 
     18,
-    ACE_NTOHL (0x776f726b), 
-    ACE_NTOHL (0x696e675f), 
-    ACE_NTOHL (0x64697265), 
-    ACE_NTOHL (0x63746f72), 
+    ACE_NTOHL (0x776f726b),
+    ACE_NTOHL (0x696e675f),
+    ACE_NTOHL (0x64697265),
+    ACE_NTOHL (0x63746f72),
     ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
     11,
-    ACE_NTOHL (0x61637469), 
-    ACE_NTOHL (0x76617469), 
+    ACE_NTOHL (0x61637469),
+    ACE_NTOHL (0x76617469),
     ACE_NTOHL (0x6f6e0000),  // name = activation
     CORBA::tk_enum, // typecode kind
     136, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       48,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f416374), 
-      ACE_NTOHL (0x69766174), 
-      ACE_NTOHL (0x696f6e4d), 
-      ACE_NTOHL (0x6f64653a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f416374),
+      ACE_NTOHL (0x69766174),
+      ACE_NTOHL (0x696f6e4d),
+      ACE_NTOHL (0x6f64653a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
       15,
-      ACE_NTOHL (0x41637469), 
-      ACE_NTOHL (0x76617469), 
-      ACE_NTOHL (0x6f6e4d6f), 
+      ACE_NTOHL (0x41637469),
+      ACE_NTOHL (0x76617469),
+      ACE_NTOHL (0x6f6e4d6f),
       ACE_NTOHL (0x64650000),  // name = ActivationMode
       4, // member count
       7,
-      ACE_NTOHL (0x4e4f524d), 
+      ACE_NTOHL (0x4e4f524d),
       ACE_NTOHL (0x414c0000),  // name = NORMAL
       7,
-      ACE_NTOHL (0x4d414e55), 
+      ACE_NTOHL (0x4d414e55),
       ACE_NTOHL (0x414c0000),  // name = MANUAL
       11,
-      ACE_NTOHL (0x5045525f), 
-      ACE_NTOHL (0x434c4945), 
+      ACE_NTOHL (0x5045525f),
+      ACE_NTOHL (0x434c4945),
       ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
       11,
-      ACE_NTOHL (0x4155544f), 
-      ACE_NTOHL (0x5f535441), 
+      ACE_NTOHL (0x4155544f),
+      ACE_NTOHL (0x5f535441),
       ACE_NTOHL (0x52540000),  // name = AUTO_START
 
 
   9,
-  ACE_NTOHL (0x6c6f6361), 
-  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x6c6f6361),
+  ACE_NTOHL (0x74696f6e),
   ACE_NTOHL (0x0),  // name = location
   CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f416464), 
-    ACE_NTOHL (0x72657373), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x496d706c),
+    ACE_NTOHL (0x656d656e),
+    ACE_NTOHL (0x74617469),
+    ACE_NTOHL (0x6f6e5265),
+    ACE_NTOHL (0x706f7369),
+    ACE_NTOHL (0x746f7279),
+    ACE_NTOHL (0x2f416464),
+    ACE_NTOHL (0x72657373),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
     8,
-    ACE_NTOHL (0x41646472), 
+    ACE_NTOHL (0x41646472),
     ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
 };
@@ -1699,17 +1691,17 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 {
   ImplementationRepository::ServerInformation* tmp = 0;
   tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
-  
+
   if (this->buffer_ != 0)
   {
     ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp[i] = old[i];
-    
+
     if (this->release_)
       _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
-    
+
   }
   this->buffer_ = tmp;
 }
@@ -1719,12 +1711,12 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 {
   if (this->buffer_ == 0 || this->release_ == 0)
     return;
-  
+
   ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
-  
+
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
   this->buffer_ = 0;
-} 
+}
 
 ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor.
 {
@@ -1735,7 +1727,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
@@ -1747,30 +1739,30 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 ImplementationRepository::ServerInformationList::ServerInformationList (void)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
 TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor
@@ -1788,26 +1780,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e4c69), 
-  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x76657249),
+  ACE_NTOHL (0x6e666f72),
+  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x6f6e4c69),
+  ACE_NTOHL (0x73743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
   22,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e4c6973), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6572496e),
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e4c6973),
   ACE_NTOHL (0x74000000),  // name = ServerInformationList
   CORBA::tk_sequence, // typecode kind
   828, // encapsulation length
@@ -1816,95 +1808,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
     812, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       51,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f536572), 
-      ACE_NTOHL (0x76657249), 
-      ACE_NTOHL (0x6e666f72), 
-      ACE_NTOHL (0x6d617469), 
-      ACE_NTOHL (0x6f6e3a31), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x496d706c),
+      ACE_NTOHL (0x656d656e),
+      ACE_NTOHL (0x74617469),
+      ACE_NTOHL (0x6f6e5265),
+      ACE_NTOHL (0x706f7369),
+      ACE_NTOHL (0x746f7279),
+      ACE_NTOHL (0x2f536572),
+      ACE_NTOHL (0x76657249),
+      ACE_NTOHL (0x6e666f72),
+      ACE_NTOHL (0x6d617469),
+      ACE_NTOHL (0x6f6e3a31),
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
       18,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x6572496e), 
-      ACE_NTOHL (0x666f726d), 
-      ACE_NTOHL (0x6174696f), 
+      ACE_NTOHL (0x53657276),
+      ACE_NTOHL (0x6572496e),
+      ACE_NTOHL (0x666f726d),
+      ACE_NTOHL (0x6174696f),
       ACE_NTOHL (0x6e000000),  // name = ServerInformation
       4, // member count
       15,
-      ACE_NTOHL (0x6c6f6769), 
-      ACE_NTOHL (0x63616c5f), 
-      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x6c6f6769),
+      ACE_NTOHL (0x63616c5f),
+      ACE_NTOHL (0x73657276),
       ACE_NTOHL (0x65720000),  // name = logical_server
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       7,
-      ACE_NTOHL (0x73657276), 
+      ACE_NTOHL (0x73657276),
       ACE_NTOHL (0x65720000),  // name = server
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       8,
-      ACE_NTOHL (0x73746172), 
+      ACE_NTOHL (0x73746172),
       ACE_NTOHL (0x74757000),  // name = startup
       CORBA::tk_struct, // typecode kind
       560, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         48,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f537461), 
-        ACE_NTOHL (0x72747570), 
-        ACE_NTOHL (0x4f707469), 
-        ACE_NTOHL (0x6f6e733a), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x496d706c),
+        ACE_NTOHL (0x656d656e),
+        ACE_NTOHL (0x74617469),
+        ACE_NTOHL (0x6f6e5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x2f537461),
+        ACE_NTOHL (0x72747570),
+        ACE_NTOHL (0x4f707469),
+        ACE_NTOHL (0x6f6e733a),
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
         15,
-        ACE_NTOHL (0x53746172), 
-        ACE_NTOHL (0x7475704f), 
-        ACE_NTOHL (0x7074696f), 
+        ACE_NTOHL (0x53746172),
+        ACE_NTOHL (0x7475704f),
+        ACE_NTOHL (0x7074696f),
         ACE_NTOHL (0x6e730000),  // name = StartupOptions
         4, // member count
         13,
-        ACE_NTOHL (0x636f6d6d), 
-        ACE_NTOHL (0x616e645f), 
-        ACE_NTOHL (0x6c696e65), 
+        ACE_NTOHL (0x636f6d6d),
+        ACE_NTOHL (0x616e645f),
+        ACE_NTOHL (0x6c696e65),
         ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
         12,
-        ACE_NTOHL (0x656e7669), 
-        ACE_NTOHL (0x726f6e6d), 
+        ACE_NTOHL (0x656e7669),
+        ACE_NTOHL (0x726f6e6d),
         ACE_NTOHL (0x656e7400),  // name = environment
         CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           49,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f456e76), 
-          ACE_NTOHL (0x69726f6e), 
-          ACE_NTOHL (0x6d656e74), 
-          ACE_NTOHL (0x4c697374), 
-          ACE_NTOHL (0x3a312e30), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x496d706c),
+          ACE_NTOHL (0x656d656e),
+          ACE_NTOHL (0x74617469),
+          ACE_NTOHL (0x6f6e5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x2f456e76),
+          ACE_NTOHL (0x69726f6e),
+          ACE_NTOHL (0x6d656e74),
+          ACE_NTOHL (0x4c697374),
+          ACE_NTOHL (0x3a312e30),
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
           16,
-          ACE_NTOHL (0x456e7669), 
-          ACE_NTOHL (0x726f6e6d), 
-          ACE_NTOHL (0x656e744c), 
+          ACE_NTOHL (0x456e7669),
+          ACE_NTOHL (0x726f6e6d),
+          ACE_NTOHL (0x656e744c),
           ACE_NTOHL (0x69737400),  // name = EnvironmentList
           CORBA::tk_sequence, // typecode kind
           148, // encapsulation length
@@ -1913,114 +1905,114 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
             132, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               53,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x496d706c), 
-              ACE_NTOHL (0x656d656e), 
-              ACE_NTOHL (0x74617469), 
-              ACE_NTOHL (0x6f6e5265), 
-              ACE_NTOHL (0x706f7369), 
-              ACE_NTOHL (0x746f7279), 
-              ACE_NTOHL (0x2f456e76), 
-              ACE_NTOHL (0x69726f6e), 
-              ACE_NTOHL (0x6d656e74), 
-              ACE_NTOHL (0x56617269), 
-              ACE_NTOHL (0x61626c65), 
-              ACE_NTOHL (0x3a312e30), 
+              ACE_NTOHL (0x49444c3a),
+              ACE_NTOHL (0x496d706c),
+              ACE_NTOHL (0x656d656e),
+              ACE_NTOHL (0x74617469),
+              ACE_NTOHL (0x6f6e5265),
+              ACE_NTOHL (0x706f7369),
+              ACE_NTOHL (0x746f7279),
+              ACE_NTOHL (0x2f456e76),
+              ACE_NTOHL (0x69726f6e),
+              ACE_NTOHL (0x6d656e74),
+              ACE_NTOHL (0x56617269),
+              ACE_NTOHL (0x61626c65),
+              ACE_NTOHL (0x3a312e30),
               ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
               20,
-              ACE_NTOHL (0x456e7669), 
-              ACE_NTOHL (0x726f6e6d), 
-              ACE_NTOHL (0x656e7456), 
-              ACE_NTOHL (0x61726961), 
+              ACE_NTOHL (0x456e7669),
+              ACE_NTOHL (0x726f6e6d),
+              ACE_NTOHL (0x656e7456),
+              ACE_NTOHL (0x61726961),
               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
               5,
-              ACE_NTOHL (0x6e616d65), 
+              ACE_NTOHL (0x6e616d65),
               ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_string, 
+              CORBA::tk_string,
               0U, // string length
               6,
-              ACE_NTOHL (0x76616c75), 
+              ACE_NTOHL (0x76616c75),
               ACE_NTOHL (0x65000000),  // name = value
-              CORBA::tk_string, 
+              CORBA::tk_string,
               0U, // string length
 
             0U,
 
 
         18,
-        ACE_NTOHL (0x776f726b), 
-        ACE_NTOHL (0x696e675f), 
-        ACE_NTOHL (0x64697265), 
-        ACE_NTOHL (0x63746f72), 
+        ACE_NTOHL (0x776f726b),
+        ACE_NTOHL (0x696e675f),
+        ACE_NTOHL (0x64697265),
+        ACE_NTOHL (0x63746f72),
         ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
         11,
-        ACE_NTOHL (0x61637469), 
-        ACE_NTOHL (0x76617469), 
+        ACE_NTOHL (0x61637469),
+        ACE_NTOHL (0x76617469),
         ACE_NTOHL (0x6f6e0000),  // name = activation
         CORBA::tk_enum, // typecode kind
         136, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           48,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f416374), 
-          ACE_NTOHL (0x69766174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
+          ACE_NTOHL (0x49444c3a),
+          ACE_NTOHL (0x496d706c),
+          ACE_NTOHL (0x656d656e),
+          ACE_NTOHL (0x74617469),
+          ACE_NTOHL (0x6f6e5265),
+          ACE_NTOHL (0x706f7369),
+          ACE_NTOHL (0x746f7279),
+          ACE_NTOHL (0x2f416374),
+          ACE_NTOHL (0x69766174),
+          ACE_NTOHL (0x696f6e4d),
+          ACE_NTOHL (0x6f64653a),
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
           15,
-          ACE_NTOHL (0x41637469), 
-          ACE_NTOHL (0x76617469), 
-          ACE_NTOHL (0x6f6e4d6f), 
+          ACE_NTOHL (0x41637469),
+          ACE_NTOHL (0x76617469),
+          ACE_NTOHL (0x6f6e4d6f),
           ACE_NTOHL (0x64650000),  // name = ActivationMode
           4, // member count
           7,
-          ACE_NTOHL (0x4e4f524d), 
+          ACE_NTOHL (0x4e4f524d),
           ACE_NTOHL (0x414c0000),  // name = NORMAL
           7,
-          ACE_NTOHL (0x4d414e55), 
+          ACE_NTOHL (0x4d414e55),
           ACE_NTOHL (0x414c0000),  // name = MANUAL
           11,
-          ACE_NTOHL (0x5045525f), 
-          ACE_NTOHL (0x434c4945), 
+          ACE_NTOHL (0x5045525f),
+          ACE_NTOHL (0x434c4945),
           ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
           11,
-          ACE_NTOHL (0x4155544f), 
-          ACE_NTOHL (0x5f535441), 
+          ACE_NTOHL (0x4155544f),
+          ACE_NTOHL (0x5f535441),
           ACE_NTOHL (0x52540000),  // name = AUTO_START
 
 
       9,
-      ACE_NTOHL (0x6c6f6361), 
-      ACE_NTOHL (0x74696f6e), 
+      ACE_NTOHL (0x6c6f6361),
+      ACE_NTOHL (0x74696f6e),
       ACE_NTOHL (0x0),  // name = location
       CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         41,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f416464), 
-        ACE_NTOHL (0x72657373), 
-        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x49444c3a),
+        ACE_NTOHL (0x496d706c),
+        ACE_NTOHL (0x656d656e),
+        ACE_NTOHL (0x74617469),
+        ACE_NTOHL (0x6f6e5265),
+        ACE_NTOHL (0x706f7369),
+        ACE_NTOHL (0x746f7279),
+        ACE_NTOHL (0x2f416464),
+        ACE_NTOHL (0x72657373),
+        ACE_NTOHL (0x3a312e30),
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
         8,
-        ACE_NTOHL (0x41646472), 
+        ACE_NTOHL (0x41646472),
         ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
 
@@ -2091,7 +2083,7 @@ ImplementationRepository::Administration_var::operator const ::ImplementationRep
   return this->ptr_;
 }
 
-ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast 
+ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2151,11 +2143,11 @@ ImplementationRepository::Administration_var::tao_nil (void)
 
 ::ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV);
+  return ::ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2232,27 +2224,23 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char * server
+      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));
 
 private:
@@ -2260,57 +2248,57 @@ private:
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
 
   const char * server_;
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &    
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::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);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound,
     ImplementationRepository::Administration::_tc_CannotActivate
   };
-  
+
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -2323,16 +2311,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e
 }
 
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::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;
 }
 
@@ -2343,27 +2331,23 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const ImplementationRepository::StartupOptions & options
+      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));
 
 private:
@@ -2372,15 +2356,15 @@ private:
 
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &    
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server),
@@ -2388,45 +2372,45 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::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;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
     (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::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);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_AlreadyRegistered
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2439,16 +2423,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e
 }
 
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::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;
 }
 
@@ -2459,27 +2443,23 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const ImplementationRepository::StartupOptions & options
+      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));
 
 private:
@@ -2488,15 +2468,15 @@ private:
 
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &    
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server),
@@ -2504,52 +2484,52 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::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;
-  
+
   parameter_list->length (2);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
     (*parameter_list)[len].argument <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::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_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::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;
 }
 
@@ -2559,27 +2539,23 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char * server
+      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));
 
 private:
@@ -2587,56 +2563,56 @@ private:
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
 
   const char * server_;
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &    
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::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);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2649,16 +2625,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc
 }
 
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::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;
 }
 
@@ -2668,27 +2644,23 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char * server
+      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));
 
 private:
@@ -2696,56 +2668,56 @@ private:
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
 
   const char * server_;
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &    
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::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);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2758,16 +2730,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e
 }
 
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::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;
 }
 
@@ -2779,27 +2751,23 @@ public:
       CORBA::Object_ptr _tao_target,
       const char * server,
       const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      ImplementationRepository::ServerObject_ptr server_object
+      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));
 
   void result (char * result);
@@ -2819,8 +2787,8 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
     CORBA::Object_ptr _tao_target,
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &    
+    ImplementationRepository::ServerObject_ptr server_object
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server),
@@ -2829,19 +2797,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::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;
-  
+
   parameter_list->length (3);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
@@ -2851,26 +2819,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
     (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::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);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2883,26 +2851,26 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
 }
 
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::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;
-  
+
   (*result_any) <<= this->_result;
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -2912,27 +2880,23 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char * server
+      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));
 
 private:
@@ -2940,56 +2904,56 @@ private:
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
 
   const char * server_;
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &    
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3002,16 +2966,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
 }
 
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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;
 }
 
@@ -3021,27 +2985,23 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char * server
+      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));
 
 private:
@@ -3049,56 +3009,56 @@ private:
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
 
   const char * server_;
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &    
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::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);
-  
+
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-    
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
+
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] =
   {
     ImplementationRepository::Administration::_tc_NotFound
   };
-  
+
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -3111,16 +3071,16 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (
 }
 
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::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;
 }
 
@@ -3130,28 +3090,24 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many      
-,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const CORBA::ULong & how_many
+
+      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));
 
 private:
@@ -3159,16 +3115,16 @@ private:
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
 
   const CORBA::ULong & how_many_;
-    
+
 
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & how_many    
-,
-    CORBA::Environment &    
+    const CORBA::ULong & how_many
+
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     how_many_ (how_many)
@@ -3176,57 +3132,57 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-    
+
 
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::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_ClientRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::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;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void)
@@ -3239,8 +3195,8 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administra
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -3248,8 +3204,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     ImplementationRepository::Administration::CannotActivate
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/Administration/NotFound:1.0",
@@ -3261,14 +3217,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     }
   };
 
-  
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server",
@@ -3276,64 +3232,64 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri (
         &_tao_call,
         _collocated_tao_target_,
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -3341,73 +3297,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2, ACE_TRY_ENV);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -3416,16 +3372,16 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::AlreadyRegistered
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0",
@@ -3433,14 +3389,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     }
   };
 
-  
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_server",
@@ -3448,65 +3404,65 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
-        options,
-        ACE_TRY_ENV
+        options
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server) &&
@@ -3515,73 +3471,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1, ACE_TRY_ENV);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -3590,22 +3546,22 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
-  
-  
-  
+
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "reregister_server",
@@ -3613,65 +3569,65 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
-        options,
-        ACE_TRY_ENV
+        options
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server) &&
@@ -3680,73 +3636,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -3754,16 +3710,16 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/Administration/NotFound:1.0",
@@ -3771,14 +3727,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
     }
   };
 
-  
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "remove_server",
@@ -3786,64 +3742,64 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri (
         &_tao_call,
         _collocated_tao_target_,
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -3851,73 +3807,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1, ACE_TRY_ENV);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -3925,16 +3881,16 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/Administration/NotFound:1.0",
@@ -3942,14 +3898,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
     }
   };
 
-  
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown_server",
@@ -3957,64 +3913,64 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
         &_tao_call,
         _collocated_tao_target_,
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -4022,73 +3978,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1, ACE_TRY_ENV);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -4098,16 +4054,16 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerObject_ptr server_object
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/Administration/NotFound:1.0",
@@ -4116,13 +4072,13 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
   };
 
   CORBA::String_var _tao_safe_retval;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_running",
@@ -4130,66 +4086,66 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
         addr,
-        server_object,
-        ACE_TRY_ENV
+        server_object
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server) &&
@@ -4200,33 +4156,33 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
               CORBA::MARSHAL (),
               0
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1, ACE_TRY_ENV);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -4236,52 +4192,52 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           char * _tao_retval_info = _tao_safe_retval._retn ();
           ri.result (_tao_retval_info);
           _tao_safe_retval = _tao_retval_info;
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN (0);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_safe_retval._retn ();
@@ -4289,16 +4245,16 @@ return _tao_safe_retval._retn ();
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/Administration/NotFound:1.0",
@@ -4306,14 +4262,14 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
     }
   };
 
-  
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_shutting_down",
@@ -4321,64 +4277,64 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
         &_tao_call,
         _collocated_tao_target_,
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -4386,73 +4342,73 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1, ACE_TRY_ENV);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -4461,16 +4417,16 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    ImplementationRepository::ServerInformation_out info,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformation_out info
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] =
   {
     {
       "IDL:ImplementationRepository/Administration/NotFound:1.0",
@@ -4478,19 +4434,19 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     }
   };
 
-  
-  
-  
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   ACE_NEW (
       info.ptr (),
       ImplementationRepository::ServerInformation
     );
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "find",
@@ -4498,97 +4454,97 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri (
         &_tao_call,
         _collocated_tao_target_,
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
-                            (_tao_out << server)              
+                            (_tao_out << server)
             ))
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1, ACE_TRY_ENV);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                                           (_tao_in >> *info.ptr ())
@@ -4597,49 +4553,49 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
               TAO_INTERCEPTOR_THROW (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -4649,27 +4605,27 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationIterator_out server_iterator
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
-  
-  
-  
+
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   ACE_NEW (
       server_list.ptr (),
       ImplementationRepository::ServerInformationList
     );
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "list",
@@ -4677,98 +4633,98 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri (
         &_tao_call,
         _collocated_tao_target_,
-        how_many        
-,
-        ACE_TRY_ENV
+        how_many
+
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
-                            (_tao_out << how_many)                            
+                            (_tao_out << how_many)
             ))
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                                           (_tao_in >> *server_list.ptr ()) &&
@@ -4778,49 +4734,49 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
               TAO_INTERCEPTOR_THROW (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -4828,7 +4784,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4866,8 +4822,8 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::~_TAO_Adminis
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
 ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::Administration *,
-  CORBA::Environment &
+  ::ImplementationRepository::Administration *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -4907,25 +4863,25 @@ void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_v
 }
 
 ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return Administration::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Administration::_nil ());
       if (is_a == 0)
         return Administration::_nil ();
     }
-  return Administration::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Administration::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4954,7 +4910,7 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr
               Administration::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -4967,10 +4923,10 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr
               Administration::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast
         (
@@ -4994,14 +4950,14 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type)
@@ -5014,7 +4970,7 @@ void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -5076,28 +5032,28 @@ void ImplementationRepository::Administration::AlreadyRegistered::_raise ()
 }
 
 void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -5113,28 +5069,28 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_AlreadyRegi
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   66,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f41646d), 
-  ACE_NTOHL (0x696e6973), 
-  ACE_NTOHL (0x74726174), 
-  ACE_NTOHL (0x696f6e2f), 
-  ACE_NTOHL (0x416c7265), 
-  ACE_NTOHL (0x61647952), 
-  ACE_NTOHL (0x65676973), 
-  ACE_NTOHL (0x74657265), 
-  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f41646d),
+  ACE_NTOHL (0x696e6973),
+  ACE_NTOHL (0x74726174),
+  ACE_NTOHL (0x696f6e2f),
+  ACE_NTOHL (0x416c7265),
+  ACE_NTOHL (0x61647952),
+  ACE_NTOHL (0x65676973),
+  ACE_NTOHL (0x74657265),
+  ACE_NTOHL (0x643a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0
   18,
-  ACE_NTOHL (0x416c7265), 
-  ACE_NTOHL (0x61647952), 
-  ACE_NTOHL (0x65676973), 
-  ACE_NTOHL (0x74657265), 
+  ACE_NTOHL (0x416c7265),
+  ACE_NTOHL (0x61647952),
+  ACE_NTOHL (0x65676973),
+  ACE_NTOHL (0x74657265),
   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
   0, // member count
 };
@@ -5210,28 +5166,28 @@ void ImplementationRepository::Administration::CannotActivate::_raise ()
 }
 
 void ImplementationRepository::Administration::CannotActivate::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void ImplementationRepository::Administration::CannotActivate::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -5255,32 +5211,32 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_CannotActiv
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f41646d), 
-  ACE_NTOHL (0x696e6973), 
-  ACE_NTOHL (0x74726174), 
-  ACE_NTOHL (0x696f6e2f), 
-  ACE_NTOHL (0x43616e6e), 
-  ACE_NTOHL (0x6f744163), 
-  ACE_NTOHL (0x74697661), 
-  ACE_NTOHL (0x74653a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f41646d),
+  ACE_NTOHL (0x696e6973),
+  ACE_NTOHL (0x74726174),
+  ACE_NTOHL (0x696f6e2f),
+  ACE_NTOHL (0x43616e6e),
+  ACE_NTOHL (0x6f744163),
+  ACE_NTOHL (0x74697661),
+  ACE_NTOHL (0x74653a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/Administration/CannotActivate:1.0
   15,
-  ACE_NTOHL (0x43616e6e), 
-  ACE_NTOHL (0x6f744163), 
-  ACE_NTOHL (0x74697661), 
+  ACE_NTOHL (0x43616e6e),
+  ACE_NTOHL (0x6f744163),
+  ACE_NTOHL (0x74697661),
   ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
   7,
-  ACE_NTOHL (0x72656173), 
+  ACE_NTOHL (0x72656173),
   ACE_NTOHL (0x6f6e0000),  // name = reason
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 
@@ -5353,28 +5309,28 @@ void ImplementationRepository::Administration::NotFound::_raise ()
 }
 
 void ImplementationRepository::Administration::NotFound::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void ImplementationRepository::Administration::NotFound::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -5390,24 +5346,24 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_NotFound[]
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   57,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f41646d), 
-  ACE_NTOHL (0x696e6973), 
-  ACE_NTOHL (0x74726174), 
-  ACE_NTOHL (0x696f6e2f), 
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f41646d),
+  ACE_NTOHL (0x696e6973),
+  ACE_NTOHL (0x74726174),
+  ACE_NTOHL (0x696f6e2f),
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Administration/NotFound:1.0
   9,
-  ACE_NTOHL (0x4e6f7446), 
-  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x4e6f7446),
+  ACE_NTOHL (0x6f756e64),
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
 };
@@ -5431,8 +5387,8 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::NotFound::_type (v
 }
 
 void ImplementationRepository::Administration::activate_server (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5440,186 +5396,186 @@ void ImplementationRepository::Administration::activate_server (
     ImplementationRepository::Administration::CannotActivate
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.activate_server (
       this,
-      server,
-      ACE_TRY_ENV
+      server
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::register_server (
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::AlreadyRegistered
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.register_server (
       this,
       server,
-      options,
-      ACE_TRY_ENV
+      options
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::reregister_server (
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.reregister_server (
       this,
       server,
-      options,
-      ACE_TRY_ENV
+      options
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::remove_server (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.remove_server (
       this,
-      server,
-      ACE_TRY_ENV
+      server
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::shutdown_server (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.shutdown_server (
       this,
-      server,
-      ACE_TRY_ENV
+      server
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 char * ImplementationRepository::Administration::server_is_running (
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerObject_ptr server_object
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.server_is_running (
       this,
       server,
       addr,
-      server_object,
-      ACE_TRY_ENV
+      server_object
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::server_is_shutting_down (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.server_is_shutting_down (
       this,
-      server,
-      ACE_TRY_ENV
+      server
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::find (
     const char * server,
-    ImplementationRepository::ServerInformation_out info,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformation_out info
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.find (
       this,
       server,
-      info,
-      ACE_TRY_ENV
+      info
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationIterator_out server_iterator
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_Administration_Proxy_Impl &proxy =
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.list (
       this,
       how_many,
       server_list,
-      server_iterator,
-      ACE_TRY_ENV
+      server_iterator
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -5627,22 +5583,22 @@ static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f41646d), 
-  ACE_NTOHL (0x696e6973), 
-  ACE_NTOHL (0x74726174), 
-  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f41646d),
+  ACE_NTOHL (0x696e6973),
+  ACE_NTOHL (0x74726174),
+  ACE_NTOHL (0x696f6e3a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
   15,
-  ACE_NTOHL (0x41646d69), 
-  ACE_NTOHL (0x6e697374), 
-  ACE_NTOHL (0x72617469), 
+  ACE_NTOHL (0x41646d69),
+  ACE_NTOHL (0x6e697374),
+  ACE_NTOHL (0x72617469),
   ACE_NTOHL (0x6f6e0000),  // name = Administration
 };
 
@@ -5709,7 +5665,7 @@ ImplementationRepository::ServerInformationIterator_var::operator const ::Implem
   return this->ptr_;
 }
 
-ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast 
+ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -5769,11 +5725,11 @@ ImplementationRepository::ServerInformationIterator_var::tao_nil (void)
 
 ::ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV);
+  return ::ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5850,27 +5806,23 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const CORBA::ULong & how_many
+      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));
 
   void result (CORBA::Boolean result);
@@ -5886,67 +5838,67 @@ private:
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & how_many,
-    CORBA::Environment &    
+    const CORBA::ULong & how_many
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
     how_many_ (how_many)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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;
-  
+
   parameter_list->length (1);
   CORBA::ULong len = 0;
-  
+
     (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-  
+
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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;
-  
+
   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
   return safe_result_any._retn ();
 }
 
-void 
+void
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
-  // update the result 
+  // update the result
   this->_result = result;
 }
 
@@ -5955,86 +5907,82 @@ class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_d
 public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr _tao_target
+      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));
 
 private:
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
 
-  
+
 };
 
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
+    CORBA::Object_ptr _tao_target
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_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_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_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_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any *
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_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;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
+//                Base & Remote Proxy  Implementation.
 //
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void)
@@ -6048,28 +5996,28 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::_TAO
 CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::next_n (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationList_out server_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   ACE_NEW_RETURN (
       server_list.ptr (),
       ImplementationRepository::ServerInformationList,
       0
     );
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "next_n",
@@ -6077,99 +6025,99 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
       1,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
         &_tao_call,
         _collocated_tao_target_,
-        how_many,
-        ACE_TRY_ENV
+        how_many
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
-                            (_tao_out << how_many)              
+                            (_tao_out << how_many)
             ))
             TAO_INTERCEPTOR_THROW_RETURN (
               CORBA::MARSHAL (),
               _tao_retval
             );
-            
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
+
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) &&
@@ -6180,73 +6128,73 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
+
             }
-          
+
 #if TAO_HAS_INTERCEPTORS == 1
           CORBA::Boolean _tao_retval_info = _tao_retval;
           ri.result (_tao_retval_info);
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK_RETURN  (_tao_retval);
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 return _tao_retval;
 }
 
 void ImplementationRepository::_TAO_ServerInformationIterator_Remote_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
   ))
 {
-  
-  
-  
-  
+
+
+
+
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -6254,129 +6202,129 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
       0,
       istub->orb_core ()
     );
-  
+
   int _invoke_status;
-  
+
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors (),
       &_tao_call,
       _invoke_status
     );
-  
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-  
+
   for (;;)
     {
       _invoke_status = TAO_INVOKE_EXCEPTION;
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
         &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
+        _collocated_tao_target_
+        TAO_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
-      
+
 #endif /* TAO_HAS_INTERCEPTORS */
-      
-      
+
+
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
       TAO_INTERCEPTOR (ri.response_expected (1));
-      
+
 #if TAO_HAS_INTERCEPTORS == 1
-      
+
       ACE_TRY
         {
           _tao_vfr.send_request (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_RESTART)
             {
               _tao_call.restart_flag (1);
               continue;
             }
-          
+
 #endif /* TAO_HAS_INTERCEPTORS */
-          
-          _tao_call.start (ACE_TRY_ENV);
+
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+              ACE_static_cast (CORBA::Octet, _tao_response_flag)
+              TAO_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
-          
+
           _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
-          
+
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_OMG_VMCID | 1, CORBA::COMPLETED_YES)
               );
-              
+
             }
           else if (_invoke_status == TAO_INVOKE_RESTART)
             {
               TAO_INTERCEPTOR (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
+                  &ri
+                  TAO_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
-              
+
               continue;
             }
-          
-          
+
+
 #if TAO_HAS_INTERCEPTORS == 1
-          
+
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
-            &ri,
-            ACE_TRY_ENV
+            &ri
+            TAO_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
-        
+
       }
     ACE_CATCHANY
       {
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_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
             || _tao_status == PortableInterceptor::USER_EXCEPTION)
           ACE_RE_THROW;
       }
     ACE_ENDTRY;
     ACE_CHECK;
-    
+
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (ACE_TRY_ENV);
+      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
-    
+
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
         || _tao_status == PortableInterceptor::TRANSPORT_RETRY)
       continue;
-    
+
 #endif  /* TAO_HAS_INTERCEPTORS */
-    
+
     break;
   }
 
@@ -6384,7 +6332,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation. 
+//            End  Base & Remote  Proxy Implemeentation.
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6422,8 +6370,8 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::~_
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
 ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::select_proxy (
-  ::ImplementationRepository::ServerInformationIterator *,
-  CORBA::Environment &
+  ::ImplementationRepository::ServerInformationIterator *
+  TAO_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -6463,25 +6411,25 @@ void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (v
 }
 
 ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ServerInformationIterator::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0", ACE_TRY_ENV);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ServerInformationIterator::_nil ());
       if (is_a == 0)
         return ServerInformationIterator::_nil ();
     }
-  return ServerInformationIterator::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServerInformationIterator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -6510,7 +6458,7 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository
               ServerInformationIterator::_nil ()
             );
         }
-      
+
       if (CORBA::is_nil (default_proxy))
         {
           ACE_NEW_RETURN (
@@ -6523,10 +6471,10 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository
               ServerInformationIterator::_nil ()
             );
         }
-      
+
       return default_proxy;
     }
-  else 
+  else
     return
       ACE_reinterpret_cast
         (
@@ -6550,14 +6498,14 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
 }
 
 void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type)
@@ -6570,7 +6518,7 @@ void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -6583,39 +6531,39 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo
 
 CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationList_out server_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
+    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   return proxy.next_n (
       this,
       how_many,
-      server_list,
-      ACE_TRY_ENV
+      server_list
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::ServerInformationIterator::destroy (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
+    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   proxy.destroy (
-      this,
-      ACE_TRY_ENV
+      this
+      TAO_ENV_ARG_PARAMETER
     );
 }
 
@@ -6623,28 +6571,28 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e4974), 
-  ACE_NTOHL (0x65726174), 
-  ACE_NTOHL (0x6f723a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x496d706c),
+  ACE_NTOHL (0x656d656e),
+  ACE_NTOHL (0x74617469),
+  ACE_NTOHL (0x6f6e5265),
+  ACE_NTOHL (0x706f7369),
+  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x2f536572),
+  ACE_NTOHL (0x76657249),
+  ACE_NTOHL (0x6e666f72),
+  ACE_NTOHL (0x6d617469),
+  ACE_NTOHL (0x6f6e4974),
+  ACE_NTOHL (0x65726174),
+  ACE_NTOHL (0x6f723a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
   26,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e497465), 
-  ACE_NTOHL (0x7261746f), 
+  ACE_NTOHL (0x53657276),
+  ACE_NTOHL (0x6572496e),
+  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x6e497465),
+  ACE_NTOHL (0x7261746f),
   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
 };
 
@@ -6667,7 +6615,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerObject_p
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        ImplementationRepository::_tc_ServerObject, 
+        ImplementationRepository::_tc_ServerObject,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6683,13 +6631,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   {
     _tao_elem = ImplementationRepository::ServerObject::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -6758,13 +6706,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -6849,13 +6797,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -6912,13 +6860,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -6972,13 +6920,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -7055,13 +7003,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -7146,13 +7094,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -7199,7 +7147,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        ImplementationRepository::_tc_Administration, 
+        ImplementationRepository::_tc_Administration,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -7215,13 +7163,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   {
     _tao_elem = ImplementationRepository::Administration::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -7293,13 +7241,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value ();
@@ -7383,13 +7331,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value ();
@@ -7473,13 +7421,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value ();
@@ -7530,7 +7478,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        ImplementationRepository::_tc_ServerInformationIterator, 
+        ImplementationRepository::_tc_ServerInformationIterator,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -7546,13 +7494,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   {
     _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -7607,8 +7555,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       ImplementationRepository::ServerObject::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -7650,7 +7598,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -7692,7 +7640,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
+    if (0 >= _tao_seq_len)
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -7727,8 +7675,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       ImplementationRepository::Administration::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -7763,8 +7711,8 @@ CORBA::Boolean operator>> (
     // narrow to the right type
     _tao_objref =
       ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
+          obj.in ()
+          TAO_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 556212481fb..83789055066 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -63,51 +63,51 @@
 
 TAO_NAMESPACE  ImplementationRepository
 {
-  
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___PTR_CH_
-  
+
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CH_
-  
+
   class TAO_PortableServer_Export ServerObject_var : public TAO_Base_var
   {
   public:
     ServerObject_var (void); // default constructor
-    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} 
+    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {}
     ServerObject_var (const ServerObject_var &); // copy constructor
     ~ServerObject_var (void); // destructor
-    
+
     ServerObject_var &operator= (ServerObject_ptr);
     ServerObject_var &operator= (const ServerObject_var &);
     ServerObject_ptr operator-> (void) const;
-    
+
     operator const ServerObject_ptr &() const;
     operator ServerObject_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerObject_ptr in (void) const;
     ServerObject_ptr &inout (void);
     ServerObject_ptr &out (void);
     ServerObject_ptr _retn (void);
     ServerObject_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerObject_ptr tao_duplicate (ServerObject_ptr);
     static void tao_release (ServerObject_ptr);
     static ServerObject_ptr tao_nil (void);
     static ServerObject_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ServerObject_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -117,11 +117,11 @@ TAO_NAMESPACE  ImplementationRepository
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CH_
-  
+
   class TAO_PortableServer_Export ServerObject_out
   {
   public:
@@ -134,24 +134,24 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerObject_ptr &();
     ServerObject_ptr &ptr (void);
     ServerObject_ptr operator-> (void);
-  
+
   private:
     ServerObject_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-  
+
   // Forward Classes Declaration.
   class _TAO_ServerObject_Proxy_Impl;
   class _TAO_ServerObject_Remote_Proxy_Impl;
   class _TAO_ServerObject_Proxy_Broker;
   class _TAO_ServerObject_Remote_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export ServerObject
     : public virtual CORBA_Object
   {
@@ -162,239 +162,234 @@ TAO_NAMESPACE  ImplementationRepository
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-    
+
     static ServerObject_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ServerObject_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ServerObject_ptr _nil (void)
       {
         return (ServerObject_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void*);
-    
+
     virtual void ping (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void shutdown (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   private:
     _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-    
+
   protected:
     ServerObject (int collocated = 0);
-    
+
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
-    
+
     ServerObject (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
-    
+
     friend class _TAO_ServerObject_Remote_Proxy_Impl;
     friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
     friend class _TAO_ServerObject_Direct_Proxy_Impl;
-    
+
     virtual ~ServerObject (void);
-  
+
   private:
     ServerObject (const ServerObject &);
     void operator= (const ServerObject &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulate
   // an invocation logics.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
   public:
     virtual ~_TAO_ServerObject_Proxy_Impl (void) { }
     virtual void ping (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void shutdown (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+
+
   protected:
     _TAO_ServerObject_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl
     : public virtual _TAO_ServerObject_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_ServerObject_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { }
     virtual void ping (
-        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 shutdown (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
     class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
   {
   public:
     virtual ~_TAO_ServerObject_Proxy_Broker (void);
     virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
-        ServerObject *object,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ServerObject *object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ServerObject_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker
     : public virtual _TAO_ServerObject_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ServerObject_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
-        ServerObject *object,
-        CORBA_Environment &ACE_TRY_ENV
+        ServerObject *object
+        TAO_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerObject;
-  
+
   struct EnvironmentVariable;
   class EnvironmentVariable_var;
-  
+
   struct TAO_PortableServer_Export EnvironmentVariable
   {
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef EnvironmentVariable_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-    
+
     TAO_String_Manager name;
     TAO_String_Manager value;
-    
+
   };
-  
+
   class TAO_PortableServer_Export EnvironmentVariable_var
   {
   public:
@@ -402,29 +397,29 @@ TAO_NAMESPACE  ImplementationRepository
     EnvironmentVariable_var (EnvironmentVariable *);
     EnvironmentVariable_var (const EnvironmentVariable_var &);
     ~EnvironmentVariable_var (void);
-    
+
     EnvironmentVariable_var &operator= (EnvironmentVariable *);
     EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
     EnvironmentVariable *operator-> (void);
     const EnvironmentVariable *operator-> (void) const;
-    
+
     operator const EnvironmentVariable &() const;
     operator EnvironmentVariable &();
     operator EnvironmentVariable &() const;
     // Variable-size types only.
     operator EnvironmentVariable *&();
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const EnvironmentVariable &in (void) const;
     EnvironmentVariable &inout (void);
     EnvironmentVariable *&out (void);
     EnvironmentVariable *_retn (void);
     EnvironmentVariable *ptr (void) const;
-  
+
   private:
     EnvironmentVariable *ptr_;
   };
-  
+
   class TAO_PortableServer_Export EnvironmentVariable_out
   {
   public:
@@ -436,33 +431,33 @@ TAO_NAMESPACE  ImplementationRepository
     operator EnvironmentVariable *&();
     EnvironmentVariable *&ptr (void);
     EnvironmentVariable *operator-> (void);
-    
+
   private:
     EnvironmentVariable *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const EnvironmentVariable_var &);
   };
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentVariable;
-  
+
   typedef char * Address;
   typedef CORBA::String_var Address_var;
   typedef CORBA::String_out Address_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-  
+
   class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum);
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -476,15 +471,15 @@ TAO_NAMESPACE  ImplementationRepository
         const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void);
-    
+
     // = Accessors.
     EnvironmentVariable &operator[] (CORBA::ULong i);
     const EnvironmentVariable &operator[] (CORBA::ULong i) const;
-    
+
     // = Static operations.
     static EnvironmentVariable *allocbuf (CORBA::ULong size);
     static void freebuf (EnvironmentVariable *buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -497,59 +492,59 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-  
+
   class EnvironmentList;
   class EnvironmentList_var;
-  
+
   // *************************************************************
   // EnvironmentList
   // *************************************************************
-  
-  class TAO_PortableServer_Export EnvironmentList : public 
+
+  class TAO_PortableServer_Export EnvironmentList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     EnvironmentList (void); // default ctor
     EnvironmentList (CORBA::ULong max); // uses max size
     EnvironmentList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        EnvironmentVariable *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        EnvironmentVariable *buffer,
         CORBA::Boolean release = 0
       );
     EnvironmentList (const EnvironmentList &); // copy ctor
     ~EnvironmentList (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef EnvironmentList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___VAR_CH_
-  
+
   // *************************************************************
   // class ImplementationRepository::EnvironmentList_var
   // *************************************************************
-  
+
   class TAO_PortableServer_Export EnvironmentList_var
   {
   public:
@@ -557,38 +552,38 @@ TAO_NAMESPACE  ImplementationRepository
     EnvironmentList_var (EnvironmentList *);
     EnvironmentList_var (const EnvironmentList_var &);
     ~EnvironmentList_var (void);
-    
+
     EnvironmentList_var &operator= (EnvironmentList *);
     EnvironmentList_var &operator= (const EnvironmentList_var &);
     EnvironmentList *operator-> (void);
     const EnvironmentList *operator-> (void) const;
-    
+
     operator const EnvironmentList &() const;
     operator EnvironmentList &();
     operator EnvironmentList &() const;
     operator EnvironmentList *&(); // variable-size base types only
-    
+
     EnvironmentVariable & operator[] (CORBA::ULong index);
     const EnvironmentVariable & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const EnvironmentList &in (void) const;
     EnvironmentList &inout (void);
     EnvironmentList *&out (void);
     EnvironmentList *_retn (void);
     EnvironmentList *ptr (void) const;
-  
+
   private:
     EnvironmentList *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST___OUT_CH_
-  
+
   class TAO_PortableServer_Export EnvironmentList_out
   {
   public:
@@ -601,18 +596,18 @@ TAO_NAMESPACE  ImplementationRepository
     EnvironmentList *&ptr (void);
     EnvironmentList *operator-> (void);
     EnvironmentVariable & operator[] (CORBA::ULong index);
-  
+
   private:
     EnvironmentList *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const EnvironmentList_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnvironmentList;
-  
+
   enum ActivationMode
   {
     NORMAL,
@@ -620,29 +615,29 @@ TAO_NAMESPACE  ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-  
+
   typedef ActivationMode &ActivationMode_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode;
-  
+
   struct StartupOptions;
   class StartupOptions_var;
-  
+
   struct TAO_PortableServer_Export StartupOptions
   {
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef StartupOptions_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-    
+
     TAO_String_Manager command_line;
     ACE_NESTED_CLASS (ImplementationRepository, EnvironmentList) environment;
     TAO_String_Manager working_directory;
     ACE_NESTED_CLASS (ImplementationRepository, ActivationMode) activation;
-    
+
   };
-  
+
   class TAO_PortableServer_Export StartupOptions_var
   {
   public:
@@ -650,29 +645,29 @@ TAO_NAMESPACE  ImplementationRepository
     StartupOptions_var (StartupOptions *);
     StartupOptions_var (const StartupOptions_var &);
     ~StartupOptions_var (void);
-    
+
     StartupOptions_var &operator= (StartupOptions *);
     StartupOptions_var &operator= (const StartupOptions_var &);
     StartupOptions *operator-> (void);
     const StartupOptions *operator-> (void) const;
-    
+
     operator const StartupOptions &() const;
     operator StartupOptions &();
     operator StartupOptions &() const;
     // Variable-size types only.
     operator StartupOptions *&();
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const StartupOptions &in (void) const;
     StartupOptions &inout (void);
     StartupOptions *&out (void);
     StartupOptions *_retn (void);
     StartupOptions *ptr (void) const;
-  
+
   private:
     StartupOptions *ptr_;
   };
-  
+
   class TAO_PortableServer_Export StartupOptions_out
   {
   public:
@@ -684,34 +679,34 @@ TAO_NAMESPACE  ImplementationRepository
     operator StartupOptions *&();
     StartupOptions *&ptr (void);
     StartupOptions *operator-> (void);
-    
+
   private:
     StartupOptions *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const StartupOptions_var &);
   };
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StartupOptions;
-  
+
   struct ServerInformation;
   class ServerInformation_var;
-  
+
   struct TAO_PortableServer_Export ServerInformation
   {
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerInformation_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static void _tao_any_destructor (void*);
-    
+
     TAO_String_Manager logical_server;
     TAO_String_Manager server;
     ACE_NESTED_CLASS (ImplementationRepository, StartupOptions) startup;
     TAO_String_Manager location;
-    
+
   };
-  
+
   class TAO_PortableServer_Export ServerInformation_var
   {
   public:
@@ -719,29 +714,29 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformation_var (ServerInformation *);
     ServerInformation_var (const ServerInformation_var &);
     ~ServerInformation_var (void);
-    
+
     ServerInformation_var &operator= (ServerInformation *);
     ServerInformation_var &operator= (const ServerInformation_var &);
     ServerInformation *operator-> (void);
     const ServerInformation *operator-> (void) const;
-    
+
     operator const ServerInformation &() const;
     operator ServerInformation &();
     operator ServerInformation &() const;
     // Variable-size types only.
     operator ServerInformation *&();
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const ServerInformation &in (void) const;
     ServerInformation &inout (void);
     ServerInformation *&out (void);
     ServerInformation *_retn (void);
     ServerInformation *ptr (void) const;
-  
+
   private:
     ServerInformation *ptr_;
   };
-  
+
   class TAO_PortableServer_Export ServerInformation_out
   {
   public:
@@ -753,28 +748,28 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerInformation *&();
     ServerInformation *&ptr (void);
     ServerInformation *operator-> (void);
-    
+
   private:
     ServerInformation *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ServerInformation_var &);
   };
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
-  
-  
+
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-  
+
   class TAO_EXPORT_MACRO _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
     : public TAO_Unbounded_Base_Sequence
   {
   public:
     // = Initialization and termination methods.
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
+    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum);
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (
         CORBA::ULong maximum,
         CORBA::ULong length,
@@ -788,15 +783,15 @@ TAO_NAMESPACE  ImplementationRepository
         const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void);
-    
+
     // = Accessors.
     ServerInformation &operator[] (CORBA::ULong i);
     const ServerInformation &operator[] (CORBA::ULong i) const;
-    
+
     // = Static operations.
     static ServerInformation *allocbuf (CORBA::ULong size);
     static void freebuf (ServerInformation *buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
@@ -809,59 +804,59 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::Boolean release
       );
   };
-  
+
 #endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-  
+
   class ServerInformationList;
   class ServerInformationList_var;
-  
+
   // *************************************************************
   // ServerInformationList
   // *************************************************************
-  
-  class TAO_PortableServer_Export ServerInformationList : public 
+
+  class TAO_PortableServer_Export ServerInformationList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
     ServerInformationList (void); // default ctor
     ServerInformationList (CORBA::ULong max); // uses max size
     ServerInformationList (
-        CORBA::ULong max, 
-        CORBA::ULong length, 
-        ServerInformation *buffer, 
+        CORBA::ULong max,
+        CORBA::ULong length,
+        ServerInformation *buffer,
         CORBA::Boolean release = 0
       );
     ServerInformationList (const ServerInformationList &); // copy ctor
     ~ServerInformationList (void);
     static void _tao_any_destructor (void*);
-    
+
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef ServerInformationList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
-    
-    
+
+
   };
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___VAR_CH_
-  
+
   // *************************************************************
   // class ImplementationRepository::ServerInformationList_var
   // *************************************************************
-  
+
   class TAO_PortableServer_Export ServerInformationList_var
   {
   public:
@@ -869,38 +864,38 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformationList_var (ServerInformationList *);
     ServerInformationList_var (const ServerInformationList_var &);
     ~ServerInformationList_var (void);
-    
+
     ServerInformationList_var &operator= (ServerInformationList *);
     ServerInformationList_var &operator= (const ServerInformationList_var &);
     ServerInformationList *operator-> (void);
     const ServerInformationList *operator-> (void) const;
-    
+
     operator const ServerInformationList &() const;
     operator ServerInformationList &();
     operator ServerInformationList &() const;
     operator ServerInformationList *&(); // variable-size base types only
-    
+
     ServerInformation & operator[] (CORBA::ULong index);
     const ServerInformation & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
+
+    // in, inout, out, _retn
     const ServerInformationList &in (void) const;
     ServerInformationList &inout (void);
     ServerInformationList *&out (void);
     ServerInformationList *_retn (void);
     ServerInformationList *ptr (void) const;
-  
+
   private:
     ServerInformationList *ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST___OUT_CH_
-  
+
   class TAO_PortableServer_Export ServerInformationList_out
   {
   public:
@@ -913,63 +908,63 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformationList *&ptr (void);
     ServerInformationList *operator-> (void);
     ServerInformation & operator[] (CORBA::ULong index);
-  
+
   private:
     ServerInformationList *&ptr_;
     // Assignment from T_var not allowed.
     void operator= (const ServerInformationList_var &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationList;
-  
+
   class ServerInformationIterator;
-  
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-  
+
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-  
+
   class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
   {
   public:
     ServerInformationIterator_var (void); // default constructor
-    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
+    ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
     ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
     ~ServerInformationIterator_var (void); // destructor
-    
+
     ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
     ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
     ServerInformationIterator_ptr operator-> (void) const;
-    
+
     operator const ServerInformationIterator_ptr &() const;
     operator ServerInformationIterator_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerInformationIterator_ptr in (void) const;
     ServerInformationIterator_ptr &inout (void);
     ServerInformationIterator_ptr &out (void);
     ServerInformationIterator_ptr _retn (void);
     ServerInformationIterator_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerInformationIterator_ptr tao_duplicate (ServerInformationIterator_ptr);
     static void tao_release (ServerInformationIterator_ptr);
     static ServerInformationIterator_ptr tao_nil (void);
     static ServerInformationIterator_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ServerInformationIterator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -979,11 +974,11 @@ TAO_NAMESPACE  ImplementationRepository
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-  
+
   class TAO_PortableServer_Export ServerInformationIterator_out
   {
   public:
@@ -996,59 +991,59 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerInformationIterator_ptr &();
     ServerInformationIterator_ptr &ptr (void);
     ServerInformationIterator_ptr operator-> (void);
-  
+
   private:
     ServerInformationIterator_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___PTR_CH_
-  
+
   class Administration;
   typedef Administration *Administration_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CH_
-  
+
   class TAO_PortableServer_Export Administration_var : public TAO_Base_var
   {
   public:
     Administration_var (void); // default constructor
-    Administration_var (Administration_ptr p) : ptr_ (p) {} 
+    Administration_var (Administration_ptr p) : ptr_ (p) {}
     Administration_var (const Administration_var &); // copy constructor
     ~Administration_var (void); // destructor
-    
+
     Administration_var &operator= (Administration_ptr);
     Administration_var &operator= (const Administration_var &);
     Administration_ptr operator-> (void) const;
-    
+
     operator const Administration_ptr &() const;
     operator Administration_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Administration_ptr in (void) const;
     Administration_ptr &inout (void);
     Administration_ptr &out (void);
     Administration_ptr _retn (void);
     Administration_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Administration_ptr tao_duplicate (Administration_ptr);
     static void tao_release (Administration_ptr);
     static Administration_ptr tao_nil (void);
     static Administration_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Administration_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1058,11 +1053,11 @@ TAO_NAMESPACE  ImplementationRepository
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CH_
-  
+
   class TAO_PortableServer_Export Administration_out
   {
   public:
@@ -1075,24 +1070,24 @@ TAO_NAMESPACE  ImplementationRepository
     operator Administration_ptr &();
     Administration_ptr &ptr (void);
     Administration_ptr operator-> (void);
-  
+
   private:
     Administration_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-  
+
   // Forward Classes Declaration.
   class _TAO_Administration_Proxy_Impl;
   class _TAO_Administration_Remote_Proxy_Impl;
   class _TAO_Administration_Proxy_Broker;
   class _TAO_Administration_Remote_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export Administration
     : public virtual CORBA_Object
   {
@@ -1103,62 +1098,60 @@ TAO_NAMESPACE  ImplementationRepository
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-    
+
     static Administration_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static Administration_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static Administration_ptr _nil (void)
       {
         return (Administration_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void*);
-    
-    
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_
-    
+
     class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
     {
     public:
-      
+
       AlreadyRegistered (void);
       // Default constructor.
-      
+
       AlreadyRegistered (const AlreadyRegistered &);
       // Copy constructor.
-      
+
       ~AlreadyRegistered (void);
       // Destructor.
-      
+
       static void _tao_any_destructor (void*);
-      
+
       AlreadyRegistered &operator= (const AlreadyRegistered &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static AlreadyRegistered *_downcast (CORBA::Exception *);
 
 
@@ -1168,93 +1161,93 @@ TAO_NAMESPACE  ImplementationRepository
     }; // Exception ImplementationRepository::Administration::AlreadyRegistered.
 
 static CORBA::TypeCode_ptr _tc_AlreadyRegistered;
-    
-    
+
+
 #endif /* end #if !defined */
-    
-    
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_
-    
+
     class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
     {
     public:
       TAO_String_Manager reason;
-      
+
       CannotActivate (void);
       // Default constructor.
-      
+
       CannotActivate (const CannotActivate &);
       // Copy constructor.
-      
+
       ~CannotActivate (void);
       // Destructor.
-      
+
       static void _tao_any_destructor (void*);
-      
+
       CannotActivate &operator= (const CannotActivate &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static CannotActivate *_downcast (CORBA::Exception *);
 
       CannotActivate (
           const char * _tao_reason
         );
-      
+
       // = TAO extension.
       static CORBA::Exception *_alloc (void);
       virtual CORBA::TypeCode_ptr _type (void) const;
     }; // Exception ImplementationRepository::Administration::CannotActivate.
 
 static CORBA::TypeCode_ptr _tc_CannotActivate;
-    
-    
+
+
 #endif /* end #if !defined */
-    
-    
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_
-    
+
     class TAO_PortableServer_Export NotFound : public CORBA::UserException
     {
     public:
-      
+
       NotFound (void);
       // Default constructor.
-      
+
       NotFound (const NotFound &);
       // Copy constructor.
-      
+
       ~NotFound (void);
       // Destructor.
-      
+
       static void _tao_any_destructor (void*);
-      
+
       NotFound &operator= (const NotFound &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static NotFound *_downcast (CORBA::Exception *);
 
 
@@ -1264,152 +1257,142 @@ static CORBA::TypeCode_ptr _tc_CannotActivate;
     }; // Exception ImplementationRepository::Administration::NotFound.
 
 static CORBA::TypeCode_ptr _tc_NotFound;
-    
-    
+
+
 #endif /* end #if !defined */
-    
+
     virtual void activate_server (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound,
         ImplementationRepository::Administration::CannotActivate
       ));
-    
+
     virtual void register_server (
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::AlreadyRegistered
       ));
-    
+
     virtual void reregister_server (
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void remove_server (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void shutdown_server (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual char * server_is_running (
         const char * server,
         const char * addr,
-        ImplementationRepository::ServerObject_ptr server_object,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerObject_ptr server_object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void server_is_shutting_down (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void find (
         const char * server,
-        ImplementationRepository::ServerInformation_out info,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerInformation_out info
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
-        ImplementationRepository::ServerInformationIterator_out server_iterator,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerInformationIterator_out server_iterator
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   private:
     _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-    
+
   protected:
     Administration (int collocated = 0);
-    
+
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
-    
+
     Administration (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
-    
+
     friend class _TAO_Administration_Remote_Proxy_Impl;
     friend class _TAO_Administration_ThruPOA_Proxy_Impl;
     friend class _TAO_Administration_Direct_Proxy_Impl;
-    
+
     virtual ~Administration (void);
-  
+
   private:
     Administration (const Administration &);
     void operator= (const Administration &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulate
   // an invocation logics.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
@@ -1417,300 +1400,300 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual ~_TAO_Administration_Proxy_Impl (void) { }
     virtual void activate_server (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound,
         ImplementationRepository::Administration::CannotActivate
       )) = 0;
-    
+
     virtual void register_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::AlreadyRegistered
       )) = 0;
-    
+
     virtual void reregister_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void remove_server (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       )) = 0;
-    
+
     virtual void shutdown_server (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       )) = 0;
-    
+
     virtual char * server_is_running (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         const char * addr,
-        ImplementationRepository::ServerObject_ptr server_object,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerObject_ptr server_object
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       )) = 0;
-    
+
     virtual void server_is_shutting_down (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       )) = 0;
-    
+
     virtual void find (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
-        ImplementationRepository::ServerInformation_out info,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerInformation_out info
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       )) = 0;
-    
+
     virtual void list (
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
-        ImplementationRepository::ServerInformationIterator_out server_iterator,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerInformationIterator_out server_iterator
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
-    
+
+
   protected:
     _TAO_Administration_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl
     : public virtual _TAO_Administration_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_Administration_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { }
     virtual void activate_server (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound,
         ImplementationRepository::Administration::CannotActivate
       ));
-    
+
     virtual void register_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::AlreadyRegistered
       ));
-    
+
     virtual void reregister_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void remove_server (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void shutdown_server (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual char * server_is_running (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         const char * addr,
-        ImplementationRepository::ServerObject_ptr server_object,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerObject_ptr server_object
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void server_is_shutting_down (
         CORBA_Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * server
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void find (
         CORBA_Object *_collocated_tao_target_,
         const char * server,
-        ImplementationRepository::ServerInformation_out info,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerInformation_out info
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
     virtual void list (
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
-        ImplementationRepository::ServerInformationIterator_out server_iterator,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerInformationIterator_out server_iterator
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
     class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
   {
   public:
     virtual ~_TAO_Administration_Proxy_Broker (void);
     virtual _TAO_Administration_Proxy_Impl &select_proxy (
-        Administration *object,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        Administration *object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_Administration_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker
     : public virtual _TAO_Administration_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Administration_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_Administration_Proxy_Impl &select_proxy (
-        Administration *object,
-        CORBA_Environment &ACE_TRY_ENV
+        Administration *object
+        TAO_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration;
-  
-  
+
+
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-  
+
   // Forward Classes Declaration.
   class _TAO_ServerInformationIterator_Proxy_Impl;
   class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
   class _TAO_ServerInformationIterator_Proxy_Broker;
   class _TAO_ServerInformationIterator_Remote_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual CORBA_Object
   {
@@ -1721,93 +1704,88 @@ static CORBA::TypeCode_ptr _tc_NotFound;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-    
+
     static ServerInformationIterator_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ServerInformationIterator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ServerInformationIterator_ptr _nil (void)
       {
         return (ServerInformationIterator_ptr)0;
       }
-    
+
     static void _tao_any_destructor (void*);
-    
+
     virtual CORBA::Boolean next_n (
         CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerInformationList_out server_list
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    
+        const CORBA::Char *type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   private:
     _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-    
+
   protected:
     ServerInformationIterator (int collocated = 0);
-    
+
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
-    
+
     ServerInformationIterator (
-        TAO_Stub *objref, 
+        TAO_Stub *objref,
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
       );
-    
+
     friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-    
+
     virtual ~ServerInformationIterator (void);
-  
+
   private:
     ServerInformationIterator (const ServerInformationIterator &);
     void operator= (const ServerInformationIterator &);
   };
-  
+
   // The Proxy Implementations are used by each interface to
   // perform a call. Each different implementation encapsulate
   // an invocation logics.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    Base Proxy Impl. Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl
     : public virtual TAO_Object_Proxy_Impl
   {
@@ -1816,134 +1794,134 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual CORBA::Boolean next_n (
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerInformationList_out server_list
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     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
       )) = 0;
-    
-    
+
+
   protected:
     _TAO_ServerInformationIterator_Proxy_Impl (void);
   };
-  
+
   //
   //               End Base Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                Remote Proxy Impl. Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl
     : public virtual _TAO_ServerInformationIterator_Proxy_Impl,
       public virtual TAO_Remote_Object_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { }
     virtual CORBA::Boolean next_n (
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list,
-        CORBA::Environment &ACE_TRY_ENV
+        ImplementationRepository::ServerInformationList_out server_list
+        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
       ));
-    
-    
+
+
   };
-  
+
   //
   //             End Remote Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new 
+  // the right proxy for performing a call. In the new
   // collocation scheme, the proxy to be used can vary on
   // a call by call basis.
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration 
+  //                 Base Proxy Broker Declaration
   //
-  
+
     class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
   {
   public:
     virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void);
     virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-        ServerInformationIterator *object,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+        ServerInformationIterator *object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
-    
+
   protected:
     _TAO_ServerInformationIterator_Proxy_Broker (void);
-    
+
   };
-  
+
   //
-  //              End Base Proxy Broker Declaration 
+  //              End Base Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-    
+
+
   ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration 
+  //                 Remote Proxy Broker Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker
     : public virtual _TAO_ServerInformationIterator_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-    
+
     virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-        ServerInformationIterator *object,
-        CORBA_Environment &ACE_TRY_ENV
+        ServerInformationIterator *object
+        TAO_ENV_ARG_DECL
       );
-    
+
   private:
     _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_;
-  
+
   public:
     // This member function is used to get an handle to the unique instance
     // of the Remote Proxy Broker that is available for a given
     // interface.
     static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
   };
-  
+
   //
-  //              End Remote Proxy Broker Declaration 
+  //              End Remote Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformationIterator;
-  
-  
+
+
 }
 TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
@@ -2032,7 +2010,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // 
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); //
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 3e1070e7cfe..a5339a82670 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -49,11 +49,11 @@ tao_ImplementationRepository_ServerObject_nil (
 
 ACE_INLINE ImplementationRepository::ServerObject_ptr
 tao_ImplementationRepository_ServerObject_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV);
+  return ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -131,7 +131,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa
         {
           EnvironmentVariable *deep_copy =
             new EnvironmentVariable (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               EnvironmentVariable *tmp = deep_copy;
@@ -141,7 +141,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -164,20 +164,20 @@ ImplementationRepository::EnvironmentVariable_var::operator const ::Implementati
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast 
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast 
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast 
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
 {
   return this->ptr_;
 }
@@ -194,7 +194,7 @@ ImplementationRepository::EnvironmentVariable_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::EnvironmentVariable *&
 ImplementationRepository::EnvironmentVariable_var::out (void)
 {
@@ -255,7 +255,7 @@ ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariabl
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
 {
   return this->ptr_;
@@ -324,10 +324,10 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
   {
     ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
     ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     this->buffer_ = tmp1;
   }
   else
@@ -342,7 +342,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
 {
   if (this == &rhs)
     return *this;
-  
+
   if (this->release_)
   {
     if (this->maximum_ < rhs.maximum_)
@@ -355,15 +355,15 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Envir
   }
   else
     this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
-  
+
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
+
   ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
   ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-  
+
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     tmp1[i] = tmp2[i];
-  
+
   return *this;
 }
 
@@ -448,7 +448,7 @@ CORBA::Boolean release)
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
@@ -504,7 +504,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
         {
           EnvironmentList *deep_copy =
             new EnvironmentList (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               EnvironmentList *tmp = deep_copy;
@@ -514,7 +514,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -530,27 +530,27 @@ ImplementationRepository::EnvironmentList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast 
+ACE_INLINE
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast 
+ACE_INLINE
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast 
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast
 {
   return this->ptr_;
 }
@@ -579,7 +579,7 @@ ImplementationRepository::EnvironmentList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::EnvironmentList *&
 ImplementationRepository::EnvironmentList_var::out (void)
 {
@@ -640,7 +640,7 @@ ImplementationRepository::EnvironmentList_out::operator= (EnvironmentList *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast
 {
   return this->ptr_;
@@ -718,7 +718,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR
         {
           StartupOptions *deep_copy =
             new StartupOptions (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               StartupOptions *tmp = deep_copy;
@@ -728,7 +728,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -751,20 +751,20 @@ ImplementationRepository::StartupOptions_var::operator const ::ImplementationRep
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast 
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast 
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast 
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast
 {
   return this->ptr_;
 }
@@ -781,7 +781,7 @@ ImplementationRepository::StartupOptions_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::StartupOptions *&
 ImplementationRepository::StartupOptions_var::out (void)
 {
@@ -842,7 +842,7 @@ ImplementationRepository::StartupOptions_out::operator= (StartupOptions *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast
 {
   return this->ptr_;
@@ -911,7 +911,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati
         {
           ServerInformation *deep_copy =
             new ServerInformation (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               ServerInformation *tmp = deep_copy;
@@ -921,7 +921,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -944,20 +944,20 @@ ImplementationRepository::ServerInformation_var::operator const ::Implementation
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast 
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast 
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast 
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast
 {
   return this->ptr_;
 }
@@ -974,7 +974,7 @@ ImplementationRepository::ServerInformation_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::ServerInformation *&
 ImplementationRepository::ServerInformation_var::out (void)
 {
@@ -1035,7 +1035,7 @@ ImplementationRepository::ServerInformation_out::operator= (ServerInformation *p
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast
 {
   return this->ptr_;
@@ -1104,10 +1104,10 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
   {
     ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
     ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-    
+
     this->buffer_ = tmp1;
   }
   else
@@ -1122,7 +1122,7 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
 {
   if (this == &rhs)
     return *this;
-  
+
   if (this->release_)
   {
     if (this->maximum_ < rhs.maximum_)
@@ -1135,15 +1135,15 @@ ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_Serve
   }
   else
     this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
-  
+
   TAO_Unbounded_Base_Sequence::operator= (rhs);
-  
+
   ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
   ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-  
+
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     tmp1[i] = tmp2[i];
-  
+
   return *this;
 }
 
@@ -1228,7 +1228,7 @@ CORBA::Boolean release)
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
@@ -1284,7 +1284,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
         {
           ServerInformationList *deep_copy =
             new ServerInformationList (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               ServerInformationList *tmp = deep_copy;
@@ -1294,7 +1294,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -1310,27 +1310,27 @@ ImplementationRepository::ServerInformationList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast 
+ACE_INLINE
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast 
+ACE_INLINE
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast 
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast
 {
   return this->ptr_;
 }
@@ -1359,7 +1359,7 @@ ImplementationRepository::ServerInformationList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::ImplementationRepository::ServerInformationList *&
 ImplementationRepository::ServerInformationList_var::out (void)
 {
@@ -1420,7 +1420,7 @@ ImplementationRepository::ServerInformationList_out::operator= (ServerInformatio
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast
 {
   return this->ptr_;
@@ -1489,11 +1489,11 @@ tao_ImplementationRepository_Administration_nil (
 
 ACE_INLINE ImplementationRepository::Administration_ptr
 tao_ImplementationRepository_Administration_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV);
+  return ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1550,11 +1550,11 @@ tao_ImplementationRepository_ServerInformationIterator_nil (
 
 ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
 tao_ImplementationRepository_ServerInformationIterator_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV);
+  return ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1600,7 +1600,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate)
@@ -1612,7 +1612,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -1640,12 +1640,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1660,7 +1660,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate)
@@ -1674,7 +1674,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate)
@@ -1688,7 +1688,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate)
@@ -1702,7 +1702,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-  
+
 }
 
 
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index fb6efdcf9ab..b5c96026e3c 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -160,36 +160,31 @@ public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *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));
 
 
@@ -205,32 +200,32 @@ private:
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_ImplementationRepository::ServerObject *tao_impl,
-    CORBA::Environment &
+    POA_ImplementationRepository::ServerObject *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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;
@@ -238,13 +233,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CO
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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;
@@ -252,7 +247,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA:
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -261,11 +256,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_de
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::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_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
@@ -274,36 +269,31 @@ public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *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));
 
 
@@ -319,32 +309,32 @@ private:
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_ImplementationRepository::ServerObject *tao_impl,
-    CORBA::Environment &
+    POA_ImplementationRepository::ServerObject *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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;
@@ -352,13 +342,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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;
@@ -366,7 +356,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CO
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -375,11 +365,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_mos
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::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 */
@@ -411,18 +401,18 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl&
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::ServerObject *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::ImplementationRepository::ServerObject *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];
@@ -431,8 +421,8 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_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_);
@@ -510,8 +500,8 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO
 // ThruPOA Implementation of the IDL interface methods
 
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -524,8 +514,8 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "ping",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -534,14 +524,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->ping (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
 
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -554,8 +544,8 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "shutdown",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -564,7 +554,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->shutdown (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -582,8 +572,8 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerOb
 {}
 
 void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping  (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -593,14 +583,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping  (
       POA_ImplementationRepository::ServerObject_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
     )->ping (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
 
 }
 
 void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown  (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -610,7 +600,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown
       POA_ImplementationRepository::ServerObject_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
     )->shutdown (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
 
 }
@@ -638,8 +628,8 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 void POA_ImplementationRepository::ServerObject::ping_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_ImplementationRepository::ServerObject *_tao_impl =
@@ -659,38 +649,38 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping 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->ping (
-          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
@@ -705,16 +695,13 @@ void POA_ImplementationRepository::ServerObject::ping_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_ImplementationRepository::ServerObject::shutdown_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_ImplementationRepository::ServerObject *_tao_impl =
@@ -734,38 +721,38 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown 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->shutdown (
-          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
@@ -780,16 +767,13 @@ void POA_ImplementationRepository::ServerObject::shutdown_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_ImplementationRepository::ServerObject::_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 ();
@@ -799,7 +783,7 @@ void POA_ImplementationRepository::ServerObject::_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 ();
@@ -811,12 +795,12 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 void POA_ImplementationRepository::ServerObject::_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_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _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 ();
@@ -828,8 +812,8 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 void POA_ImplementationRepository::ServerObject::_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_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
@@ -848,7 +832,7 @@ void POA_ImplementationRepository::ServerObject::_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 ();
@@ -874,11 +858,11 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
 }
 
 CORBA::Boolean POA_ImplementationRepository::ServerObject::_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 (
@@ -900,12 +884,12 @@ void* POA_ImplementationRepository::ServerObject::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_ImplementationRepository::ServerObject::_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);
 }
 
 
@@ -915,9 +899,9 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id
 }
 
 ImplementationRepository::ServerObject*
-POA_ImplementationRepository::ServerObject::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_ImplementationRepository::ServerObject::_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);
@@ -1060,36 +1044,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * server
+    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));
 
 
@@ -1107,8 +1087,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1116,12 +1096,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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;
@@ -1137,12 +1117,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1166,13 +1146,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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;
@@ -1180,7 +1160,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1189,11 +1169,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::t
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::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_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
@@ -1204,36 +1184,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const ImplementationRepository::StartupOptions & options
+    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));
 
 
@@ -1253,8 +1229,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1263,12 +1239,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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;
@@ -1287,12 +1263,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1315,13 +1291,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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;
@@ -1329,7 +1305,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1338,11 +1314,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::t
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::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_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
@@ -1353,36 +1329,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const ImplementationRepository::StartupOptions & options
+    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));
 
 
@@ -1402,8 +1374,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1412,12 +1384,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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;
@@ -1436,12 +1408,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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;
@@ -1449,13 +1421,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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;
@@ -1463,7 +1435,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1472,11 +1444,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::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_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
@@ -1486,36 +1458,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * server
+    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));
 
 
@@ -1533,8 +1501,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1542,12 +1510,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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;
@@ -1563,12 +1531,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arg
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1591,13 +1559,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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;
@@ -1605,7 +1573,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1614,11 +1582,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::tar
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
@@ -1628,36 +1596,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * server
+    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));
 
 
@@ -1675,8 +1639,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1684,12 +1648,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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;
@@ -1705,12 +1669,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1733,13 +1697,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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;
@@ -1747,7 +1711,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1756,11 +1720,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::t
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::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_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
@@ -1772,36 +1736,32 @@ public:
     ,
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    ImplementationRepository::ServerObject_ptr server_object
+    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);
@@ -1824,8 +1784,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &
+    ImplementationRepository::ServerObject_ptr server_object
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1835,12 +1795,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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;
@@ -1862,12 +1822,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1890,13 +1850,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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;
@@ -1908,7 +1868,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1917,11 +1877,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::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
@@ -1938,36 +1898,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * server
+    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));
 
 
@@ -1985,8 +1941,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1994,12 +1950,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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;
@@ -2015,12 +1971,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2043,13 +1999,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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;
@@ -2057,7 +2013,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2066,11 +2022,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::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_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
@@ -2080,36 +2036,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * server
+    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));
 
 
@@ -2127,8 +2079,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const char * server,
-    CORBA::Environment &
+    const char * server
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2136,12 +2088,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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;
@@ -2157,12 +2109,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (C
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2185,13 +2137,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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;
@@ -2199,7 +2151,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (CORB
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2208,11 +2160,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::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_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
@@ -2223,36 +2175,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const CORBA::ULong & how_many
-,
-    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));
 
 
@@ -2272,8 +2220,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const CORBA::ULong & how_many
-,
-    CORBA::Environment &
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2282,12 +2229,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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;
@@ -2304,12 +2251,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (C
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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;
@@ -2317,13 +2264,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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;
@@ -2331,7 +2278,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (CORB
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2340,11 +2287,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::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 */
@@ -2376,18 +2323,18 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TA
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::Administration *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::ImplementationRepository::Administration *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];
@@ -2396,8 +2343,8 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele
 
 void
 POA_ImplementationRepository::_TAO_Administration_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_);
@@ -2476,8 +2423,8 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2492,8 +2439,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "activate_server",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2502,8 +2449,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->activate_server (
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2511,8 +2458,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2526,8 +2473,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "register_server",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2537,8 +2484,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
         )
     )->register_server (
         server,
-        options,
-        ACE_TRY_ENV
+        options
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2546,8 +2493,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2560,8 +2507,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "reregister_server",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2571,16 +2518,16 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
         )
     )->reregister_server (
         server,
-        options,
-        ACE_TRY_ENV
+        options
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2594,8 +2541,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "remove_server",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2604,16 +2551,16 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->remove_server (
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2627,8 +2574,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "shutdown_server",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2637,8 +2584,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->shutdown_server (
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2647,8 +2594,8 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerObject_ptr server_object
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2664,8 +2611,8 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "server_is_running",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2676,15 +2623,15 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
     )->server_is_running (
         server,
         addr,
-        server_object,
-        ACE_TRY_ENV
+        server_object
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2698,8 +2645,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "server_is_shutting_down",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2708,8 +2655,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_shutting_down (
-        server,
-        ACE_TRY_ENV
+        server
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2717,8 +2664,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    ImplementationRepository::ServerInformation_out info,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformation_out info
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2732,8 +2679,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "find",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2743,8 +2690,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
         )
     )->find (
         server,
-        info,
-        ACE_TRY_ENV
+        info
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2753,8 +2700,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationIterator_out server_iterator
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2767,8 +2714,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "list",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2779,8 +2726,8 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
     )->list (
         how_many,
         server_list,
-        server_iterator,
-        ACE_TRY_ENV
+        server_iterator
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2799,8 +2746,8 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Admini
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server  (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2812,8 +2759,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->activate_server (
-          server,
-          ACE_TRY_ENV
+          server
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
@@ -2821,8 +2768,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server  (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2834,8 +2781,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->register_server (
           server,
-          options,
-          ACE_TRY_ENV
+          options
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
@@ -2843,8 +2790,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server  (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2855,16 +2802,16 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->reregister_server (
           server,
-          options,
-          ACE_TRY_ENV
+          options
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server  (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2875,16 +2822,16 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->remove_server (
-          server,
-          ACE_TRY_ENV
+          server
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server  (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2895,8 +2842,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->shutdown_server (
-          server,
-          ACE_TRY_ENV
+          server
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
@@ -2905,8 +2852,8 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerObject_ptr server_object
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2919,16 +2866,16 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
     )->server_is_running (
           server,
           addr,
-          server_object,
-          ACE_TRY_ENV
+          server_object
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
 
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down  (
     CORBA_Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2939,8 +2886,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server
       POA_ImplementationRepository::Administration_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->server_is_shutting_down (
-          server,
-          ACE_TRY_ENV
+          server
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
@@ -2948,8 +2895,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find  (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
-    ImplementationRepository::ServerInformation_out info,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformation_out info
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2961,8 +2908,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->find (
           server,
-          info,
-          ACE_TRY_ENV
+          info
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
@@ -2971,8 +2918,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationIterator_out server_iterator
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2984,8 +2931,8 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
     )->list (
           how_many,
           server_list,
-          server_iterator,
-          ACE_TRY_ENV
+          server_iterator
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
@@ -3013,8 +2960,8 @@ POA_ImplementationRepository::Administration::~Administration (void)
 void POA_ImplementationRepository::Administration::activate_server_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 ();
@@ -3042,39 +2989,39 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in (),
-      ACE_TRY_ENV
+      server.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->activate_server (
-          server.in (),
-          ACE_TRY_ENV
+          server.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
@@ -3089,16 +3036,13 @@ void POA_ImplementationRepository::Administration::activate_server_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_ImplementationRepository::Administration::register_server_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 ();
@@ -3129,40 +3073,40 @@ void POA_ImplementationRepository::Administration::register_server_skel (
       _tao_upcall,
       _tao_impl,
       server.in (),
-      options,
-      ACE_TRY_ENV
+      options
+      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->register_server (
           server.in (),
-          options,
-          ACE_TRY_ENV
+          options
+          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
@@ -3177,16 +3121,13 @@ void POA_ImplementationRepository::Administration::register_server_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_ImplementationRepository::Administration::reregister_server_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 ();
@@ -3217,40 +3158,40 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
       _tao_upcall,
       _tao_impl,
       server.in (),
-      options,
-      ACE_TRY_ENV
+      options
+      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->reregister_server (
           server.in (),
-          options,
-          ACE_TRY_ENV
+          options
+          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
@@ -3265,16 +3206,13 @@ void POA_ImplementationRepository::Administration::reregister_server_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_ImplementationRepository::Administration::remove_server_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 ();
@@ -3302,39 +3240,39 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in (),
-      ACE_TRY_ENV
+      server.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->remove_server (
-          server.in (),
-          ACE_TRY_ENV
+          server.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
@@ -3349,16 +3287,13 @@ void POA_ImplementationRepository::Administration::remove_server_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_ImplementationRepository::Administration::shutdown_server_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 ();
@@ -3386,39 +3321,39 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in (),
-      ACE_TRY_ENV
+      server.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->shutdown_server (
-          server.in (),
-          ACE_TRY_ENV
+          server.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
@@ -3433,16 +3368,13 @@ void POA_ImplementationRepository::Administration::shutdown_server_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_ImplementationRepository::Administration::server_is_running_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 ();
@@ -3476,13 +3408,13 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       _tao_impl,
       server.in (),
       addr.in (),
-      server_object.in (),
-      ACE_TRY_ENV
+      server_object.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 */
@@ -3490,8 +3422,8 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       _tao_impl->server_is_running (
           server.in (),
           addr.in (),
-          server_object.in (),
-          ACE_TRY_ENV
+          server_object.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3500,20 +3432,20 @@ void POA_ImplementationRepository::Administration::server_is_running_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
@@ -3535,16 +3467,13 @@ void POA_ImplementationRepository::Administration::server_is_running_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_ImplementationRepository::Administration::server_is_shutting_down_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 ();
@@ -3572,39 +3501,39 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in (),
-      ACE_TRY_ENV
+      server.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->server_is_shutting_down (
-          server.in (),
-          ACE_TRY_ENV
+          server.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
@@ -3619,16 +3548,13 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_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_ImplementationRepository::Administration::find_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 ();
@@ -3656,40 +3582,40 @@ void POA_ImplementationRepository::Administration::find_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      server.in (),
-      ACE_TRY_ENV
+      server.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->find (
           server.in (),
-          info.out (),
-          ACE_TRY_ENV
+          info.out ()
+          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
@@ -3711,16 +3637,13 @@ void POA_ImplementationRepository::Administration::find_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_ImplementationRepository::Administration::list_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 ();
@@ -3750,13 +3673,13 @@ void POA_ImplementationRepository::Administration::list_skel (
       _tao_upcall,
       _tao_impl,
       how_many
-,
-      ACE_TRY_ENV
+
+      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 */
@@ -3764,27 +3687,27 @@ void POA_ImplementationRepository::Administration::list_skel (
       _tao_impl->list (
           how_many,
           server_list.out (),
-          server_iterator.out (),
-          ACE_TRY_ENV
+          server_iterator.out ()
+          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
@@ -3807,16 +3730,13 @@ void POA_ImplementationRepository::Administration::list_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_ImplementationRepository::Administration::_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 ();
@@ -3826,7 +3746,7 @@ void POA_ImplementationRepository::Administration::_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 ();
@@ -3838,12 +3758,12 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 void POA_ImplementationRepository::Administration::_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_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _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 ();
@@ -3855,8 +3775,8 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 void POA_ImplementationRepository::Administration::_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_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
@@ -3875,7 +3795,7 @@ void POA_ImplementationRepository::Administration::_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 ();
@@ -3901,11 +3821,11 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 }
 
 CORBA::Boolean POA_ImplementationRepository::Administration::_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 (
@@ -3927,12 +3847,12 @@ void* POA_ImplementationRepository::Administration::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_ImplementationRepository::Administration::_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);
 }
 
 
@@ -3942,9 +3862,9 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_
 }
 
 ImplementationRepository::Administration*
-POA_ImplementationRepository::Administration::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_ImplementationRepository::Administration::_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);
@@ -4077,36 +3997,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
     ,
-    const CORBA::ULong & how_many,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & how_many
+    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);
@@ -4125,8 +4041,8 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-    const CORBA::ULong & how_many,
-    CORBA::Environment &
+    const CORBA::ULong & how_many
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4134,12 +4050,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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;
@@ -4155,12 +4071,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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;
@@ -4168,13 +4084,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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;
@@ -4186,7 +4102,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4195,11 +4111,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::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
@@ -4215,36 +4131,31 @@ public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *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));
 
 
@@ -4260,32 +4171,32 @@ private:
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_ImplementationRepository::ServerInformationIterator *tao_impl,
-    CORBA::Environment &
+    POA_ImplementationRepository::ServerInformationIterator *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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;
@@ -4293,13 +4204,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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;
@@ -4307,7 +4218,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4316,11 +4227,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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 */
@@ -4352,18 +4263,18 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::ServerInformationIterator *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::ImplementationRepository::ServerInformationIterator *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];
@@ -4372,8 +4283,8 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_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_);
@@ -4453,8 +4364,8 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl:
 CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationList_out server_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4469,8 +4380,8 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "next_n",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -4480,14 +4391,14 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
         )
     )->next_n (
         how_many,
-        server_list,
-        ACE_TRY_ENV
+        server_list
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_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
@@ -4500,8 +4411,8 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
   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 (
@@ -4510,7 +4421,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
           "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         )
     )->destroy (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -4530,8 +4441,8 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
 CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n  (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationList_out server_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4542,15 +4453,15 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0")
     )->next_n (
           how_many,
-          server_list,
-          ACE_TRY_ENV
+          server_list
+          TAO_ENV_ARG_PARAMETER
         );
 
 }
 
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_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
@@ -4560,7 +4471,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_I
       POA_ImplementationRepository::ServerInformationIterator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0")
     )->destroy (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
 
 }
@@ -4588,8 +4499,8 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 void POA_ImplementationRepository::ServerInformationIterator::next_n_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 ();
@@ -4618,21 +4529,21 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      how_many,
-      ACE_TRY_ENV
+      how_many
+      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->next_n (
           how_many,
-          server_list.out (),
-          ACE_TRY_ENV
+          server_list.out ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4640,20 +4551,20 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_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
@@ -4676,16 +4587,13 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_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_ImplementationRepository::ServerInformationIterator::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_ImplementationRepository::ServerInformationIterator *_tao_impl =
@@ -4705,38 +4613,38 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_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
@@ -4751,16 +4659,13 @@ void POA_ImplementationRepository::ServerInformationIterator::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_ImplementationRepository::ServerInformationIterator::_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 ();
@@ -4770,7 +4675,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_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 ();
@@ -4782,12 +4687,12 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 void POA_ImplementationRepository::ServerInformationIterator::_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_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _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 ();
@@ -4799,8 +4704,8 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 void POA_ImplementationRepository::ServerInformationIterator::_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_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
@@ -4819,7 +4724,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_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 ();
@@ -4845,11 +4750,11 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 }
 
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_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 (
@@ -4871,12 +4776,12 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_ImplementationRepository::ServerInformationIterator::_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);
 }
 
 
@@ -4886,9 +4791,9 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_
 }
 
 ImplementationRepository::ServerInformationIterator*
-POA_ImplementationRepository::ServerInformationIterator::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_ImplementationRepository::ServerInformationIterator::_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/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index a1ea062001a..0926dcc5a9f 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -54,7 +54,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
   class _TAO_ServerObject_ThruPOA_Proxy_Impl;
   class _TAO_ServerObject_Direct_Proxy_Impl;
   class _TAO_ServerObject_Strategized_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export ServerObject
     : public virtual PortableServer::ServantBase
   {
@@ -67,10 +67,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
 
     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
@@ -79,182 +78,179 @@ TAO_NAMESPACE  POA_ImplementationRepository
     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
       );
 
     ::ImplementationRepository::ServerObject *_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 void ping (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void ping_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 shutdown (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void shutdown_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
       );
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ServerObject_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
-    
+
     virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy (
-      ::ImplementationRepository::ServerObject *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::ImplementationRepository::ServerObject *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
     );
-    
+
     // 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.
     ::ImplementationRepository::_TAO_ServerObject_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_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
+
+  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl :
     public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
   public:
     _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual void ping (
-        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 shutdown (
-        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
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : 
+class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl :
   public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_ServerObject_Direct_Proxy_Impl (void);
-  
+
   virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) { }
-  
+
   virtual void ping (
-      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 shutdown (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   };
 
 
@@ -282,10 +278,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
@@ -294,194 +289,184 @@ 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
     );
 
   ::ImplementationRepository::Administration *_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 void activate_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound,
       ImplementationRepository::Administration::CannotActivate
     )) = 0;
-  
+
     static void activate_server_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 register_server (
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const ImplementationRepository::StartupOptions & options
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::AlreadyRegistered
     )) = 0;
-  
+
     static void register_server_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 reregister_server (
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const ImplementationRepository::StartupOptions & options
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void reregister_server_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 remove_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-  
+
     static void remove_server_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 shutdown_server (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-  
+
     static void shutdown_server_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 * server_is_running (
       const char * server,
       const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      ImplementationRepository::ServerObject_ptr server_object
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-  
+
     static void server_is_running_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 server_is_shutting_down (
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * server
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-  
+
     static void server_is_shutting_down_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 find (
       const char * server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      ImplementationRepository::ServerInformation_out info
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     )) = 0;
-  
+
     static void find_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 list (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      ImplementationRepository::ServerInformationIterator_out server_iterator
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void list_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
     );
 
 
@@ -489,35 +474,35 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
 {
-public: 
+public:
   _TAO_Administration_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
-  
+
   virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy (
-    ::ImplementationRepository::Administration *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::ImplementationRepository::Administration *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
   );
-  
+
   // 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.
   ::ImplementationRepository::_TAO_Administration_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
@@ -529,7 +514,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -537,112 +522,112 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
+class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl :
   public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_Administration_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound,
       ImplementationRepository::Administration::CannotActivate
     ));
-  
+
   virtual void register_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
+      const ImplementationRepository::StartupOptions & options
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::AlreadyRegistered
     ));
-  
+
   virtual void reregister_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
+      const ImplementationRepository::StartupOptions & options
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void remove_server (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void shutdown_server (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual char * server_is_running (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerObject_ptr server_object
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void server_is_shutting_down (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void find (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerInformation_out info
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void list (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerInformationIterator_out server_iterator
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -654,111 +639,111 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : 
+class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl :
   public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_Administration_Direct_Proxy_Impl (void);
-  
+
   virtual ~_TAO_Administration_Direct_Proxy_Impl (void) { }
-  
+
   virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound,
       ImplementationRepository::Administration::CannotActivate
     ));
-  
+
   virtual void register_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
+      const ImplementationRepository::StartupOptions & options
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::AlreadyRegistered
     ));
-  
+
   virtual void reregister_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
-      const ImplementationRepository::StartupOptions & options,
-      CORBA::Environment &ACE_TRY_ENV
+      const ImplementationRepository::StartupOptions & options
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void remove_server (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void shutdown_server (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual char * server_is_running (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerObject_ptr server_object
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void server_is_shutting_down (
       CORBA_Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * server
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void find (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
-      ImplementationRepository::ServerInformation_out info,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerInformation_out info
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       ImplementationRepository::Administration::NotFound
     ));
-  
+
   virtual void list (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerInformationIterator_out server_iterator
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   };
 
 
@@ -786,10 +771,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
@@ -798,67 +782,64 @@ 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
     );
 
   ::ImplementationRepository::ServerInformationIterator *_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 next_n (
       CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      ImplementationRepository::ServerInformationList_out server_list
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void next_n_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
     );
 
 
@@ -866,35 +847,35 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
 {
-public: 
+public:
   _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
-  
+
   virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-    ::ImplementationRepository::ServerInformationIterator *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::ImplementationRepository::ServerInformationIterator *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
   );
-  
+
   // 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.
   ::ImplementationRepository::_TAO_ServerInformationIterator_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
@@ -906,7 +887,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -914,34 +895,34 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl :
   public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::Boolean next_n (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerInformationList_out server_list
+      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
     ));
-  
-  
+
+
 };
 
 //
@@ -953,33 +934,33 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : 
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl :
   public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
-  
+
   virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) { }
-  
+
   virtual CORBA::Boolean next_n (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      CORBA::Environment &ACE_TRY_ENV
+      ImplementationRepository::ServerInformationList_out server_list
+      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
     ));
-  
+
   };
 
 
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index 5e3d34d5d19..82456cc70ec 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
@@ -48,7 +48,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // ctor with T*, ownership flag and a POA
     ~ServerObject_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -60,33 +60,30 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // 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);
+
     void ping (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void shutdown (
-        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
     ServerObject_tie (const ServerObject_tie &);
     void operator= (const ServerObject_tie &);
@@ -107,7 +104,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // ctor with T*, ownership flag and a POA
     ~Administration_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -119,113 +116,103 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // 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);
+
     void activate_server (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound,
         ImplementationRepository::Administration::CannotActivate
       ));
-    
+
         void register_server (
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::AlreadyRegistered
       ));
-    
+
         void reregister_server (
         const char * server,
-        const ImplementationRepository::StartupOptions & options,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const ImplementationRepository::StartupOptions & options
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void remove_server (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
         void shutdown_server (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
         char * server_is_running (
         const char * server,
         const char * addr,
-        ImplementationRepository::ServerObject_ptr server_object,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerObject_ptr server_object
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
         void server_is_shutting_down (
-        const char * server,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * server
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
         void find (
         const char * server,
-        ImplementationRepository::ServerInformation_out info,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerInformation_out info
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ImplementationRepository::Administration::NotFound
       ));
-    
+
         void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
-        ImplementationRepository::ServerInformationIterator_out server_iterator,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerInformationIterator_out server_iterator
+        TAO_ENV_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
     Administration_tie (const Administration_tie &);
     void operator= (const Administration_tie &);
@@ -246,7 +233,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // ctor with T*, ownership flag and a POA
     ~ServerInformationIterator_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -258,35 +245,32 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // 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 next_n (
         CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        ImplementationRepository::ServerInformationList_out server_list
+        TAO_ENV_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
     ServerInformationIterator_tie (const ServerInformationIterator_tie &);
     void operator= (const ServerInformationIterator_tie &);
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index b8b1152bdbd..f821198e58b 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerObject_tie<T>::ServerObject_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_ImplementationRepository::ServerObject_tie<T>::ServerObject_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_ImplementationRepository::ServerObject_tie<T>::ServerObject_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_ImplementationRepository::ServerObject_tie<T>::ServerObject_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,37 +90,37 @@ POA_ImplementationRepository::ServerObject_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_ImplementationRepository::ServerObject_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->ServerObject::_default_POA (ACE_TRY_ENV);
+  return this->ServerObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::ping  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->ping (
-ACE_TRY_ENV
+TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::shutdown  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->shutdown (
-ACE_TRY_ENV
+TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -130,30 +130,30 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::Administration_tie<T>::Administration_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_ImplementationRepository::Administration_tie<T>::Administration_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_ImplementationRepository::Administration_tie<T>::Administration_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_ImplementationRepository::Administration_tie<T>::Administration_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
@@ -197,18 +197,18 @@ POA_ImplementationRepository::Administration_tie<T>::_is_owner (CORBA::Boolean b
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_ImplementationRepository::Administration_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_ImplementationRepository::Administration_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->Administration::_default_POA (ACE_TRY_ENV);
+  return this->Administration::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -217,16 +217,16 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
   ))
 {
   this->ptr_->activate_server (
-server,
-    ACE_TRY_ENV
+server
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::register_server  (
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -235,16 +235,16 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server  (
 {
   this->ptr_->register_server (
 server,
-    options,
-    ACE_TRY_ENV
+    options
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
     const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &ACE_TRY_ENV
+    const ImplementationRepository::StartupOptions & options
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -252,15 +252,15 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
 {
   this->ptr_->reregister_server (
 server,
-    options,
-    ACE_TRY_ENV
+    options
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -268,15 +268,15 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
   ))
 {
   this->ptr_->remove_server (
-server,
-    ACE_TRY_ENV
+server
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -284,8 +284,8 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
   ))
 {
   this->ptr_->shutdown_server (
-server,
-    ACE_TRY_ENV
+server
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -293,8 +293,8 @@ template <class T> ACE_INLINE
 char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
     const char * server,
     const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerObject_ptr server_object
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -304,15 +304,15 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
   return this->ptr_->server_is_running (
 server,
     addr,
-    server_object,
-    ACE_TRY_ENV
+    server_object
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_down  (
-    const char * server,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * server
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -320,16 +320,16 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow
   ))
 {
   this->ptr_->server_is_shutting_down (
-server,
-    ACE_TRY_ENV
+server
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::find  (
     const char * server,
-    ImplementationRepository::ServerInformation_out info,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformation_out info
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -338,8 +338,8 @@ void POA_ImplementationRepository::Administration_tie<T>::find  (
 {
   this->ptr_->find (
 server,
-    info,
-    ACE_TRY_ENV
+    info
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -347,8 +347,8 @@ template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::list  (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationIterator_out server_iterator
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -357,8 +357,8 @@ void POA_ImplementationRepository::Administration_tie<T>::list  (
   this->ptr_->list (
 how_many,
     server_list,
-    server_iterator,
-    ACE_TRY_ENV
+    server_iterator
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -368,30 +368,30 @@ how_many,
 
 template <class T> ACE_INLINE
 POA_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_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_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_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_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_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_ImplementationRepository::ServerInformationIterator_tie<T>::ServerInformationIterator_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
@@ -435,19 +435,19 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_is_owner (CORBA
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_ImplementationRepository::ServerInformationIterator_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->ServerInformationIterator::_default_POA (ACE_TRY_ENV);
+  return this->ServerInformationIterator::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::next_n  (
     CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    CORBA::Environment &ACE_TRY_ENV
+    ImplementationRepository::ServerInformationList_out server_list
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -455,21 +455,21 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n
 {
   return this->ptr_->next_n (
 how_many,
-    server_list,
-    ACE_TRY_ENV
+    server_list
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerInformationIterator_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/tao/PortableServer/ImplRepo_i.cpp b/TAO/tao/PortableServer/ImplRepo_i.cpp
index 9f2a14ed600..492bea49049 100644
--- a/TAO/tao/PortableServer/ImplRepo_i.cpp
+++ b/TAO/tao/PortableServer/ImplRepo_i.cpp
@@ -17,21 +17,21 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
 }
 
 void
-ServerObject_i::ping (CORBA::Environment &)
+ServerObject_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ServerObject_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+ServerObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-ServerObject_i::_default_POA (CORBA::Environment &)
+ServerObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp
index 9191214934a..eda6af66a2d 100644
--- a/TAO/tao/PortableServer/MessagingS.cpp
+++ b/TAO/tao/PortableServer/MessagingS.cpp
@@ -185,18 +185,18 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_St
 
 Messaging::_TAO_ReplyHandler_Proxy_Impl&
 POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy (
-    ::Messaging::ReplyHandler *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::Messaging::ReplyHandler *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];
@@ -205,8 +205,8 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_Messaging::_TAO_ReplyHandler_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_);
@@ -318,8 +318,8 @@ POA_Messaging::ReplyHandler::~ReplyHandler (void)
 void POA_Messaging::ReplyHandler::_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 ();
@@ -329,7 +329,7 @@ void POA_Messaging::ReplyHandler::_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 ();
@@ -341,12 +341,12 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
 void POA_Messaging::ReplyHandler::_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_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _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 ();
@@ -358,8 +358,8 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
 void POA_Messaging::ReplyHandler::_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_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_object_reference;
@@ -378,7 +378,7 @@ void POA_Messaging::ReplyHandler::_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 ();
@@ -404,11 +404,11 @@ void POA_Messaging::ReplyHandler::_interface_skel (
 }
 
 CORBA::Boolean POA_Messaging::ReplyHandler::_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 (
@@ -430,12 +430,12 @@ void* POA_Messaging::ReplyHandler::_downcast (
   return 0;
 }
 
-void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_Messaging::ReplyHandler::_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);
 }
 
 const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
@@ -444,9 +444,9 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
 }
 
 Messaging::ReplyHandler*
-POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_Messaging::ReplyHandler::_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/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h
index 13e0ec51294..eb2af498df8 100644
--- a/TAO/tao/PortableServer/MessagingS.h
+++ b/TAO/tao/PortableServer/MessagingS.h
@@ -75,10 +75,9 @@ TAO_NAMESPACE  POA_Messaging
 
 
     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
@@ -87,34 +86,33 @@ TAO_NAMESPACE  POA_Messaging
     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
       );
 
     ::Messaging::ReplyHandler *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
@@ -134,8 +132,8 @@ TAO_NAMESPACE  POA_Messaging
     virtual ~_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
 
     virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl &select_proxy (
-      ::Messaging::ReplyHandler *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::Messaging::ReplyHandler *object
+      TAO_ENV_ARG_DECL
     );
 
   private:
@@ -143,8 +141,8 @@ TAO_NAMESPACE  POA_Messaging
     // 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:
diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp
index 8c1dcbad4a2..752ac45da94 100644
--- a/TAO/tao/PortableServer/ORB_Manager.cpp
+++ b/TAO/tao/PortableServer/ORB_Manager.cpp
@@ -27,27 +27,27 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
 
 int
 TAO_ORB_Manager::init (int &argc,
-                       char **argv,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char **argv
+                       TAO_ENV_ARG_DECL)
 {
   return this->init (argc,
                      argv,
-                     0,
-                     ACE_TRY_ENV);
+                     0
+                     TAO_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_ORB_Manager::init (int &argc,
                        char **argv,
-                       const char *orb_name,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const char *orb_name
+                       TAO_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    orb_name,
-                                    ACE_TRY_ENV);
+                                    orb_name
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -55,8 +55,8 @@ TAO_ORB_Manager::init (int &argc,
     {
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA,
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -66,8 +66,8 @@ TAO_ORB_Manager::init (int &argc,
 
       // Get the POA object.
       this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 
       ACE_CHECK_RETURN (-1);
     }
@@ -76,7 +76,7 @@ TAO_ORB_Manager::init (int &argc,
     {
       // Get the POA_Manager.
       this->poa_manager_ =
-        this->poa_->the_POAManager (ACE_TRY_ENV);
+        this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_CHECK_RETURN (-1);
     }
@@ -87,30 +87,30 @@ TAO_ORB_Manager::init (int &argc,
 int
 TAO_ORB_Manager::init_child_poa (int& argc,
                                  char **argv,
-                                 const char *poa_name,
-                                 CORBA_Environment &ACE_TRY_ENV)
+                                 const char *poa_name
+                                 TAO_ENV_ARG_DECL)
 {
   return this->init_child_poa (argc,
                                argv,
                                poa_name,
-                               0,
-                               ACE_TRY_ENV);
+                               0
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_ORB_Manager::init_child_poa (int& argc,
                                  char **argv,
                                  const char *poa_name,
-                                 const char *orb_name,
-                                 CORBA_Environment &ACE_TRY_ENV)
+                                 const char *orb_name
+                                 TAO_ENV_ARG_DECL)
 {
   int init_result;
 
   // check to see if root poa has to be created.
   init_result = this->init (argc,
                             argv,
-                            orb_name,
-                            ACE_TRY_ENV);
+                            orb_name
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (init_result == -1)
@@ -125,14 +125,14 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 
   // Id Assignment policy
   policies[0] =
-    this->poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                             ACE_TRY_ENV);
+    this->poa_->create_id_assignment_policy (PortableServer::USER_ID
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Lifespan policy
   policies[1] =
-    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                        ACE_TRY_ENV);
+    this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We use a different POA, otherwise the user would have to change
@@ -141,8 +141,8 @@ TAO_ORB_Manager::init_child_poa (int& argc,
   this->child_poa_ =
     this->poa_->create_POA (poa_name,
                             this->poa_manager_.in (),
-                            policies,
-                            ACE_TRY_ENV);
+                            policies
+                            TAO_ENV_ARG_PARAMETER);
   // Warning!  If create_POA fails, then the policies won't be
   // destroyed and there will be hell to pay in memory leaks!
   ACE_CHECK_RETURN (-1);
@@ -153,7 +153,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
+      policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   return 0;
@@ -162,9 +162,9 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 // Activate POA manager.
 
 int
-TAO_ORB_Manager::activate_poa_manager (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
+  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
@@ -172,51 +172,51 @@ TAO_ORB_Manager::activate_poa_manager (CORBA_Environment &ACE_TRY_ENV)
 // Activate servant in the POA.
 
 char *
-TAO_ORB_Manager::activate (PortableServer::Servant servant,
-                           CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::activate (PortableServer::Servant servant
+                           TAO_ENV_ARG_DECL)
 {
   PortableServer::ObjectId_var id =
-    this->poa_->activate_object (servant,
-                                 ACE_TRY_ENV);
+    this->poa_->activate_object (servant
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
-    this->poa_->id_to_reference (id.in (),
-                                 ACE_TRY_ENV);
+    this->poa_->id_to_reference (id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return str._retn ();
 }
 
 void
-TAO_ORB_Manager::deactivate (const char *id,
-                             CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::deactivate (const char *id
+                             TAO_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
-    this->orb_->string_to_object (id,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (id
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var object_id =
-    this->poa_->reference_to_id (object.in (),
-                                 ACE_TRY_ENV);
+    this->poa_->reference_to_id (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->poa_->deactivate_object (object_id.in (),
-                                 ACE_TRY_ENV);
+  this->poa_->deactivate_object (object_id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 // Activate the object with the object_name under the child POA.
 
 char *
 TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
-                                           PortableServer::Servant servant,
-                                           CORBA_Environment& ACE_TRY_ENV)
+                                           PortableServer::Servant servant
+                                           TAO_ENV_ARG_DECL)
 {
   if (object_name == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -228,18 +228,18 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
     PortableServer::string_to_ObjectId (object_name);
 
   this->child_poa_->activate_object_with_id (id.in (),
-                                             servant,
-                                             ACE_TRY_ENV);
+                                             servant
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
-    this->child_poa_->id_to_reference (id.in (),
-                                       ACE_TRY_ENV);
+    this->child_poa_->id_to_reference (id.in ()
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   char * str =
-    this->orb_->object_to_string (obj.in (),
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -247,60 +247,47 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
 }
 
 void
-TAO_ORB_Manager::deactivate_under_child_poa (const char *id,
-                                             CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::deactivate_under_child_poa (const char *id
+                                             TAO_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
-    this->orb_->string_to_object (id,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (id
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var object_id =
-    this->child_poa_->reference_to_id (object.in (),
-                                       ACE_TRY_ENV);
+    this->child_poa_->reference_to_id (object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->child_poa_->deactivate_object (object_id.in (),
-                                       ACE_TRY_ENV);
+  this->child_poa_->deactivate_object (object_id.in ()
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 // Enter the ORB event loop.
 
 int
-TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV,
-                      ACE_Time_Value *tv)
-{
-  this->poa_manager_->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->orb_->run (tv, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-TAO_ORB_Manager::run (ACE_Time_Value &tv,
-                      CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::run (ACE_Time_Value &tv
+                      TAO_ENV_ARG_DECL)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
+  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run (tv, ACE_TRY_ENV);
+  this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-TAO_ORB_Manager::fini (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::fini (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_->destroy (1, 1, ACE_TRY_ENV);
+  this->poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->poa_ = 0;
 
-  this->orb_->destroy (ACE_TRY_ENV);
+  this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->orb_ = 0;
@@ -308,12 +295,12 @@ TAO_ORB_Manager::fini (CORBA_Environment &ACE_TRY_ENV)
 }
 
 int
-TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV)
+TAO_ORB_Manager::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
+  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run (ACE_TRY_ENV);
+  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -356,8 +343,8 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void)
       if (!CORBA::is_nil (this->poa_.in ()))
         {
           this->poa_->destroy (1,
-                               1,
-                               ACE_TRY_ENV);
+                               1
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tao/PortableServer/ORB_Manager.h b/TAO/tao/PortableServer/ORB_Manager.h
index 9a15ea1c45f..7420662f37e 100644
--- a/TAO/tao/PortableServer/ORB_Manager.h
+++ b/TAO/tao/PortableServer/ORB_Manager.h
@@ -38,13 +38,13 @@ class TAO_PortableServer_Export TAO_ORB_Manager
 public:
   // = Initialization and termination methods.
   /** Constructor.
-   *  
+   *
    *  @param orb  pointer to an ORB which is duplicated an stored
    *              internally in an ORB_var.  If pointer is 0,
    *              a new ORB pointer is created internally in the init()
    *              call.
    *
-   *  @param poa  pointer to a POA which is duplicated and stored 
+   *  @param poa  pointer to a POA which is duplicated and stored
    *              internally in a POA_var.  If pointer is 0,
    *              a pointer to the Root POA is obtained from the ORB.
    *
@@ -63,18 +63,18 @@ public:
    *  @return -1 on failure, 0 on success
    */
   int init (int &argc,
-            char *argv[],
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+            char *argv[]
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Initialize the ORB/root POA, using the supplied command line
-    * arguments or the default ORB components.  
+    * arguments or the default ORB components.
     *
     * @return -1 on failure, 0 on success
     */
   int init (int &argc,
             char *argv[],
-            const char *orb_name,
-            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+            const char *orb_name
+            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Creates a child poa under the root poa with PERSISTENT and
@@ -85,9 +85,8 @@ public:
    */
   int init_child_poa (int &argc,
                       char *argv[],
-                      const char *poa_name,
-                      CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                      const char *poa_name
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Creates a child poa under the root poa with PERSISTENT and
@@ -97,15 +96,14 @@ public:
   int init_child_poa (int &argc,
                       char *argv[],
                       const char *poa_name,
-                      const char *orb_name,
-                      CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ());
+                      const char *orb_name
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Shut down.  Invoke the destroy() methods on the orb and poa.
    *
    * @return -1 on failure, 0 on success
    */
-  int fini (CORBA_Environment &ACE_TRY_ENV);
+  int fini (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Destructor.
   ~TAO_ORB_Manager (void);
@@ -117,33 +115,30 @@ public:
    *  requests are processed.  This method is useful for clients,
    *  which are not going to enter "orb->run" loop, yet may want to
    *  service incoming requests while waiting for a result of CORBA
-   *  call on a server.  
+   *  call on a server.
    *
    *  @return -1 on failure, 0 on success
    */
-  int activate_poa_manager (CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ());
+  int activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Activate <servant>, using the POA <activate_object> call.  Users
    * can call this method multiple times to activate multiple objects.
-   * 
+   *
    * @return 0 on failure, a string representation of the object ID if
    *         successful.  Caller of this method is responsible for
    *         memory deallocation of the string.
    */
-  char *activate (PortableServer::Servant servant,
-                  CORBA_Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
+  char *activate (PortableServer::Servant servant
+                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Deactivate object in RootPOA.
    *
    *  @param id  a string representation of the Object ID
-   *             of the servant to deactivate in the POA 
+   *             of the servant to deactivate in the POA
    */
-  void deactivate (const char *id,
-                   CORBA_Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+  void deactivate (const char *id
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Precondition: init_child_poa has been called.  Activate <servant>
@@ -160,29 +155,25 @@ public:
    *           memory deallocation of the string.
    */
   char *activate_under_child_poa (const char *object_name,
-                                  PortableServer::Servant servant,
-                                  CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ());
+                                  PortableServer::Servant servant
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Deactivate object in child POA.
    *
    *  @param id  string representation of the object ID, which represents
    *             the object to deactivate in the POA
    */
-  void deactivate_under_child_poa (const char *id,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ());
+  void deactivate_under_child_poa (const char *id
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Run the ORB event loop with the specified <tv> time value.
-   * 
+   *
    * @param tv  the time interval for how long to run the ORB event loop.
    * @return -1 on failure, 0 on success
    */
-  int run (CORBA_Environment &ACE_TRY_ENV,
-           ACE_Time_Value *tv);
-  int run (ACE_Time_Value &tv,
-           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
-  int run (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int run (ACE_Time_Value &tv
+           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Accessor which returns the ORB pointer.  Following the normal
@@ -200,7 +191,7 @@ public:
    * memory management rules of return values from functions, this
    * function duplicates the poa return value before returning it.
    *
-   * @return poa  Root POA pointer which has been duplicated.  Caller 
+   * @return poa  Root POA pointer which has been duplicated.  Caller
    *              must release pointer when done.
    */
   PortableServer::POA_ptr root_poa (void);
@@ -222,7 +213,7 @@ public:
    * returning it.
    *
    * @return POAManager pointer which has been duplicated.  Caller
-   *         must release pointer when done.  
+   *         must release pointer when done.
    */
   PortableServer::POAManager_ptr poa_manager (void);
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 8caa5ce59b2..42fcf3e26a0 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -206,8 +206,8 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 }
 
 void
-TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies
+                                           TAO_ENV_ARG_DECL)
 {
   // Initialize the default policies.
 
@@ -215,42 +215,42 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies,
 
   // Thread policy.
   TAO_Thread_Policy thread_policy (PortableServer::ORB_CTRL_MODEL);
-  policies.merge_policy (&thread_policy, ACE_TRY_ENV);
+  policies.merge_policy (&thread_policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Lifespan policy.
   TAO_Lifespan_Policy lifespan_policy (PortableServer::TRANSIENT);
-  policies.merge_policy (&lifespan_policy, ACE_TRY_ENV);
+  policies.merge_policy (&lifespan_policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ID uniqueness policy.
   TAO_Id_Uniqueness_Policy id_uniqueness_policy (PortableServer::UNIQUE_ID);
-  policies.merge_policy (&id_uniqueness_policy, ACE_TRY_ENV);
+  policies.merge_policy (&id_uniqueness_policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ID assignment policy.
   TAO_Id_Assignment_Policy id_assignment_policy (PortableServer::SYSTEM_ID);
-  policies.merge_policy (&id_assignment_policy, ACE_TRY_ENV);
+  policies.merge_policy (&id_assignment_policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   // Implicit activation policy.
   TAO_Implicit_Activation_Policy implicit_activation_policy
                            (PortableServer::NO_IMPLICIT_ACTIVATION);
-  policies.merge_policy (&implicit_activation_policy, ACE_TRY_ENV);
+  policies.merge_policy (&implicit_activation_policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Servant retention policy.
   TAO_Servant_Retention_Policy servant_retention_policy (PortableServer::RETAIN);
-  policies.merge_policy (&servant_retention_policy, ACE_TRY_ENV);
+  policies.merge_policy (&servant_retention_policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Request processing policy.
   TAO_Request_Processing_Policy request_processing_policy
                             (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
-  policies.merge_policy (&request_processing_policy, ACE_TRY_ENV);
+  policies.merge_policy (&request_processing_policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 }
@@ -294,8 +294,8 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 int
 TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
                                       TAO_ServerRequest &req,
-                                      CORBA::Object_out forward_to,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Object_out forward_to
+                                      TAO_ENV_ARG_DECL)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
 
@@ -309,8 +309,8 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
   int result =
     servant_upcall.prepare_for_upcall (key,
                                        operation,
-                                       forward_to,
-                                       ACE_TRY_ENV);
+                                       forward_to
+                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (result);
 
   if (result != TAO_Adapter::DS_OK)
@@ -321,8 +321,8 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
     ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
 
     this->servant_dispatcher_->dispatch (servant_upcall,
-                                         req,
-                                         ACE_TRY_ENV);
+                                         req
+                                         TAO_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (result);
   }
 
@@ -332,8 +332,8 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
 void
 TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
                                 PortableServer::ObjectId &system_id,
-                                TAO_POA *&poa,
-                                CORBA_Environment &ACE_TRY_ENV)
+                                TAO_POA *&poa
+                                TAO_ENV_ARG_DECL)
 {
   TAO_Object_Adapter::poa_name poa_system_name;
   CORBA::Boolean is_root = 0;
@@ -365,8 +365,8 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
                              is_persistent,
                              is_root,
                              poa_creation_time,
-                             poa,
-                             ACE_TRY_ENV);
+                             poa
+                             TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -376,8 +376,8 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
 
 int
 TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
-                                  TAO_POA *&poa,
-                                  CORBA_Environment &ACE_TRY_ENV)
+                                  TAO_POA *&poa
+                                  TAO_ENV_ARG_DECL)
 {
   int result = -1;
 
@@ -413,8 +413,8 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
       ACE_TRY
         {
           current = parent->find_POA_i (*iterator,
-                                        1,
-                                        ACE_TRY_ENV);
+                                        1
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (PortableServer::POA::AdapterNonExistent, ex)
@@ -432,7 +432,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 #else
   ACE_UNUSED_ARG (folded_name);
   ACE_UNUSED_ARG (poa);
-  ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   return result;
@@ -442,8 +442,8 @@ int
 TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
                                         CORBA::Boolean root,
                                         const TAO_Temporary_Creation_Time &poa_creation_time,
-                                        TAO_POA *&poa,
-                                        CORBA::Environment &)
+                                        TAO_POA *&poa
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   int result = 0;
 
@@ -491,23 +491,23 @@ TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
 }
 
 int
-TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
+                                      TAO_ENV_ARG_DECL)
 {
   PortableServer::ObjectId id;
   TAO_POA *poa = 0;
 
   this->locate_poa (key,
                     id,
-                    poa,
-                    ACE_TRY_ENV);
+                    poa
+                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::Servant servant = 0;
   TAO_SERVANT_LOCATION servant_location =
     poa->locate_servant_i (id,
-                           servant,
-                           ACE_TRY_ENV);
+                           servant
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   switch (servant_location)
@@ -527,32 +527,32 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key,
 
 TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
-                                    PortableServer::Servant &servant,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    PortableServer::Servant &servant
+                                    TAO_ENV_ARG_DECL)
 {
   PortableServer::ObjectId id;
   TAO_POA *poa = 0;
 
   this->locate_poa (key,
                     id,
-                    poa,
-                    ACE_TRY_ENV);
+                    poa
+                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
 
   TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id,
-                                                                 servant,
-                                                                 ACE_TRY_ENV);
+                                                                 servant
+                                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
 
   return servant_location;
 }
 
 void
-TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Add in the default POA policies to the default list.
-  this->init_default_policies (this->default_poa_policies (),
-                               ACE_TRY_ENV);
+  this->init_default_policies (this->default_poa_policies ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If a POA extension hasn't changed the servant dispatcher, initialize the
@@ -573,11 +573,11 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
 
   // This makes sure that the default resources are open when the Root
   // POA is created.
-  this->orb_core_.thread_lane_resources_manager ().open_default_resources (ACE_TRY_ENV);
+  this->orb_core_.thread_lane_resources_manager ().open_default_resources (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Set the default Server Protocol Policy.
-  this->set_default_server_protocol_policy (ACE_TRY_ENV);
+  this->set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_POA_Policy_Set policies (this->default_poa_policies ());
@@ -591,13 +591,13 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
   TAO_Implicit_Activation_Policy
     implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
-  policies.merge_policy (&implicit_activation_policy,
-                         ACE_TRY_ENV);
+  policies.merge_policy (&implicit_activation_policy
+                         TAO_ENV_ARG_PARAMETER);
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Merge policies from the ORB level.
-  this->validator ().merge_policies (policies.policies (),
-                                     ACE_TRY_ENV);
+  this->validator ().merge_policies (policies.policies ()
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Construct a new POA
@@ -610,8 +610,8 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
                                            this->lock (),
                                            this->thread_lock (),
                                            this->orb_core_,
-                                           this,
-                                           ACE_TRY_ENV);
+                                           this
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The Object_Adapter will keep a reference to the Root POA so that
@@ -626,7 +626,7 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Object_Adapter::set_default_server_protocol_policy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Thread_Lane_Resources &default_lane_resources =
     this->orb_core_.thread_lane_resources_manager ().default_lane_resources ();
@@ -635,19 +635,19 @@ TAO_Object_Adapter::set_default_server_protocol_policy (CORBA::Environment &ACE_
     default_lane_resources.acceptor_registry ();
 
   TAO_Protocols_Hooks *protocols_hooks =
-    this->orb_core_.get_protocols_hooks (ACE_TRY_ENV);
+    this->orb_core_.get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  protocols_hooks->set_default_server_protocol_policy (acceptor_registry,
-                                                       ACE_TRY_ENV);
+  protocols_hooks->set_default_server_protocol_policy (acceptor_registry
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Object_Adapter::close (int wait_for_completion,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::close (int wait_for_completion
+                           TAO_ENV_ARG_DECL)
 {
-  this->check_close (wait_for_completion, ACE_TRY_ENV);
+  this->check_close (wait_for_completion TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Shutting down the ORB causes all object adapters to be destroyed,
@@ -669,19 +669,19 @@ TAO_Object_Adapter::close (int wait_for_completion,
   }
   CORBA::Boolean etherealize_objects = 1;
   root->destroy (etherealize_objects,
-                 wait_for_completion,
-                 ACE_TRY_ENV);
+                 wait_for_completion
+                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::release (root);
 }
 
 void
-TAO_Object_Adapter::check_close (int wait_for_completion,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::check_close (int wait_for_completion
+                                 TAO_ENV_ARG_DECL)
 {
   TAO_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                 wait_for_completion,
-                                                 ACE_TRY_ENV);
+                                                 wait_for_completion
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -694,8 +694,8 @@ TAO_Object_Adapter::priority (void) const
 int
 TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
                               TAO_ServerRequest &request,
-                              CORBA::Object_out forward_to,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Object_out forward_to
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::memcmp (key.get_buffer (),
@@ -719,7 +719,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       // The receive_request_service_contexts() interception point
       // must be invoked before the operation is dispatched to the
       // servant.
-      sri_adapter.receive_request_service_contexts (&ri, ACE_TRY_ENV);
+      sri_adapter.receive_request_service_contexts (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If a PortableInterceptor::ForwardRequest exception was
@@ -727,7 +727,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       // with the appropriate return status.
       if (sri_adapter.location_forwarded ())
         {
-          forward_to = ri.forward_reference (ACE_TRY_ENV);
+          forward_to = ri.forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           return TAO_Adapter::DS_FORWARD;
@@ -736,8 +736,8 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
 
       result = this->dispatch_servant (key,
                                        request,
-                                       forward_to,
-                                       ACE_TRY_ENV);
+                                       forward_to
+                                       TAO_ENV_ARG_PARAMETER);
 
 #if TAO_HAS_INTERCEPTORS == 1
       ACE_TRY_CHECK;
@@ -745,8 +745,8 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       if (result == TAO_Adapter::DS_FORWARD)
         {
           ri.forward_reference (forward_to.ptr ());
-          sri_adapter.send_other (&ri,
-                                  ACE_TRY_ENV);
+          sri_adapter.send_other (&ri
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -754,12 +754,12 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
     {
       ri.exception (&ACE_ANY_EXCEPTION);
 
-      sri_adapter.send_exception (&ri,
-                                  ACE_TRY_ENV);
+      sri_adapter.send_exception (&ri
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only re-throw the exception if it hasn't been transformed by
@@ -804,15 +804,15 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
                           TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
         continue;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           TAO_ServantBase *servant = 0;
 
           TAO_SERVANT_LOCATION servant_location =
             this->find_servant (objkey.in (),
-                                servant,
-                                ACE_TRY_ENV);
+                                servant
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (servant_location != TAO_SERVANT_NOT_FOUND)
@@ -899,8 +899,8 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
 
 int
 TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
-                                                               TAO_POA *&poa,
-                                                               CORBA_Environment &ACE_TRY_ENV)
+                                                               TAO_POA *&poa
+                                                               TAO_ENV_ARG_DECL)
 {
   poa_name folded_name;
   int result = this->persistent_poa_system_map_.recover_key (system_name,
@@ -918,8 +918,8 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &s
           if (result != 0)
             {
               result = this->object_adapter_->activate_poa (folded_name,
-                                                            poa,
-                                                            ACE_TRY_ENV);
+                                                            poa
+                                                            TAO_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (-1);
             }
         }
@@ -973,8 +973,8 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
 
 int
 TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
-                                                           TAO_POA *&poa,
-                                                           CORBA_Environment &ACE_TRY_ENV)
+                                                           TAO_POA *&poa
+                                                           TAO_ENV_ARG_DECL)
 {
   int result = this->object_adapter_->persistent_poa_name_map_->find (system_name,
                                                                       poa);
@@ -982,8 +982,8 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &syste
     {
       result =
         this->object_adapter_->activate_poa (system_name,
-                                             poa,
-                                             ACE_TRY_ENV);
+                                             poa
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -1132,7 +1132,7 @@ TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
     {
       ACE_TRY_NEW_ENV
         {
-          this->poa_.complete_destruction_i (ACE_TRY_ENV);
+          this->poa_.complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1173,8 +1173,8 @@ TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
 int
 TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key,
                                                         const char *operation,
-                                                        CORBA::Object_out forward_to,
-                                                        CORBA::Environment &ACE_TRY_ENV)
+                                                        CORBA::Object_out forward_to
+                                                        TAO_ENV_ARG_DECL)
 {
   // Acquire the object adapter lock first.
   int result = this->object_adapter_->lock ().acquire ();
@@ -1190,18 +1190,18 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
+  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // Locate the POA.
   this->object_adapter_->locate_poa (key,
                                      this->system_id_,
-                                     this->poa_,
-                                     ACE_TRY_ENV);
+                                     this->poa_
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // Check the state of the POA Manager.
-  this->poa_->check_poa_manager_state (ACE_TRY_ENV);
+  this->poa_->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // Setup current for this request.
@@ -1223,8 +1223,8 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
       this->servant_ = this->poa_->locate_servant_i (operation,
                                                      this->system_id_,
                                                      *this,
-                                                     this->current_context_,
-                                                     ACE_TRY_ENV);
+                                                     this->current_context_
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -1259,7 +1259,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   this->state_ = OBJECT_ADAPTER_LOCK_RELEASED;
 
   // Serialize servants (if appropriate).
-  this->single_threaded_poa_setup (ACE_TRY_ENV);
+  this->single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // We have acquired the servant lock.  Record this for later use.
@@ -1270,8 +1270,8 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
 }
 
 TAO_POA *
-TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key,
-                                                CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key
+                                                TAO_ENV_ARG_DECL)
 {
   // Acquire the object adapter lock first.
   int result = this->object_adapter_->lock ().acquire ();
@@ -1287,14 +1287,14 @@ TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key,
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
+  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Locate the POA.
   this->object_adapter_->locate_poa (key,
                                      this->system_id_,
-                                     this->poa_,
-                                     ACE_TRY_ENV);
+                                     this->poa_
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->poa_;
@@ -1361,6 +1361,10 @@ TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall ()
 void
 TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV)
 {
+#if defined (ACE_HAS_EXCEPTIONS)
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+#endif
+
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
@@ -1402,7 +1406,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
 
   if (this->using_servant_locator_)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           this->poa_->servant_locator_->postinvoke (this->current_context_.object_id (),
@@ -1424,7 +1428,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
 }
 
 void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL)
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
   // Serialize servants (if necessary).
@@ -1444,7 +1448,7 @@ TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (CORBA::Environmen
         ACE_THROW (CORBA::OBJ_ADAPTER ());
     }
 #else
-  ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
+  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* !TAO_HAS_MINIMUM_POA == 0 */
 }
 
@@ -1469,11 +1473,11 @@ TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
 
       if (new_count == 0)
         {
-          ACE_DECLARE_NEW_CORBA_ENV;
+          TAO_ENV_DECLARE_NEW_ENV;
           ACE_TRY
             {
-              this->poa_->cleanup_servant (this->active_object_map_entry_,
-                                           ACE_TRY_ENV);
+              this->poa_->cleanup_servant (this->active_object_map_entry_
+                                           TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
             }
@@ -1522,7 +1526,7 @@ TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void)
         {
           ACE_TRY_NEW_ENV
             {
-              this->poa_->complete_destruction_i (ACE_TRY_ENV);
+              this->poa_->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -1588,7 +1592,7 @@ TAO_POA_Current_Impl::teardown (void)
 }
 
 PortableServer::POA_ptr
-TAO_POA_Current_Impl::get_POA (CORBA::Environment &)
+TAO_POA_Current_Impl::get_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1596,7 +1600,7 @@ TAO_POA_Current_Impl::get_POA (CORBA::Environment &)
 }
 
 PortableServer::ObjectId *
-TAO_POA_Current_Impl::get_object_id (CORBA::Environment &)
+TAO_POA_Current_Impl::get_object_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1616,7 +1620,7 @@ TAO_POA_Current_Impl::orb_core (void) const
 }
 
 PortableServer::POA_ptr
-TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Current::get_POA (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1625,11 +1629,11 @@ TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
   if (impl == 0)
     ACE_THROW_RETURN (PortableServer::Current::NoContext (),
                       0);
-  return impl->get_POA (ACE_TRY_ENV);
+  return impl->get_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::ObjectId *
-TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Current::get_object_id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1638,7 +1642,7 @@ TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
   if (impl == 0)
     ACE_THROW_RETURN (PortableServer::Current::NoContext (),
                       0);
-  return impl->get_object_id (ACE_TRY_ENV);
+  return impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 TAO_POA_Current_Impl *
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 32301fdbdf5..78d16dfebf8 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -73,14 +73,14 @@ public:
   TAO_POA_Current (void);
   // Constructor
 
-  PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Returns the POA on which the current request is being invoked.
   // Can raise the <CORBA::NoContext> exception if this function is
   // not invoked in the context of an upcall.
 
-  PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Returns the object id of the current request being invoked.  Can
@@ -119,13 +119,13 @@ public:
 
   friend class TAO_POA;
 
-  PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Return pointer to the invoking POA.  Raises the
   // <CORBA::NoContext> exception.
 
-  PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Return pointer to the object id through which this was invoked.
@@ -233,22 +233,22 @@ public:
 
   int dispatch_servant (const TAO_ObjectKey &key,
                         TAO_ServerRequest &req,
-                        CORBA::Object_out forward_to,
-                        CORBA_Environment &ACE_TRY_ENV);
+                        CORBA::Object_out forward_to
+                        TAO_ENV_ARG_DECL);
 
-  int locate_servant (const TAO_ObjectKey &key,
-                      CORBA_Environment &ACE_TRY_ENV);
+  int locate_servant (const TAO_ObjectKey &key
+                      TAO_ENV_ARG_DECL);
 
   TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key,
-                                     PortableServer::Servant &servant,
-                                     CORBA_Environment &ACE_TRY_ENV);
+                                     PortableServer::Servant &servant
+                                     TAO_ENV_ARG_DECL);
 
   int find_poa (const poa_name &system_name,
                 CORBA::Boolean activate_it,
                 CORBA::Boolean root,
                 const TAO_Temporary_Creation_Time &poa_creation_time,
-                TAO_POA *&poa,
-                CORBA_Environment &ACE_TRY_ENV);
+                TAO_POA *&poa
+                TAO_ENV_ARG_DECL);
 
   int bind_poa (const poa_name &folded_name,
                 TAO_POA *poa,
@@ -259,8 +259,8 @@ public:
                   const poa_name &system_name);
 
   int activate_poa (const poa_name &folded_name,
-                    TAO_POA *&poa,
-                    CORBA_Environment &ACE_TRY_ENV);
+                    TAO_POA *&poa
+                    TAO_ENV_ARG_DECL);
 
   ACE_Lock &lock (void);
 
@@ -294,21 +294,21 @@ public:
   void servant_dispatcher (TAO_Servant_Dispatcher *dispatcher);
 
   /// Initialize the default set of POA policies.
-  void init_default_policies (TAO_POA_Policy_Set &policies,
-                              CORBA::Environment &ACE_TRY_ENV);
+  void init_default_policies (TAO_POA_Policy_Set &policies
+                              TAO_ENV_ARG_DECL);
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (CORBA::Environment &ACE_TRY_ENV);
-  virtual void close (int wait_for_completion,
-                      CORBA::Environment &ACE_TRY_ENV);
-  virtual void check_close (int wait_for_completion,
-                            CORBA::Environment &ACE_TRY_ENV);
+  virtual void open (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void close (int wait_for_completion
+                      TAO_ENV_ARG_DECL);
+  virtual void check_close (int wait_for_completion
+                            TAO_ENV_ARG_DECL);
   virtual int priority (void) const;
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
-                        CORBA::Object_out foward_to,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Object_out foward_to
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual const char *name (void) const;
   virtual CORBA::Object_ptr root (void);
@@ -317,32 +317,32 @@ public:
 
 protected:
 
-  int locate_servant_i (const TAO_ObjectKey &key,
-                        CORBA_Environment &ACE_TRY_ENV);
+  int locate_servant_i (const TAO_ObjectKey &key
+                        TAO_ENV_ARG_DECL);
 
   TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key,
-                                       PortableServer::Servant &servant,
-                                       CORBA_Environment &ACE_TRY_ENV);
+                                       PortableServer::Servant &servant
+                                       TAO_ENV_ARG_DECL);
 
   void dispatch_servant_i (const TAO_ObjectKey &key,
                            TAO_ServerRequest &req,
-                           void *context,
-                           CORBA_Environment &ACE_TRY_ENV);
+                           void *context
+                           TAO_ENV_ARG_DECL);
 
   void locate_poa (const TAO_ObjectKey &key,
                    PortableServer::ObjectId &id,
-                   TAO_POA *&poa,
-                   CORBA_Environment &ACE_TRY_ENV);
+                   TAO_POA *&poa
+                   TAO_ENV_ARG_DECL);
 
   int find_transient_poa (const poa_name &system_name,
                           CORBA::Boolean root,
                           const TAO_Temporary_Creation_Time &poa_creation_time,
-                          TAO_POA *&poa,
-                          CORBA_Environment &ACE_TRY_ENV);
+                          TAO_POA *&poa
+                          TAO_ENV_ARG_DECL);
 
   int find_persistent_poa (const poa_name &system_name,
-                           TAO_POA *&poa,
-                           CORBA_Environment &ACE_TRY_ENV);
+                           TAO_POA *&poa
+                           TAO_ENV_ARG_DECL);
 
   int bind_transient_poa (TAO_POA *poa,
                           poa_name_out system_name);
@@ -356,7 +356,7 @@ protected:
   int unbind_persistent_poa (const poa_name &folded_name,
                              const poa_name &system_name);
 
-  void set_default_server_protocol_policy (CORBA::Environment &ACE_TRY_ENV);
+  void set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL);
 
   static ACE_Lock *create_lock (int enable_locking,
                                 TAO_SYNCH_MUTEX &thread_lock);
@@ -376,8 +376,8 @@ public:
     virtual ~Hint_Strategy (void);
 
     virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV) = 0;
+                                     TAO_POA *&poa
+                                     TAO_ENV_ARG_DECL) = 0;
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_POA *poa,
@@ -409,8 +409,8 @@ public:
     virtual ~Active_Hint_Strategy (void);
 
     virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV);
+                                     TAO_POA *&poa
+                                     TAO_ENV_ARG_DECL);
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_POA *poa,
@@ -443,8 +443,8 @@ public:
     virtual ~No_Hint_Strategy (void);
 
     virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV);
+                                     TAO_POA *&poa
+                                     TAO_ENV_ARG_DECL);
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_POA *poa,
@@ -633,12 +633,12 @@ public:
 
     int prepare_for_upcall (const TAO_ObjectKey &key,
                             const char *operation,
-                            CORBA::Object_out forward_to,
-                            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                            CORBA::Object_out forward_to
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
     // Locate POA and servant.
 
-    TAO_POA *lookup_POA (const TAO_ObjectKey &key,
-                         CORBA::Environment &ACE_TRY_ENV);
+    TAO_POA *lookup_POA (const TAO_ObjectKey &key
+                         TAO_ENV_ARG_DECL);
     // Locate POA.
 
     TAO_POA &poa (void) const;
@@ -689,7 +689,7 @@ public:
   protected:
 
     void servant_locator_cleanup (void);
-    void single_threaded_poa_setup (CORBA::Environment &ACE_TRY_ENV);
+    void single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL);
     void single_threaded_poa_cleanup (void);
     void servant_cleanup (void);
     void poa_cleanup (void);
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index 5c9803645a0..677799cc3ae 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -44,37 +44,37 @@ TAO_Object_Adapter::transient_poa_name_size ()
 }
 
 ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key
+                                    TAO_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (-1);
 
-  return this->locate_servant_i (key,
-                                 ACE_TRY_ENV);
+  return this->locate_servant_i (key
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
-                                  PortableServer::Servant &servant,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  PortableServer::Servant &servant
+                                  TAO_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND);
 
   return this->find_servant_i (key,
-                               servant,
-                               ACE_TRY_ENV);
+                               servant
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE int
 TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_POA *&poa,
-                                         CORBA_Environment &ACE_TRY_ENV)
+                                         TAO_POA *&poa
+                                         TAO_ENV_ARG_DECL)
 {
   return this->hint_strategy_->find_persistent_poa (system_name,
-                                                    poa,
-                                                    ACE_TRY_ENV);
+                                                    poa
+                                                    TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE int
@@ -82,22 +82,22 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
                               CORBA::Boolean activate_it,
                               CORBA::Boolean root,
                               const TAO_Temporary_Creation_Time &poa_creation_time,
-                              TAO_POA *&poa,
-                              CORBA_Environment &ACE_TRY_ENV)
+                              TAO_POA *&poa
+                              TAO_ENV_ARG_DECL)
 {
   if (activate_it)
     {
       return this->find_persistent_poa (system_name,
-                                        poa,
-                                        ACE_TRY_ENV);
+                                        poa
+                                        TAO_ENV_ARG_PARAMETER);
     }
   else
     {
       return this->find_transient_poa (system_name,
                                        root,
                                        poa_creation_time,
-                                       poa,
-                                       ACE_TRY_ENV);
+                                       poa
+                                       TAO_ENV_ARG_PARAMETER);
     }
 }
 
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index b61de021503..787e3f0efcc 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -377,7 +377,7 @@ template class TAO_Singleton<TAO_Operation_Table_Parameters, TAO_SYNCH_RECURSIVE
 // This is necessary with g++ 2.91.66 to avoid a couple of strange
 // unresolved ACE_Hash_Map_Entry symbols.  (Strange because c++filt
 // can't demangle them.)
-template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void *, CORBA_Environment &)>;
+template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void * TAO_ENV_ARG_DECL_NOT_USED)>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index bf52f53fba1..9d72d083305 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -51,8 +51,8 @@ TAO_POA::_tao_poa_downcast(void)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ThreadPolicy_ptr
-TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Thread_Policy *thread_policy = 0;
@@ -67,8 +67,8 @@ TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::LifespanPolicy_ptr
-TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Lifespan_Policy *lifespan_policy = 0;
@@ -81,8 +81,8 @@ TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
 }
 
 PortableServer::IdUniquenessPolicy_ptr
-TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0;
@@ -95,8 +95,8 @@ TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va
 }
 
 PortableServer::IdAssignmentPolicy_ptr
-TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Id_Assignment_Policy *id_assignment_policy = 0;
@@ -111,8 +111,8 @@ TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ImplicitActivationPolicy_ptr
-TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
+                                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Implicit_Activation_Policy *implicit_activation_policy = 0;
@@ -125,8 +125,8 @@ TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo
 }
 
 PortableServer::ServantRetentionPolicy_ptr
-TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
+                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Servant_Retention_Policy *servant_retention_policy = 0;
@@ -139,8 +139,8 @@ TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy
 }
 
 PortableServer::RequestProcessingPolicy_ptr
-TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Request_Processing_Policy *request_processing_policy = 0;
@@ -161,8 +161,8 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
                   ACE_Lock &lock,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  TAO_Object_Adapter *object_adapter
+                  TAO_ENV_ARG_DECL)
   : name_ (name),
     poa_manager_ (poa_manager),
     policies_ (policies),
@@ -205,8 +205,8 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
 {
   // Parse the policies that are used in the critical path in
   // a cache.
-  this->cached_policies_.update (this->policies_,
-                                 ACE_TRY_ENV);
+  this->cached_policies_.update (this->policies_
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if (TAO_HAS_MINIMUM_POA == 1)
@@ -235,8 +235,8 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
                     TAO_Active_Object_Map (!this->system_id (),
                                            this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID,
                                            this->persistent (),
-                                           this->orb_core_.server_factory ()->active_object_map_creation_parameters (),
-                                           ACE_TRY_ENV),
+                                           this->orb_core_.server_factory ()->active_object_map_creation_parameters ()
+                                           TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
 
   // Give ownership of the new map to the auto pointer.  Note, that it
@@ -295,7 +295,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     {
       int temp = this->use_imr_;
       this->use_imr_ = 0;
-      this->imr_notify_startup (ACE_TRY_ENV);
+      this->imr_notify_startup (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       this->use_imr_ = temp;
     }
@@ -309,7 +309,7 @@ TAO_POA::~TAO_POA (void)
 }
 
 void
-TAO_POA::complete_destruction_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL)
 {
   // No longer awaiting destruction.
   this->waiting_destruction_ = 0;
@@ -370,8 +370,8 @@ TAO_POA::complete_destruction_i (CORBA::Environment &ACE_TRY_ENV)
 PortableServer::POA_ptr
 TAO_POA::create_POA_i (const char *adapter_name,
                        PortableServer::POAManager_ptr poa_manager,
-                       const CORBA::PolicyList &policies,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const CORBA::PolicyList &policies
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -381,13 +381,13 @@ TAO_POA::create_POA_i (const char *adapter_name,
   TAO_POA_Policy_Set tao_policies (this->object_adapter ().default_poa_policies ());
 
   // Merge policies from the ORB level.
-  this->object_adapter ().validator ().merge_policies (tao_policies.policies (),
-                                                       ACE_TRY_ENV);
+  this->object_adapter ().validator ().merge_policies (tao_policies.policies ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Merge in any policies that the user may have specified.
-  tao_policies.merge_policies (policies,
-                               ACE_TRY_ENV);
+  tao_policies.merge_policies (policies
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // If any of the policy objects specified are not valid for the ORB
@@ -397,8 +397,8 @@ TAO_POA::create_POA_i (const char *adapter_name,
   // InvalidPolicy exception is raised containing the index in the
   // policies parameter value of the first offending policy object.
   tao_policies.validate_policies (this->object_adapter ().validator (),
-                                  this->orb_core_,
-                                  ACE_TRY_ENV);
+                                  this->orb_core_
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // If the poa_manager parameter is null, a new POAManager object is
@@ -422,8 +422,8 @@ TAO_POA::create_POA_i (const char *adapter_name,
 
   TAO_POA *poa = this->create_POA_i (adapter_name,
                                      *tao_poa_manager,
-                                     tao_policies,
-                                     ACE_TRY_ENV);
+                                     tao_policies
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return PortableServer::POA::_duplicate (poa);
@@ -437,8 +437,8 @@ TAO_POA::new_POA (const String &name,
                   ACE_Lock &lock,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter,
-                  CORBA_Environment &ACE_TRY_ENV)
+                  TAO_Object_Adapter *object_adapter
+                  TAO_ENV_ARG_DECL)
 {
   TAO_POA *poa;
 
@@ -450,8 +450,8 @@ TAO_POA::new_POA (const String &name,
                              lock,
                              thread_lock,
                              orb_core,
-                             object_adapter,
-                             ACE_TRY_ENV),
+                             object_adapter
+                             TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -461,8 +461,8 @@ TAO_POA::new_POA (const String &name,
 TAO_POA *
 TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                        TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policy_Set &policies,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const TAO_POA_Policy_Set &policies
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -497,8 +497,8 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                                 this->object_adapter ().lock (),
                                 this->object_adapter ().thread_lock (),
                                 this->orb_core_,
-                                this->object_adapter_,
-                                ACE_TRY_ENV);
+                                this->object_adapter_
+                                TAO_ENV_ARG_PARAMETER);
 
   // Give ownership of the new map to the POA_var.  Note, that it
   // is important for the POA_var to take ownership before
@@ -539,8 +539,8 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
 
 PortableServer::POA_ptr
 TAO_POA::find_POA (const char *adapter_name,
-                   CORBA::Boolean activate_it,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   CORBA::Boolean activate_it
+                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
@@ -558,8 +558,8 @@ TAO_POA::find_POA (const char *adapter_name,
   ACE_UNUSED_ARG (non_servant_upcall);
 
   TAO_POA *poa = this->find_POA_i (adapter_name,
-                                   activate_it,
-                                   ACE_TRY_ENV);
+                                   activate_it
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return PortableServer::POA::_duplicate (poa);
@@ -567,8 +567,8 @@ TAO_POA::find_POA (const char *adapter_name,
 
 TAO_POA *
 TAO_POA::find_POA_i (const ACE_CString &child_name,
-                     CORBA::Boolean activate_it,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Boolean activate_it
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
@@ -585,13 +585,13 @@ TAO_POA::find_POA_i (const ACE_CString &child_name,
           if (!CORBA::is_nil (this->adapter_activator_.in ()))
             {
               // Check the state of the POA Manager.
-              this->check_poa_manager_state (ACE_TRY_ENV);
+              this->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK_RETURN (0);
 
               CORBA::Boolean success =
                 this->adapter_activator_->unknown_adapter (this,
-                                                           child_name.c_str (),
-                                                           ACE_TRY_ENV);
+                                                           child_name.c_str ()
+                                                           TAO_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (0);
 
               if (success)
@@ -632,8 +632,8 @@ TAO_POA::find_POA_i (const ACE_CString &child_name,
 
 void
 TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
-                    CORBA::Boolean wait_for_completion,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Boolean wait_for_completion
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->cleanup_in_progress_)
@@ -641,8 +641,8 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                 wait_for_completion,
-                                                 ACE_TRY_ENV);
+                                                 wait_for_completion
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->cleanup_in_progress_ = 1;
@@ -670,8 +670,8 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
     {
       TAO_POA *child_poa = (*iterator).int_id_;
       child_poa->destroy_i (etherealize_objects,
-                            wait_for_completion,
-                            ACE_TRY_ENV);
+                            wait_for_completion
+                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -689,15 +689,15 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
           TAO_POA *tao_poa = 0;
 
           PortableServer::POA_var poa =
-            this->server_object_->_default_POA (ACE_TRY_ENV);
+            this->server_object_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           tao_poa = poa->_tao_poa_downcast();
           PortableServer::ObjectId_var id =
-            tao_poa->servant_to_id_i (this->server_object_, ACE_TRY_ENV);
+            tao_poa->servant_to_id_i (this->server_object_ TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          tao_poa->deactivate_object_i (id.in (), ACE_TRY_ENV);
+          tao_poa->deactivate_object_i (id.in ()TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -717,8 +717,8 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
   // destroying the POAs.
 
   this->deactivate_all_objects_i (etherealize_objects,
-                                  wait_for_completion,
-                                  ACE_TRY_ENV);
+                                  wait_for_completion
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If there are no outstanding requests and that we are not in a
@@ -730,7 +730,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
       (non_servant_upcall_in_progress == 0 ||
        &non_servant_upcall_in_progress->poa () != this))
     {
-      this->complete_destruction_i (ACE_TRY_ENV);
+      this->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -758,7 +758,7 @@ TAO_POA::delete_child (const TAO_POA::String &child)
 }
 
 PortableServer::POAList *
-TAO_POA::the_children_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_children_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList_var children;
@@ -785,7 +785,7 @@ TAO_POA::the_children_i (CORBA::Environment &ACE_TRY_ENV)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -807,8 +807,8 @@ TAO_POA::get_servant_manager_i (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -823,8 +823,8 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
   // the POA.
   if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     {
-      this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr,
-                                                                            ACE_TRY_ENV);
+      this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr
+                                                                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (this->servant_activator_.in ()))
@@ -834,8 +834,8 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
     }
   else
     {
-      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr,
-                                                                        ACE_TRY_ENV);
+      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr
+                                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (this->servant_locator_.in ()))
@@ -846,7 +846,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
 }
 
 PortableServer::Servant
-TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
@@ -882,7 +882,7 @@ TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV)
       // conforming caller need not invoke _remove_ref on the returned
       // Servant if the type of the Servant uses the default reference
       // counting inherited from ServantBase.
-      result->_add_ref (ACE_TRY_ENV);
+      result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return result;
@@ -897,8 +897,8 @@ TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_POA::set_servant_i (PortableServer::Servant servant,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::set_servant_i (PortableServer::Servant servant
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -931,7 +931,7 @@ TAO_POA::set_servant_i (PortableServer::Servant servant,
       TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
       ACE_UNUSED_ARG (non_servant_upcall);
 
-      servant->_add_ref (ACE_TRY_ENV);
+      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -1018,8 +1018,8 @@ TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id,
 
 PortableServer::ObjectId *
 TAO_POA::activate_object_i (PortableServer::Servant servant,
-                            CORBA::Short priority,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Short priority
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -1073,7 +1073,7 @@ TAO_POA::activate_object_i (PortableServer::Servant servant,
   // least once on the Servant argument before returning. When the POA
   // no longer needs the Servant, it will invoke _remove_ref on it the
   // same number of times.
-  servant->_add_ref (ACE_TRY_ENV);
+  servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return user_id._retn ();
@@ -1082,8 +1082,8 @@ TAO_POA::activate_object_i (PortableServer::Servant servant,
 void
 TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                     PortableServer::Servant servant,
-                                    CORBA::Short priority,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Short priority
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -1171,29 +1171,29 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
   // _add_ref at least once on the Servant argument before
   // returning. When the POA no longer needs the Servant, it will
   // invoke _remove_ref on it the same number of times.
-  servant->_add_ref (ACE_TRY_ENV);
+  servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                   CORBA::Boolean wait_for_completion,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Boolean wait_for_completion
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->deactivate_all_objects_i (etherealize_objects,
-                                  ACE_TRY_ENV);
+  this->deactivate_all_objects_i (etherealize_objects
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->wait_for_completions (wait_for_completion,
-                              ACE_TRY_ENV);
+  this->wait_for_completions (wait_for_completion
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion
+                               TAO_ENV_ARG_DECL)
 {
   while (this->object_adapter ().enable_locking_ &&
          wait_for_completion &&
@@ -1212,8 +1212,8 @@ TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion,
 /* static */
 void
 TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
-                                               CORBA::Boolean wait_for_completion,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               CORBA::Boolean wait_for_completion
+                                               TAO_ENV_ARG_DECL)
 {
   if (wait_for_completion)
     {
@@ -1248,8 +1248,8 @@ TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
 }
 
 void
-TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1298,15 +1298,15 @@ TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
        i < counter;
        ++i)
     {
-      this->deactivate_map_entry (map_entries[i],
-                                  ACE_TRY_ENV);
+      this->deactivate_map_entry (map_entries[i]
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1329,22 +1329,22 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id,
       ACE_THROW (PortableServer::POA::ObjectNotActive ());
     }
 
-  this->deactivate_map_entry (active_object_map_entry,
-                              ACE_TRY_ENV);
+  this->deactivate_map_entry (active_object_map_entry
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
+                               TAO_ENV_ARG_DECL)
 {
   // Decrement the reference count.
   CORBA::UShort new_count = --active_object_map_entry->reference_count_;
 
   if (new_count == 0)
     {
-      this->cleanup_servant (active_object_map_entry,
-                             ACE_TRY_ENV);
+      this->cleanup_servant (active_object_map_entry
+                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -1365,8 +1365,8 @@ TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_m
 }
 
 void
-TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
+                          TAO_ENV_ARG_DECL)
 {
   // If a servant manager is associated with the POA,
   // ServantLocator::etherealize will be invoked with the oid and the
@@ -1440,7 +1440,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en
           TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          active_object_map_entry->servant_->_remove_ref (ACE_TRY_ENV);
+          active_object_map_entry->servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -1457,7 +1457,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en
 }
 
 void
-TAO_POA::check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager::State state = this->poa_manager_.get_state_i ();
 
@@ -1530,8 +1530,8 @@ TAO_POA::check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Object_ptr
 TAO_POA::create_reference_i (const char *intf,
-                             CORBA::Short priority,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Short priority
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1587,15 +1587,15 @@ TAO_POA::create_reference_i (const char *intf,
                               intf,
                               0,
                               1,
-                              priority,
-                              ACE_TRY_ENV);
+                              priority
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
 TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                      const char *intf,
-                                     CORBA::Short priority,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Short priority
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1665,13 +1665,13 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                               intf,
                               servant,
                               1,
-                              priority,
-                              ACE_TRY_ENV);
+                              priority
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ObjectId *
-TAO_POA::servant_to_id_i (PortableServer::Servant servant,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::servant_to_id_i (PortableServer::Servant servant
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1738,7 +1738,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
       // is invoked at least once on the Servant argument before
       // returning. Otherwise, the POA does not increment or decrement
       // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_TRY_ENV);
+      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return user_id._retn ();
@@ -1769,7 +1769,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
           if (poa_current_impl != 0 &&
               servant == poa_current_impl->servant ())
             {
-              return poa_current_impl->get_object_id (ACE_TRY_ENV);
+              return poa_current_impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
             }
         }
     }
@@ -1783,8 +1783,8 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
 
 PortableServer::ObjectId *
 TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
-                                 CORBA::Short &priority,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Short &priority
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1851,7 +1851,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
       // is invoked at least once on the Servant argument before
       // returning. Otherwise, the POA does not increment or decrement
       // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_TRY_ENV);
+      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return system_id._retn ();
@@ -1863,8 +1863,8 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
 }
 
 CORBA::Object_ptr
-TAO_POA::servant_to_reference (PortableServer::Servant servant,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::servant_to_reference (PortableServer::Servant servant
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1878,8 +1878,8 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant,
   CORBA::Short priority =
     this->cached_policies_.server_priority ();
   PortableServer::ObjectId_var id = this->servant_to_system_id (servant,
-                                                                priority,
-                                                                ACE_TRY_ENV);
+                                                                priority
+                                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Create object key.
@@ -1890,13 +1890,13 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant,
                               servant->_interface_repository_id (),
                               servant,
                               1,
-                              priority,
-                              ACE_TRY_ENV);
+                              priority
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::Servant
-TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::reference_to_servant (CORBA::Object_ptr reference
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
@@ -1924,7 +1924,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
   // servant associated with that object in the Active Object Map.
   if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     {
-      TAO_ObjectKey_var key = reference->_key (ACE_TRY_ENV);
+      TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // If the object reference was not created by this POA, the
@@ -1999,7 +1999,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
           // _remove_ref on the returned Servant if the type of the
           // Servant uses the default reference counting inherited
           // from ServantBase.
-          servant->_add_ref (ACE_TRY_ENV);
+          servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return servant;
@@ -2044,7 +2044,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
           // _remove_ref on the returned Servant if the type of the
           // Servant uses the default reference counting inherited
           // from ServantBase.
-          result->_add_ref (ACE_TRY_ENV);
+          result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return result;
@@ -2064,8 +2064,8 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
 }
 
 PortableServer::ObjectId *
-TAO_POA::reference_to_id (CORBA::Object_ptr reference,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::reference_to_id (CORBA::Object_ptr reference
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
@@ -2086,7 +2086,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference,
   // POA on which the operation is being performed.  If the object
   // reference was not created by this POA, the WrongAdapter exception
   // is raised.
-  TAO_ObjectKey_var key = reference->_key (ACE_TRY_ENV);
+  TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   PortableServer::ObjectId system_id;
@@ -2144,8 +2144,8 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference,
 }
 
 PortableServer::Servant
-TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -2183,7 +2183,7 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id,
       // conforming caller need not invoke _remove_ref on the returned
       // Servant if the type of the Servant uses the default reference
       // counting inherited from ServantBase.
-      servant->_add_ref (ACE_TRY_ENV);
+      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return servant;
@@ -2197,8 +2197,8 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id,
 }
 
 CORBA::Object_ptr
-TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -2230,8 +2230,8 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id,
                                   servant->_interface_repository_id (),
                                   servant,
                                   1,
-                                  priority,
-                                  ACE_TRY_ENV);
+                                  priority
+                                  TAO_ENV_ARG_PARAMETER);
     }
   else
     // If the Object Id value is not active in the POA, an
@@ -2243,7 +2243,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id,
 }
 
 CORBA::OctetSeq *
-TAO_POA::id (CORBA::Environment & /*ACE_TRY_ENV*/)
+TAO_POA::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return new CORBA::OctetSeq (this->id_);
@@ -2251,8 +2251,8 @@ TAO_POA::id (CORBA::Environment & /*ACE_TRY_ENV*/)
 
 TAO_SERVANT_LOCATION
 TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
-                           PortableServer::Servant &servant,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           PortableServer::Servant &servant
+                           TAO_ENV_ARG_DECL)
 {
   // If the POA has the RETAIN policy, the POA looks in the Active
   // Object Map to find if there is a servant associated with the
@@ -2339,8 +2339,8 @@ PortableServer::Servant
 TAO_POA::locate_servant_i (const char *operation,
                            const PortableServer::ObjectId &system_id,
                            TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                           TAO_POA_Current_Impl &poa_current_impl,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           TAO_POA_Current_Impl &poa_current_impl
+                           TAO_ENV_ARG_DECL)
 {
   // If we have the RETAIN policy, convert/transform from system id to
   // user id.
@@ -3054,8 +3054,8 @@ TAO_Adapter_Activator::TAO_Adapter_Activator (PortableServer::POAManager_ptr poa
 
 CORBA::Boolean
 TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const char *name
+                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Default policies
@@ -3064,20 +3064,20 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
   // This assumes that the lock on the parent is recursive
   PortableServer::POA_var child = parent->create_POA (name,
                                                       this->poa_manager_.in (),
-                                                      default_policies,
-                                                      ACE_TRY_ENV);
+                                                      default_policies
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TRY
     {
-      child->the_activator (this, ACE_TRY_ENV);
+      child->the_activator (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       child->destroy (1,
-                      1,
-                      ACE_TRY_ENV);
+                      1
+                      TAO_ENV_ARG_PARAMETER);
 
       return 0;
     }
@@ -3095,13 +3095,13 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
                         const char *type_id,
                         TAO_ServantBase *servant,
                         CORBA::Boolean collocated,
-                        CORBA::Short priority,
-                        CORBA_Environment &ACE_TRY_ENV)
+                        CORBA::Short priority
+                        TAO_ENV_ARG_DECL)
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
   //    get here!
-  this->orb_core_.check_shutdown (ACE_TRY_ENV);
+  this->orb_core_.check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   //
@@ -3129,7 +3129,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
         }
 
       CORBA::String_var imr_str =
-        imr->_stubobj ()->profile_in_use ()->to_string (ACE_TRY_ENV);
+        imr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (obj);
 
       if (TAO_debug_level > 0)
@@ -3171,7 +3171,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
                     ior.c_str ()));
 
       obj =
-        this->orb_core_.orb ()->string_to_object (ior.c_str (), ACE_TRY_ENV);
+        this->orb_core_.orb ()->string_to_object (ior.c_str ()TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (obj);
 
       return obj;
@@ -3182,7 +3182,7 @@ orbkey:
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   TAO_Stub *data =
-    this->key_to_stub_i (key, type_id, priority, ACE_TRY_ENV);
+    this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
 
@@ -3219,27 +3219,27 @@ orbkey:
 TAO_Stub *
 TAO_POA::key_to_stub (const TAO_ObjectKey &key,
                       const char *type_id,
-                      CORBA::Short priority,
-                      CORBA_Environment &ACE_TRY_ENV)
+                      CORBA::Short priority
+                      TAO_ENV_ARG_DECL)
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
   //    get here!
-  this->orb_core_.check_shutdown (ACE_TRY_ENV);
+  this->orb_core_.check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->key_to_stub_i (key, type_id, priority, ACE_TRY_ENV);
+  return this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Stub *
 TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
                         const char *type_id,
-                        CORBA::Short priority,
-                        CORBA_Environment &ACE_TRY_ENV)
+                        CORBA::Short priority
+                        TAO_ENV_ARG_DECL)
 {
   CORBA::PolicyList_var client_exposed_policies =
-    this->client_exposed_policies (priority,
-                                   ACE_TRY_ENV);
+    this->client_exposed_policies (priority
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Default_Acceptor_Filter filter;
@@ -3248,8 +3248,8 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
                               type_id,
                               client_exposed_policies._retn (),
                               &filter,
-                              this->orb_core_.lane_resources ().acceptor_registry (),
-                              ACE_TRY_ENV);
+                              this->orb_core_.lane_resources ().acceptor_registry ()
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return data;
@@ -3260,8 +3260,8 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
                              const char *type_id,
                              CORBA::PolicyList *policy_list,
                              TAO_Acceptor_Filter *filter,
-                             TAO_Acceptor_Registry &acceptor_registry,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             TAO_Acceptor_Registry &acceptor_registry
+                             TAO_ENV_ARG_DECL)
 {
   int error = 0;
 
@@ -3319,13 +3319,13 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
   return
     this->orb_core_.create_stub_object (mprofile,
                                         type_id,
-                                        policy_list,
-                                        ACE_TRY_ENV);
+                                        policy_list
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::PolicyList *
-TAO_POA::client_exposed_policies (CORBA::Short object_priority,
-                                  CORBA_Environment &ACE_TRY_ENV)
+TAO_POA::client_exposed_policies (CORBA::Short object_priority
+                                  TAO_ENV_ARG_DECL)
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
@@ -3337,8 +3337,8 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority,
   CORBA::PolicyList_var policies = client_exposed_policies;
 
   // Add in all of the client exposed policies.
-  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies,
-                                                     ACE_TRY_ENV);
+  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_UNUSED_ARG (object_priority);
@@ -3352,7 +3352,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority,
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 void
-TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
+TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notifying IMR of startup\n"));
@@ -3375,17 +3375,17 @@ TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
   // Activate the servant in the root poa.
   PortableServer::ObjectId_var id =
     root_poa->activate_object_i (this->server_object_,
-                                 this->cached_policies_.server_priority (),
-                                 ACE_TRY_ENV);
+                                 this->cached_policies_.server_priority ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  (),
-                                                       ACE_TRY_ENV);
+  CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ImplementationRepository::ServerObject_var svr
-    = ImplementationRepository::ServerObject::_narrow (obj.in (),
-                                                       ACE_TRY_ENV);
+    = ImplementationRepository::ServerObject::_narrow (obj.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
@@ -3395,7 +3395,7 @@ TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
     }
 
   CORBA::String_var svr_str =
-    svr->_stubobj ()->profile_in_use ()->to_string (ACE_TRY_ENV);
+    svr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Search for "corbaloc:" alone, without the protocol.  This code
@@ -3421,7 +3421,7 @@ TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
   CORBA::String_var curr_addr (svr_str);
 
   ImplementationRepository::Administration_var imr_admin =
-    ImplementationRepository::Administration::_narrow (imr.in (), ACE_TRY_ENV);
+    ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (TAO_debug_level > 0)
@@ -3431,8 +3431,8 @@ TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
     {
       imr_admin->server_is_running (this->name ().c_str (),
                                     curr_addr.in (),
-                                    svr.in (),
-                                    ACE_TRY_ENV);
+                                    svr.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -3469,10 +3469,10 @@ TAO_POA::imr_notify_shutdown (void)
     {
       // Get the IMR's administrative object and call shutting_down on it
       ImplementationRepository::Administration_var imr_admin =
-        ImplementationRepository::Administration::_narrow (imr.in (), ACE_TRY_ENV);
+        ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      imr_admin->server_is_shutting_down (this->the_name (), ACE_TRY_ENV);
+      imr_admin->server_is_shutting_down (this->the_name ()TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3485,8 +3485,8 @@ TAO_POA::imr_notify_shutdown (void)
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
-TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa,
-                              CORBA::Environment &ACE_TRY_ENV,
+TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
+                              TAO_ENV_ARG_DECL,
                               int check_for_destruction)
   : guard_ (poa.lock ())
 {
@@ -3501,7 +3501,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa,
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_TRY_ENV);
+  poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (check_for_destruction &&
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index a72790868e3..7558af8eac7 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -150,170 +150,170 @@ public:
 
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                      const CORBA::PolicyList &policies
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it,
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                    CORBA::Boolean activate_it
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion,
-                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                CORBA::Boolean wait_for_completion
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
+                                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
+                                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
+                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
+                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
+                                                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
+                                                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
+                                                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAList *the_children (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant (PortableServer::Servant servant,
-                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void set_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant,
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                PortableServer::Servant p_servant
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
-  void deactivate_object (const PortableServer::ObjectId &oid,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void deactivate_object (const PortableServer::ObjectId &oid
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr create_reference (const char *intf,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::Object_ptr create_reference (const char *intf
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf,
-                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                              const char *intf
+                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant,
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
+                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
+                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference,
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,
-                                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,
-                                     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::OctetSeq *id (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor for POA policies.
@@ -322,8 +322,8 @@ public:
   /// Accessor for cached POA policies.
   TAO_POA_Cached_Policies &cached_policies (void);
 
-  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority,
-                                                      CORBA_Environment &ACE_TRY_ENV);
+  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority
+                                                      TAO_ENV_ARG_DECL);
   // This method gives the policies that are exposed to the client.
   // These policies are shipped within the IOR.
 
@@ -347,8 +347,8 @@ public:
            ACE_Lock &lock,
            TAO_SYNCH_MUTEX &thread_lock,
            TAO_ORB_Core &orb_core,
-           TAO_Object_Adapter *object_adapter,
-           CORBA_Environment &ACE_TRY_ENV);
+           TAO_Object_Adapter *object_adapter
+           TAO_ENV_ARG_DECL);
 
   virtual ~TAO_POA (void);
 
@@ -368,8 +368,8 @@ public:
   const TAO_Object_Adapter::poa_name &system_name (void) const;
 
   static void check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
-                                                    CORBA::Boolean wait_for_completion,
-                                                    CORBA::Environment &ACE_TRY_ENV);
+                                                    CORBA::Boolean wait_for_completion
+                                                    TAO_ENV_ARG_DECL);
 
   TAO_ORB_Core &orb_core (void) const;
   // ORB Core for POA.
@@ -383,8 +383,8 @@ public:
 
   TAO_Stub* key_to_stub (const TAO_ObjectKey &key,
                          const char *type_id,
-                         CORBA::Short priority,
-                         CORBA_Environment &ACE_TRY_ENV);
+                         CORBA::Short priority
+                         TAO_ENV_ARG_DECL);
   // Create the correct stub, properly initialized with the attributes
   // and policies attached to the current POA.
 
@@ -405,59 +405,59 @@ protected:
                             ACE_Lock &lock,
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter,
-                            CORBA_Environment &ACE_TRY_ENV);
+                            TAO_Object_Adapter *object_adapter
+                            TAO_ENV_ARG_DECL);
 
   PortableServer::POA_ptr create_POA_i (const char *adapter_name,
                                         PortableServer::POAManager_ptr poa_manager,
-                                        const CORBA::PolicyList &policies,
-                                        CORBA_Environment &ACE_TRY_ENV)
+                                        const CORBA::PolicyList &policies
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   TAO_POA *create_POA_i (const String &adapter_name,
                          TAO_POA_Manager &poa_manager,
-                         const TAO_POA_Policy_Set &policies,
-                         CORBA_Environment &ACE_TRY_ENV)
+                         const TAO_POA_Policy_Set &policies
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   TAO_POA *find_POA_i (const ACE_CString &child_name,
-                       CORBA::Boolean activate_it,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Boolean activate_it
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy_i (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion,
-                  CORBA_Environment &ACE_TRY_ENV)
+                  CORBA::Boolean wait_for_completion
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void complete_destruction_i (CORBA::Environment &ACE_TRY_ENV);
+  void complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL);
 
-  PortableServer::POAList *the_children_i (CORBA::Environment &ACE_TRY_ENV)
+  PortableServer::POAList *the_children_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::ServantManager_ptr get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                              CORBA_Environment &ACE_TRY_ENV)
+  void set_servant_manager_i (PortableServer::ServantManager_ptr imgr
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant_i (CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::Servant get_servant_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant_i (PortableServer::Servant servant,
-                      CORBA_Environment &ACE_TRY_ENV)
+  void set_servant_i (PortableServer::Servant servant
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -468,7 +468,7 @@ protected:
 //
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  void imr_notify_startup (CORBA_Environment &ACE_TRY_ENV);
+  void imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL);
   // ImplRepo helper method, notify the ImplRepo on startup
 
   void imr_notify_shutdown (void);
@@ -480,23 +480,23 @@ protected:
                                    const char *type_id,
                                    TAO_ServantBase *servant,
                                    CORBA::Boolean collocated,
-                                   CORBA::Short priority,
-                                   CORBA_Environment &ACE_TRY_ENV);
+                                   CORBA::Short priority
+                                   TAO_ENV_ARG_DECL);
   // Wrapper for the ORB's key_to_object that will alter the object pointer
   // if the ImplRepo is used.
 
   virtual TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key,
                                    const char *type_id,
-                                   CORBA::Short priority,
-                                   CORBA_Environment &ACE_TRY_ENV);
+                                   CORBA::Short priority
+                                   TAO_ENV_ARG_DECL);
   // Like key_to_stub() but assume that the ORB is not shutting down.
 
   TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
-                                TAO_Acceptor_Registry &acceptor_registry,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                TAO_Acceptor_Registry &acceptor_registry
+                                TAO_ENV_ARG_DECL);
 
   int is_servant_in_map (PortableServer::Servant servant);
 
@@ -505,90 +505,90 @@ protected:
                          int &priorities_match);
 
   PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
-                                               CORBA::Short priority,
-                                               CORBA_Environment &ACE_TRY_ENV)
+                                               CORBA::Short priority
+                                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id_i (const PortableServer::ObjectId &id,
                                   PortableServer::Servant p_servant,
-                                  CORBA::Short priority,
-                                  CORBA_Environment &ACE_TRY_ENV)
+                                  CORBA::Short priority
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
-  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                 CORBA::Environment &ACE_TRY_ENV)
+  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                 CORBA::Boolean wait_for_completion,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Boolean wait_for_completion
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  void wait_for_completions (CORBA::Boolean wait_for_completion,
-                             CORBA::Environment &ACE_TRY_ENV);
+  void wait_for_completions (CORBA::Boolean wait_for_completion
+                             TAO_ENV_ARG_DECL);
 
-  void check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV);
+  void check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL);
 
-  void deactivate_object_i (const PortableServer::ObjectId &oid,
-                            CORBA_Environment &ACE_TRY_ENV)
+  void deactivate_object_i (const PortableServer::ObjectId &oid
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy));
 
-  void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                        CORBA::Environment &ACE_TRY_ENV);
+  void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
+                        TAO_ENV_ARG_DECL);
 
-  void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                             CORBA::Environment &ACE_TRY_ENV);
+  void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
+                             TAO_ENV_ARG_DECL);
 
   CORBA::Object_ptr create_reference_i (const char *intf,
-                                        CORBA::Short priority,
-                                        CORBA_Environment &ACE_TRY_ENV)
+                                        CORBA::Short priority
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid,
                                                 const char *intf,
-                                                CORBA::Short priority,
-                                                CORBA_Environment &ACE_TRY_ENV)
+                                                CORBA::Short priority
+                                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant,
-                                             CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
+                                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant,
-                                                  CORBA::Short &priority,
-                                                  CORBA_Environment &ACE_TRY_ENV)
+                                                  CORBA::Short &priority
+                                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant,
-                                                    CORBA::Short &priority,
-                                                    CORBA_Environment &ACE_TRY_ENV)
+                                                    CORBA::Short &priority
+                                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid,
-                                           CORBA_Environment &ACE_TRY_ENV)
+  PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid
+                                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
-                                       CORBA_Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
@@ -620,14 +620,14 @@ protected:
 protected:
 
   TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
-                                         PortableServer::Servant &servant,
-                                         CORBA_Environment &ACE_TRY_ENV);
+                                         PortableServer::Servant &servant
+                                         TAO_ENV_ARG_DECL);
 
   PortableServer::Servant locate_servant_i (const char *operation,
                                             const PortableServer::ObjectId &id,
                                             TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                                            TAO_POA_Current_Impl &poa_current_impl,
-                                            CORBA_Environment &ACE_TRY_ENV);
+                                            TAO_POA_Current_Impl &poa_current_impl
+                                            TAO_ENV_ARG_DECL);
 
   const TAO_Creation_Time &creation_time (void);
 
@@ -752,8 +752,8 @@ protected:
 class TAO_PortableServer_Export TAO_POA_Guard
 {
 public:
-  TAO_POA_Guard (TAO_POA &poa,
-                 CORBA::Environment &ACE_TRY_ENV,
+  TAO_POA_Guard (TAO_POA &poa
+                 TAO_ENV_ARG_DECL,
                  int check_for_destruction = 1);
 
 private:
@@ -769,8 +769,8 @@ public:
   TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
 
   CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name,
-                                  CORBA_Environment &ACE_TRY_ENV)
+                                  const char *name
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i
index e6fb4fd073b..a9a41e63d54 100644
--- a/TAO/tao/PortableServer/POA.i
+++ b/TAO/tao/PortableServer/POA.i
@@ -129,8 +129,8 @@ TAO_Temporary_Creation_Time::creation_time (const void *creation_time)
 ACE_INLINE PortableServer::POA_ptr
 TAO_POA::create_POA (const char *adapter_name,
                      PortableServer::POAManager_ptr poa_manager,
-                     const CORBA::PolicyList &policies,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     const CORBA::PolicyList &policies
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -140,24 +140,24 @@ TAO_POA::create_POA (const char *adapter_name,
 
   return this->create_POA_i (adapter_name,
                              poa_manager,
-                             policies,
-                             ACE_TRY_ENV);
+                             policies
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA::destroy (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  CORBA::Boolean wait_for_completion
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV, 0);
+  TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER, 0);
   ACE_CHECK;
   ACE_UNUSED_ARG (poa_guard);
 
   this->destroy_i (etherealize_objects,
-                   wait_for_completion,
-                   ACE_TRY_ENV);
+                   wait_for_completion
+                   TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_POA_Policy_Set &
@@ -175,31 +175,31 @@ TAO_POA::active_object_map (void) const
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
 
-  return this->get_servant_manager_i (ACE_TRY_ENV);
+  return this->get_servant_manager_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
 
-  this->set_servant_manager_i (imgr,
-                               ACE_TRY_ENV);
+  this->set_servant_manager_i (imgr
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::Servant
-TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
@@ -207,27 +207,27 @@ TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV)
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->get_servant_i (ACE_TRY_ENV);
+  return this->get_servant_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_POA::set_servant (PortableServer::Servant servant,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::set_servant (PortableServer::Servant servant
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
 
-  this->set_servant_i (servant,
-                       ACE_TRY_ENV);
+  this->set_servant_i (servant
+                       TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 ACE_INLINE PortableServer::ObjectId *
-TAO_POA::activate_object (PortableServer::Servant servant,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::activate_object (PortableServer::Servant servant
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -236,14 +236,14 @@ TAO_POA::activate_object (PortableServer::Servant servant,
   TAO_POA_GUARD_RETURN (0);
 
   return this->activate_object_i (servant,
-                                  this->cached_policies_.server_priority (),
-                                  ACE_TRY_ENV);
+                                  this->cached_policies_.server_priority ()
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                  PortableServer::Servant servant,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  PortableServer::Servant servant
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -254,13 +254,13 @@ TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
 
   this->activate_object_with_id_i (id,
                                    servant,
-                                   this->cached_policies_.server_priority (),
-                                   ACE_TRY_ENV);
+                                   this->cached_policies_.server_priority ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_POA::deactivate_object (const PortableServer::ObjectId &oid,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::deactivate_object (const PortableServer::ObjectId &oid
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -268,13 +268,13 @@ TAO_POA::deactivate_object (const PortableServer::ObjectId &oid,
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD;
 
-  this->deactivate_object_i (oid,
-                             ACE_TRY_ENV);
+  this->deactivate_object_i (oid
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_POA::create_reference (const char *intf,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_reference (const char *intf
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -282,14 +282,14 @@ TAO_POA::create_reference (const char *intf,
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
   return this->create_reference_i (intf,
-                                   this->cached_policies_.server_priority (),
-                                   ACE_TRY_ENV);
+                                   this->cached_policies_.server_priority ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
-                                   const char *intf,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const char *intf
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -298,13 +298,13 @@ TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
 
   return this->create_reference_with_id_i (id,
                                            intf,
-                                           this->cached_policies_.server_priority (),
-                                           ACE_TRY_ENV);
+                                           this->cached_policies_.server_priority ()
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::ObjectId *
-TAO_POA::servant_to_id (PortableServer::Servant servant,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::servant_to_id (PortableServer::Servant servant
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -314,14 +314,14 @@ TAO_POA::servant_to_id (PortableServer::Servant servant,
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->servant_to_id_i (servant,
-                                ACE_TRY_ENV);
+  return this->servant_to_id_i (servant
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_POA::servant_to_system_id (PortableServer::Servant servant,
-                               CORBA::Short &priority,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Short &priority
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -330,13 +330,13 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant,
   TAO_POA_GUARD_RETURN (0);
 
   return this->servant_to_system_id_i (servant,
-                                       priority,
-                                       ACE_TRY_ENV);
+                                       priority
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::Servant
-TAO_POA::id_to_servant (const PortableServer::ObjectId &oid,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::id_to_servant (const PortableServer::ObjectId &oid
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -344,13 +344,13 @@ TAO_POA::id_to_servant (const PortableServer::ObjectId &oid,
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->id_to_servant_i (oid,
-                                ACE_TRY_ENV);
+  return this->id_to_servant_i (oid
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_POA::id_to_reference (const PortableServer::ObjectId &oid,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::id_to_reference (const PortableServer::ObjectId &oid
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -358,11 +358,11 @@ TAO_POA::id_to_reference (const PortableServer::ObjectId &oid,
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->id_to_reference_i (oid, ACE_TRY_ENV);
+  return this->id_to_reference_i (oid TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_POA::the_parent (CORBA::Environment &)
+TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->parent_ != 0)
@@ -372,17 +372,17 @@ TAO_POA::the_parent (CORBA::Environment &)
 }
 
 ACE_INLINE PortableServer::POAList *
-TAO_POA::the_children (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_children (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->the_children_i (ACE_TRY_ENV);
+  return this->the_children_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::POAManager_ptr
-TAO_POA::the_POAManager (CORBA::Environment &)
+TAO_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
@@ -391,7 +391,7 @@ TAO_POA::the_POAManager (CORBA::Environment &)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE PortableServer::AdapterActivator_ptr
-TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
@@ -401,8 +401,8 @@ TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV)
 }
 
 ACE_INLINE void
-TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
@@ -446,7 +446,7 @@ TAO_POA::name (void) const
 }
 
 ACE_INLINE char *
-TAO_POA::the_name (CORBA::Environment &)
+TAO_POA::the_name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.c_str ());
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 22345b004af..d4c4516e79c 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -22,7 +22,7 @@ TAO_POA_Manager::~TAO_POA_Manager (void)
 }
 
 void
-TAO_POA_Manager::activate_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::activate_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
@@ -43,15 +43,15 @@ TAO_POA_Manager::activate_i (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
-                               CORBA::Boolean wait_for_completion,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Boolean wait_for_completion
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                 wait_for_completion,
-                                                 ACE_TRY_ENV);
+                                                 wait_for_completion
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -101,8 +101,8 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
     {
       TAO_POA *poa = *iterator;
       poa->deactivate_all_objects_i (etherealize_objects,
-                                     wait_for_completion,
-                                     ACE_TRY_ENV);
+                                     wait_for_completion
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -116,15 +116,15 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 void
-TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                 wait_for_completion,
-                                                 ACE_TRY_ENV);
+                                                 wait_for_completion
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -164,23 +164,23 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion,
            ++iterator)
         {
           TAO_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion,
-                                     ACE_TRY_ENV);
+          poa->wait_for_completions (wait_for_completion
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 }
 
 void
-TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                 wait_for_completion,
-                                                 ACE_TRY_ENV);
+                                                 wait_for_completion
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -222,8 +222,8 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion,
            ++iterator)
         {
           TAO_POA *poa = *iterator;
-          poa->wait_for_completions (wait_for_completion,
-                                     ACE_TRY_ENV);
+          poa->wait_for_completions (wait_for_completion
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 21f15e7c455..f73348b3a6e 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -54,31 +54,31 @@ class TAO_PortableServer_Export TAO_POA_Manager :
 
 public:
 
-  void activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  void hold_requests (CORBA::Boolean wait_for_completion,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void hold_requests (CORBA::Boolean wait_for_completion
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
-  void discard_requests (CORBA::Boolean wait_for_completion,
-                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void discard_requests (CORBA::Boolean wait_for_completion
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void deactivate (CORBA::Boolean etherealize_objects,
-                   CORBA::Boolean wait_for_completion,
-                   CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                   CORBA::Boolean wait_for_completion
+                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::POAManager::State get_state (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   TAO_POA_Manager (TAO_Object_Adapter &object_adapter);
@@ -87,25 +87,25 @@ public:
 
 protected:
 
-  void activate_i (CORBA_Environment &ACE_TRY_ENV)
+  void activate_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void deactivate_i (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion,
-                     CORBA_Environment &ACE_TRY_ENV)
+                     CORBA::Boolean wait_for_completion
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  void hold_requests_i (CORBA::Boolean wait_for_completion,
-                        CORBA_Environment &ACE_TRY_ENV)
+  void hold_requests_i (CORBA::Boolean wait_for_completion
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
-  void discard_requests_i (CORBA::Boolean wait_for_completion,
-                           CORBA_Environment &ACE_TRY_ENV)
+  void discard_requests_i (CORBA::Boolean wait_for_completion
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index 8977b773bbd..aec6e34cd32 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -9,46 +9,46 @@ TAO_POA_Manager::lock (void)
 }
 
 ACE_INLINE void
-TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV)
+TAO_POA_Manager::activate (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->activate_i (ACE_TRY_ENV);
+  this->activate_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE void
-TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
-                                CORBA_Environment &ACE_TRY_ENV)
+TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->hold_requests_i (wait_for_completion, ACE_TRY_ENV);
+  this->hold_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
-                                   CORBA_Environment &ACE_TRY_ENV)
+TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->discard_requests_i (wait_for_completion, ACE_TRY_ENV);
+  this->discard_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
-                             CORBA::Boolean wait_for_completion,
-                             CORBA_Environment &ACE_TRY_ENV)
+                             CORBA::Boolean wait_for_completion
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
@@ -56,8 +56,8 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
   TAO_OBJECT_ADAPTER_GUARD;
 
   this->deactivate_i (etherealize_objects,
-                      wait_for_completion,
-                      ACE_TRY_ENV);
+                      wait_for_completion
+                      TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -70,7 +70,7 @@ TAO_POA_Manager::get_state_i (void)
 }
 
 ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::get_state (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access to the POAManager for the duration of this transaction
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 716b1eef0f9..0ca2e26182c 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -30,34 +30,34 @@ TAO_POA_Cached_Policies::~TAO_POA_Cached_Policies (void)
 }
 
 void
-TAO_POA_Cached_Policies::update (TAO_POA_Policy_Set &policy_set,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Cached_Policies::update (TAO_POA_Policy_Set &policy_set
+                                 TAO_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
     {
       CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
 
-      this->update_policy (policy.in (),
-                           ACE_TRY_ENV);
+      this->update_policy (policy.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
+                                        TAO_ENV_ARG_DECL)
 {
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::ThreadPolicy_var thread
-    = PortableServer::ThreadPolicy::_narrow (policy,
-                                             ACE_TRY_ENV);
+    = PortableServer::ThreadPolicy::_narrow (policy
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (thread.in ()))
     {
-      this->thread_ = thread->value (ACE_TRY_ENV);
+      this->thread_ = thread->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -66,39 +66,39 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy,
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   PortableServer::LifespanPolicy_var lifespan
-    = PortableServer::LifespanPolicy::_narrow (policy,
-                                               ACE_TRY_ENV);
+    = PortableServer::LifespanPolicy::_narrow (policy
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (lifespan.in ()))
     {
-      this->lifespan_ = lifespan->value (ACE_TRY_ENV);
+      this->lifespan_ = lifespan->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
     }
 
   PortableServer::IdUniquenessPolicy_var id_uniqueness
-    = PortableServer::IdUniquenessPolicy::_narrow (policy,
-                                                   ACE_TRY_ENV);
+    = PortableServer::IdUniquenessPolicy::_narrow (policy
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (id_uniqueness.in ()))
     {
-      this->id_uniqueness_ = id_uniqueness->value (ACE_TRY_ENV);
+      this->id_uniqueness_ = id_uniqueness->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
     }
 
   PortableServer::IdAssignmentPolicy_var id_assignment
-    = PortableServer::IdAssignmentPolicy::_narrow (policy,
-                                                   ACE_TRY_ENV);
+    = PortableServer::IdAssignmentPolicy::_narrow (policy
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (id_assignment.in ()))
     {
-      this->id_assignment_ = id_assignment->value (ACE_TRY_ENV);
+      this->id_assignment_ = id_assignment->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -107,39 +107,39 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy,
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::ImplicitActivationPolicy_var implicit_activation
-    = PortableServer::ImplicitActivationPolicy::_narrow (policy,
-                                                         ACE_TRY_ENV);
+    = PortableServer::ImplicitActivationPolicy::_narrow (policy
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (implicit_activation.in ()))
     {
-      this->implicit_activation_ = implicit_activation->value (ACE_TRY_ENV);
+      this->implicit_activation_ = implicit_activation->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
     }
 
   PortableServer::ServantRetentionPolicy_var servant_retention
-    = PortableServer::ServantRetentionPolicy::_narrow (policy,
-                                                       ACE_TRY_ENV);
+    = PortableServer::ServantRetentionPolicy::_narrow (policy
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (servant_retention.in ()))
     {
-      this->servant_retention_ = servant_retention->value (ACE_TRY_ENV);
+      this->servant_retention_ = servant_retention->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
     }
 
   PortableServer::RequestProcessingPolicy_var request_processing
-    = PortableServer::RequestProcessingPolicy::_narrow (policy,
-                                                        ACE_TRY_ENV);
+    = PortableServer::RequestProcessingPolicy::_narrow (policy
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (request_processing.in ()))
     {
-      this->request_processing_ = request_processing->value (ACE_TRY_ENV);
+      this->request_processing_ = request_processing->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index b4e1c4713b3..127439ab984 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -55,8 +55,8 @@ public:
   ~TAO_POA_Cached_Policies (void);
 
   /// Update the cached policy values.
-  void update (TAO_POA_Policy_Set &policy_set,
-               CORBA::Environment &ACE_TRY_ENV);
+  void update (TAO_POA_Policy_Set &policy_set
+               TAO_ENV_ARG_DECL);
 
   /// Accessor methods to cached values.
   PortableServer::ThreadPolicyValue thread (void) const;
@@ -76,8 +76,8 @@ public:
 protected:
 
   /// Helper method to update a particular policy.
-  void update_policy (const CORBA::Policy_ptr policy,
-                      CORBA::Environment &ACE_TRY_ENV);
+  void update_policy (const CORBA::Policy_ptr policy
+                      TAO_ENV_ARG_DECL);
 
   PortableServer::ThreadPolicyValue thread_;
 
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index d07934f0594..2c6ffc1fc20 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -29,8 +29,8 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void)
 }
 
 void
-TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies,
-                                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
+                                                       TAO_ENV_ARG_DECL)
 {
   CORBA::ULong cep_index = client_exposed_policies->length ();
 
@@ -45,7 +45,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
         {
           client_exposed_policies->length (cep_index + 1);
           (*client_exposed_policies)[cep_index] =
-                                  policy->copy (ACE_TRY_ENV);
+                                  policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           cep_index++;
@@ -55,11 +55,11 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
 
 void
 TAO_POA_Policy_Set::validate_policies (TAO_POA_Policy_Validator &validator,
-                                       TAO_ORB_Core &orb_core,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       TAO_ORB_Core &orb_core
+                                       TAO_ENV_ARG_DECL)
 {
   // Validate that all of the specified policies make sense.
-  validator.validate (this->impl_, ACE_TRY_ENV);
+  validator.validate (this->impl_  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Verify that all policies are legal for the currently loaded
@@ -70,7 +70,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_POA_Policy_Validator &validator,
     {
       CORBA::Policy_var policy = this->impl_.get_policy_by_index (i);
 
-      CORBA::PolicyType type = policy->policy_type (ACE_TRY_ENV);
+      CORBA::PolicyType type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (validator.legal_policy (type) == 0)
@@ -80,8 +80,8 @@ TAO_POA_Policy_Set::validate_policies (TAO_POA_Policy_Validator &validator,
 
           // Check whether we have a BiDirectional policy set. Call the
           // ORB_Core to do the checking for us
-          int retval = orb_core.parse_bidir_policy (policy.in (),
-                                                    ACE_TRY_ENV);
+          int retval = orb_core.parse_bidir_policy (policy.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK;
 
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 6cc40c0a6bf..740f15e2368 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -57,19 +57,19 @@ public:
   /// Obtain a single cached policy.
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
-  void merge_policies (const CORBA::PolicyList &policies,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void merge_policies (const CORBA::PolicyList &policies
+                       TAO_ENV_ARG_DECL);
 
-  void merge_policy (const CORBA::Policy_ptr policy,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void merge_policy (const CORBA::Policy_ptr policy
+                     TAO_ENV_ARG_DECL);
 
   void validate_policies (TAO_POA_Policy_Validator &validator,
-                          TAO_ORB_Core &orb_core,
-                          CORBA::Environment &ACE_TRY_ENV);
+                          TAO_ORB_Core &orb_core
+                          TAO_ENV_ARG_DECL);
 
   // Add all of the client exposed policies to the specified list.
-  void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies,
-                                          CORBA::Environment &ACE_TRY_ENV);
+  void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
+                                          TAO_ENV_ARG_DECL);
 
   TAO_Policy_Set &policies (void);
 
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
index 94d39143949..3cdda2dc2cc 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -19,21 +19,21 @@ TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type)
 }
 
 ACE_INLINE void
-TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies
+                                    TAO_ENV_ARG_DECL)
 {
   // Add the policies if they don't exist, override them if they do.
   this->impl_.set_policy_overrides (policies,
-                                    CORBA::ADD_OVERRIDE,
-                                    ACE_TRY_ENV);
+                                    CORBA::ADD_OVERRIDE
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 ACE_INLINE void
-TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy
+                                  TAO_ENV_ARG_DECL)
 {
-  this->impl_.set_policy (policy, ACE_TRY_ENV);
+  this->impl_.set_policy (policy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 871d5b5ca21..86647b1eae4 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -161,36 +161,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
-    POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    POA_CORBA_Policy *tao_impl
+    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::PolicyType result);
@@ -207,45 +203,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Policy *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_Policy_policy_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_policy_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_Policy_policy_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_policy_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_Policy_policy_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_policy_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;
@@ -257,7 +253,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -266,11 +262,11 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_policy_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
@@ -286,36 +282,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Policy_copy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
-    POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    POA_CORBA_Policy *tao_impl
+    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::Policy_ptr result);
@@ -332,45 +324,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Policy *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_Policy_copy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_copy::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_Policy_copy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_copy::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_Policy_copy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_copy::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;
@@ -382,7 +374,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (CORBA::Environment &ACE_TRY_ENV
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -391,11 +383,11 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_copy::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
@@ -411,36 +403,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Policy_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
-    POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    POA_CORBA_Policy *tao_impl
+    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));
 
 
@@ -456,45 +444,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Policy *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Policy *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_Policy_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_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_Policy_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_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_Policy_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Policy_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;
@@ -502,7 +490,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (CORBA::Environment &ACE_TRY_
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -511,11 +499,11 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_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 */
@@ -547,18 +535,18 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::~POA_CORBA_TAO_Policy_Strategized
 
 CORBA_TAO_Policy_Proxy_Impl&
 POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::Policy *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA::Policy *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];
@@ -567,8 +555,8 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_CORBA_TAO_Policy_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_);
@@ -637,8 +625,8 @@ POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -653,8 +641,8 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "policy_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -663,13 +651,13 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->policy_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -684,8 +672,8 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "copy",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -694,13 +682,13 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->copy (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -713,8 +701,8 @@ void POA_CORBA_TAO_Policy_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 (
@@ -723,7 +711,7 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->destroy (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -740,8 +728,8 @@ _TAO_CORBA_Policy_Direct_Proxy_Impl::_TAO_CORBA_Policy_Direct_Proxy_Impl (void)
 {}
 
 CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type  (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -751,14 +739,14 @@ CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type  (
            POA_CORBA_Policy_ptr,
            _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
            )->policy_type (
-                           ACE_TRY_ENV
+                           TAO_ENV_SINGLE_ARG_PARAMETER
                            );
 
 }
 
 CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy  (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -768,14 +756,14 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy  (
            POA_CORBA_Policy_ptr,
            _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
            )->copy (
-                    ACE_TRY_ENV
+                    TAO_ENV_SINGLE_ARG_PARAMETER
                     );
 
 }
 
 void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy  (
-              CORBA::Object_ptr _collocated_tao_target_,
-              CORBA::Environment &ACE_TRY_ENV
+              CORBA::Object_ptr _collocated_tao_target_
+              TAO_ENV_ARG_DECL
               )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -785,7 +773,7 @@ void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy  (
     POA_CORBA_Policy_ptr,
     _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->destroy (
-                ACE_TRY_ENV
+                TAO_ENV_SINGLE_ARG_PARAMETER
                 );
 
 }
@@ -814,8 +802,8 @@ POA_CORBA_Policy::~POA_CORBA_Policy (void)
 void POA_CORBA_Policy::_get_policy_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_Policy *_tao_impl =
@@ -835,19 +823,19 @@ void POA_CORBA_Policy::_get_policy_type_skel (
   TAO_ServerRequestInfo_CORBA_Policy_policy_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->policy_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -855,20 +843,20 @@ void POA_CORBA_Policy::_get_policy_type_skel (
       CORBA::PolicyType _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
@@ -889,15 +877,13 @@ void POA_CORBA_Policy::_get_policy_type_skel (
     ACE_THROW (CORBA::MARSHAL());
 
   ACE_UNUSED_ARG (_tao_upcall);
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Policy::copy_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_Policy *_tao_impl =
@@ -917,19 +903,19 @@ void POA_CORBA_Policy::copy_skel (
   TAO_ServerRequestInfo_CORBA_Policy_copy 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->copy (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -938,20 +924,20 @@ void POA_CORBA_Policy::copy_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
@@ -973,15 +959,13 @@ void POA_CORBA_Policy::copy_skel (
 
   ACE_UNUSED_ARG (_tao_upcall);
 
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Policy::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_Policy *_tao_impl =
@@ -1001,38 +985,38 @@ void POA_CORBA_Policy::destroy_skel (
   TAO_ServerRequestInfo_CORBA_Policy_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
@@ -1047,15 +1031,13 @@ void POA_CORBA_Policy::destroy_skel (
 
   ACE_UNUSED_ARG (_tao_upcall);
 
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Policy::_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 ();
@@ -1065,7 +1047,7 @@ void POA_CORBA_Policy::_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 ();
@@ -1077,12 +1059,12 @@ void POA_CORBA_Policy::_is_a_skel (
 void POA_CORBA_Policy::_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_Policy *_tao_impl = (POA_CORBA_Policy *) _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 ();
@@ -1094,8 +1076,8 @@ void POA_CORBA_Policy::_non_existent_skel (
 void POA_CORBA_Policy::_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_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference;
@@ -1114,7 +1096,7 @@ void POA_CORBA_Policy::_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 ();
@@ -1140,11 +1122,11 @@ void POA_CORBA_Policy::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_Policy::_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 (
@@ -1166,12 +1148,12 @@ void* POA_CORBA_Policy::_downcast (
   return 0;
 }
 
-void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Policy::_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);
 }
 
 const char* POA_CORBA_Policy::_interface_repository_id (void) const
@@ -1180,9 +1162,9 @@ const char* POA_CORBA_Policy::_interface_repository_id (void) const
 }
 
 CORBA::Policy*
-POA_CORBA_Policy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_Policy::_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/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 0a9b6d855b9..e89330ca907 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -63,10 +63,9 @@
 
 
     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,41 +74,39 @@
     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::Policy *_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::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -117,14 +114,13 @@
     static void _get_policy_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::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -132,14 +128,13 @@
     static void copy_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;
@@ -147,8 +142,8 @@
     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
       );
 
 
@@ -167,16 +162,16 @@
     virtual ~POA_CORBA_TAO_Policy_Strategized_Proxy_Broker (void);
 
     virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
-      ::CORBA::Policy *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::CORBA::Policy *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
     );
 
     // Caches the proxy implementations. The proxy implementation
@@ -214,24 +209,24 @@
     virtual ~POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl (void) { }
 
     virtual CORBA::PolicyType policy_type (
-        CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Object_ptr _collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
 virtual CORBA::Policy_ptr copy (
-        CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Object_ptr _collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
 virtual void destroy (
-        CORBA::Object_ptr _collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Object_ptr _collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -258,24 +253,24 @@ public:
   virtual ~_TAO_CORBA_Policy_Direct_Proxy_Impl (void) { }
 
   virtual CORBA::PolicyType policy_type (
-    CORBA::Object_ptr _collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr _collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual CORBA_Policy_ptr copy (
-                                 CORBA::Object_ptr _collocated_tao_target_,
-                                 CORBA::Environment &ACE_TRY_ENV
+                                 CORBA::Object_ptr _collocated_tao_target_
+                                 TAO_ENV_ARG_DECL
                                  )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
     virtual void destroy (
-                          CORBA::Object_ptr _collocated_tao_target_,
-                          CORBA::Environment &ACE_TRY_ENV
+                          CORBA::Object_ptr _collocated_tao_target_
+                          TAO_ENV_ARG_DECL
                           )
       ACE_THROW_SPEC ((
                        CORBA::SystemException
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
index 8834615050c..dcaca13efb5 100644
--- a/TAO/tao/PortableServer/PolicyS_T.i
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_Policy_tie<T>::POA_CORBA_Policy_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_Policy_tie<T>::POA_CORBA_Policy_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_Policy_tie<T>::POA_CORBA_Policy_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_Policy_tie<T>::POA_CORBA_Policy_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,50 +90,50 @@ POA_CORBA_Policy_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Policy_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Policy_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_Policy::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Policy::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA_Policy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->policy_type (
-ACE_TRY_ENV
+TAO_ENV_ARG_SINGLE_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Policy_ptr POA_CORBA_Policy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->copy (
-ACE_TRY_ENV
+TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Policy_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/tao/PortableServer/Policy_Validator.cpp b/TAO/tao/PortableServer/Policy_Validator.cpp
index b6a0e90ea2d..8302e35c3e9 100644
--- a/TAO/tao/PortableServer/Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Policy_Validator.cpp
@@ -31,29 +31,29 @@ TAO_POA_Policy_Validator::add_validator (TAO_POA_Policy_Validator *validator)
 
 
 void
-TAO_POA_Policy_Validator::validate (TAO_Policy_Set &policies,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Policy_Validator::validate (TAO_Policy_Set &policies
+                                    TAO_ENV_ARG_DECL)
 {
-  this->validate_impl (policies, ACE_TRY_ENV);
+  this->validate_impl (policies TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->next_ != 0)
     {
-      this->next_->validate (policies, ACE_TRY_ENV);
+      this->next_->validate (policies TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-TAO_POA_Policy_Validator::merge_policies (TAO_Policy_Set &policies,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Policy_Validator::merge_policies (TAO_Policy_Set &policies
+                                          TAO_ENV_ARG_DECL)
 {
-  this->merge_policies_impl (policies, ACE_TRY_ENV);
+  this->merge_policies_impl (policies TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->next_ != 0)
     {
-      this->next_->merge_policies (policies, ACE_TRY_ENV);
+      this->next_->merge_policies (policies TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/tao/PortableServer/Policy_Validator.h b/TAO/tao/PortableServer/Policy_Validator.h
index f9d94ef0630..f5ab17b78d4 100644
--- a/TAO/tao/PortableServer/Policy_Validator.h
+++ b/TAO/tao/PortableServer/Policy_Validator.h
@@ -42,14 +42,14 @@ public:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  void validate (TAO_Policy_Set &policies,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void validate (TAO_Policy_Set &policies
+                 TAO_ENV_ARG_DECL);
 
   /**
    * Add/merge policies.
    **/
-  void merge_policies (TAO_Policy_Set &policies,
-                       CORBA::Environment &ACE_TRY_ENV);
+  void merge_policies (TAO_Policy_Set &policies
+                       TAO_ENV_ARG_DECL);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -70,11 +70,11 @@ public:
 
 
 protected:
-  virtual void validate_impl (TAO_Policy_Set &policies,
-                              CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void validate_impl (TAO_Policy_Set &policies
+                              TAO_ENV_ARG_DECL) = 0;
 
-  virtual void merge_policies_impl (TAO_Policy_Set &policies,
-                                    CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void merge_policies_impl (TAO_Policy_Set &policies
+                                    TAO_ENV_ARG_DECL) = 0;
 
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0;
 
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 3309da837c6..b0e28d85495 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -105,12 +105,12 @@
   void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
       void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
+      CORBA_Object *src
+      TAO_ENV_ARG_DECL
     )
   {
     PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, target);
-    *tmp = PortableServer::POA::_narrow (src, ACE_TRY_ENV);
+    *tmp = PortableServer::POA::_narrow (src TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -314,8 +314,8 @@ void PortableServer::ForwardRequest::_raise ()
 }
 
 void PortableServer::ForwardRequest::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -327,8 +327,8 @@ void PortableServer::ForwardRequest::_tao_encode (
 }
 
 void PortableServer::ForwardRequest::_tao_decode (
-    TAO_InputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &cdr
+    TAO_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -610,11 +610,11 @@ PortableServer::ThreadPolicy_var::tao_nil (void)
 
 ::PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ThreadPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -695,16 +695,16 @@ PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
 
 PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ThreadPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ThreadPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -922,11 +922,11 @@ PortableServer::LifespanPolicy_var::tao_nil (void)
 
 ::PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::LifespanPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1007,16 +1007,16 @@ PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
 
 PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return LifespanPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return LifespanPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1234,11 +1234,11 @@ PortableServer::IdUniquenessPolicy_var::tao_nil (void)
 
 ::PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::IdUniquenessPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1319,16 +1319,16 @@ PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
 
 PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return IdUniquenessPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return IdUniquenessPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1545,11 +1545,11 @@ PortableServer::IdAssignmentPolicy_var::tao_nil (void)
 
 ::PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::IdAssignmentPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1630,16 +1630,16 @@ PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
 
 PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return IdAssignmentPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return IdAssignmentPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1868,11 +1868,11 @@ PortableServer::ImplicitActivationPolicy_var::tao_nil (void)
 
 ::PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ImplicitActivationPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1953,16 +1953,16 @@ PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
 
 PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ImplicitActivationPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ImplicitActivationPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2181,11 +2181,11 @@ PortableServer::ServantRetentionPolicy_var::tao_nil (void)
 
 ::PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantRetentionPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2266,16 +2266,16 @@ PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
 
 PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ServantRetentionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServantRetentionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2508,11 +2508,11 @@ PortableServer::RequestProcessingPolicy_var::tao_nil (void)
 
 ::PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::RequestProcessingPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2593,16 +2593,16 @@ PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
 
 PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RequestProcessingPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RequestProcessingPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2775,11 +2775,11 @@ PortableServer::POAManager_var::tao_nil (void)
 
 ::PortableServer::POAManager_ptr
 PortableServer::POAManager_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::POAManager::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2860,16 +2860,16 @@ PortableServer::POAManager::~POAManager (void)
 {}
 
 PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return POAManager::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return POAManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POAManager_ptr PortableServer::POAManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2963,16 +2963,16 @@ void PortableServer::POAManager::AdapterInactive::_raise ()
 }
 
 void PortableServer::POAManager::AdapterInactive::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POAManager::AdapterInactive::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3098,11 +3098,11 @@ PortableServer::AdapterActivator_var::tao_nil (void)
 
 ::PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::AdapterActivator::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3183,16 +3183,16 @@ PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
 
 PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return AdapterActivator::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return AdapterActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3351,11 +3351,11 @@ PortableServer::ServantManager_var::tao_nil (void)
 
 ::PortableServer::ServantManager_ptr
 PortableServer::ServantManager_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantManager::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3436,16 +3436,16 @@ PortableServer::ServantManager::~ServantManager (void)
 {}
 
 PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ServantManager::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServantManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ServantManager_ptr PortableServer::ServantManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3604,11 +3604,11 @@ PortableServer::ServantActivator_var::tao_nil (void)
 
 ::PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantActivator::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3689,16 +3689,16 @@ PortableServer::ServantActivator::~ServantActivator (void)
 {}
 
 PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ServantActivator::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServantActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3869,11 +3869,11 @@ PortableServer::ServantLocator_var::tao_nil (void)
 
 ::PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantLocator::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3954,16 +3954,16 @@ PortableServer::ServantLocator::~ServantLocator (void)
 {}
 
 PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ServantLocator::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServantLocator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4136,11 +4136,11 @@ PortableServer::POA_var::tao_nil (void)
 
 ::PortableServer::POA_ptr
 PortableServer::POA_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::POA::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4221,16 +4221,16 @@ PortableServer::POA::~POA (void)
 {}
 
 PortableServer::POA_ptr PortableServer::POA::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return POA::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return POA::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr PortableServer::POA::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4324,16 +4324,16 @@ void PortableServer::POA::AdapterAlreadyExists::_raise ()
 }
 
 void PortableServer::POA::AdapterAlreadyExists::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4392,16 +4392,16 @@ void PortableServer::POA::AdapterNonExistent::_raise ()
 }
 
 void PortableServer::POA::AdapterNonExistent::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::AdapterNonExistent::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4462,16 +4462,16 @@ void PortableServer::POA::InvalidPolicy::_raise ()
 }
 
 void PortableServer::POA::InvalidPolicy::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::InvalidPolicy::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4540,16 +4540,16 @@ void PortableServer::POA::NoServant::_raise ()
 }
 
 void PortableServer::POA::NoServant::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::NoServant::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4610,16 +4610,16 @@ void PortableServer::POA::ObjectAlreadyActive::_raise ()
 }
 
 void PortableServer::POA::ObjectAlreadyActive::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4678,16 +4678,16 @@ void PortableServer::POA::ObjectNotActive::_raise ()
 }
 
 void PortableServer::POA::ObjectNotActive::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::ObjectNotActive::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4746,16 +4746,16 @@ void PortableServer::POA::ServantAlreadyActive::_raise ()
 }
 
 void PortableServer::POA::ServantAlreadyActive::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::ServantAlreadyActive::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4814,16 +4814,16 @@ void PortableServer::POA::ServantNotActive::_raise ()
 }
 
 void PortableServer::POA::ServantNotActive::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::ServantNotActive::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4882,16 +4882,16 @@ void PortableServer::POA::WrongAdapter::_raise ()
 }
 
 void PortableServer::POA::WrongAdapter::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::WrongAdapter::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4950,16 +4950,16 @@ void PortableServer::POA::WrongPolicy::_raise ()
 }
 
 void PortableServer::POA::WrongPolicy::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::POA::WrongPolicy::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5083,11 +5083,11 @@ PortableServer::Current_var::tao_nil (void)
 
 ::PortableServer::Current_ptr
 PortableServer::Current_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::Current::_narrow (p, ACE_TRY_ENV);
+  return ::PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5168,16 +5168,16 @@ PortableServer::Current::~Current (void)
 {}
 
 PortableServer::Current_ptr PortableServer::Current::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Current::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::Current_ptr PortableServer::Current::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -5283,16 +5283,16 @@ void PortableServer::Current::NoContext::_raise ()
 }
 
 void PortableServer::Current::NoContext::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableServer::Current::NoContext::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5375,7 +5375,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5463,7 +5463,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5534,7 +5534,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5583,7 +5583,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Lifespan
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5630,7 +5630,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUnique
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5677,7 +5677,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssign
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5726,7 +5726,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Implicit
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5773,7 +5773,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantR
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5820,7 +5820,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestP
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 305b688c172..844e2beded5 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -114,7 +114,7 @@ TAO_NAMESPACE  PortableServer
     static POA_ptr tao_duplicate (POA_ptr);
     static void tao_release (POA_ptr);
     static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static POA_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -182,10 +182,9 @@ TAO_NAMESPACE  PortableServer
       virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
       virtual void _downcast (
           void* target,
-          CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        );
+          CORBA_Object *src
+          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
       virtual CORBA_Object* _upcast (void *src) const;
 
     };
@@ -448,13 +447,13 @@ TAO_NAMESPACE  PortableServer
     virtual void _raise (void);
 
     virtual void _tao_encode (
-        TAO_OutputCDR &,
-        CORBA::Environment &
+        TAO_OutputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
-        TAO_InputCDR &,
-        CORBA::Environment &
+        TAO_InputCDR &
+        TAO_ENV_ARG_DECL_NOT_USED
       );
 
     static ForwardRequest *_downcast (CORBA::Exception *);
@@ -539,7 +538,7 @@ TAO_NAMESPACE  PortableServer
     static ThreadPolicy_ptr tao_duplicate (ThreadPolicy_ptr);
     static void tao_release (ThreadPolicy_ptr);
     static ThreadPolicy_ptr tao_nil (void);
-    static ThreadPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ThreadPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -593,24 +592,21 @@ class TAO_PortableServer_Export ThreadPolicy: public virtual CORBA::Policy
     // the static operations
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
     static ThreadPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ThreadPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ThreadPolicy_ptr _nil (void)
       {
         return (ThreadPolicy_ptr)0;
       }
 
     virtual PortableServer::ThreadPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -680,7 +676,7 @@ class TAO_PortableServer_Export ThreadPolicy: public virtual CORBA::Policy
     static LifespanPolicy_ptr tao_duplicate (LifespanPolicy_ptr);
     static void tao_release (LifespanPolicy_ptr);
     static LifespanPolicy_ptr tao_nil (void);
-    static LifespanPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static LifespanPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -734,24 +730,21 @@ class TAO_PortableServer_Export LifespanPolicy: public virtual CORBA::Policy
     // the static operations
     static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
     static LifespanPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static LifespanPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static LifespanPolicy_ptr _nil (void)
       {
         return (LifespanPolicy_ptr)0;
       }
 
     virtual PortableServer::LifespanPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -819,7 +812,7 @@ class TAO_PortableServer_Export LifespanPolicy: public virtual CORBA::Policy
     static IdUniquenessPolicy_ptr tao_duplicate (IdUniquenessPolicy_ptr);
     static void tao_release (IdUniquenessPolicy_ptr);
     static IdUniquenessPolicy_ptr tao_nil (void);
-    static IdUniquenessPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static IdUniquenessPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -873,24 +866,21 @@ class TAO_PortableServer_Export IdUniquenessPolicy: public virtual CORBA::Policy
     // the static operations
     static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
     static IdUniquenessPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IdUniquenessPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IdUniquenessPolicy_ptr _nil (void)
       {
         return (IdUniquenessPolicy_ptr)0;
       }
 
     virtual PortableServer::IdUniquenessPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -958,7 +948,7 @@ class TAO_PortableServer_Export IdUniquenessPolicy: public virtual CORBA::Policy
     static IdAssignmentPolicy_ptr tao_duplicate (IdAssignmentPolicy_ptr);
     static void tao_release (IdAssignmentPolicy_ptr);
     static IdAssignmentPolicy_ptr tao_nil (void);
-    static IdAssignmentPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static IdAssignmentPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1012,24 +1002,21 @@ class TAO_PortableServer_Export IdAssignmentPolicy: public virtual CORBA::Policy
     // the static operations
     static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
     static IdAssignmentPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IdAssignmentPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static IdAssignmentPolicy_ptr _nil (void)
       {
         return (IdAssignmentPolicy_ptr)0;
       }
 
     virtual PortableServer::IdAssignmentPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1100,7 +1087,7 @@ class TAO_PortableServer_Export IdAssignmentPolicy: public virtual CORBA::Policy
     static ImplicitActivationPolicy_ptr tao_duplicate (ImplicitActivationPolicy_ptr);
     static void tao_release (ImplicitActivationPolicy_ptr);
     static ImplicitActivationPolicy_ptr tao_nil (void);
-    static ImplicitActivationPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ImplicitActivationPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1154,24 +1141,21 @@ class TAO_PortableServer_Export ImplicitActivationPolicy: public virtual CORBA::
     // the static operations
     static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
     static ImplicitActivationPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ImplicitActivationPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ImplicitActivationPolicy_ptr _nil (void)
       {
         return (ImplicitActivationPolicy_ptr)0;
       }
 
     virtual PortableServer::ImplicitActivationPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1244,7 +1228,7 @@ class TAO_PortableServer_Export ImplicitActivationPolicy: public virtual CORBA::
     static ServantRetentionPolicy_ptr tao_duplicate (ServantRetentionPolicy_ptr);
     static void tao_release (ServantRetentionPolicy_ptr);
     static ServantRetentionPolicy_ptr tao_nil (void);
-    static ServantRetentionPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ServantRetentionPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1298,24 +1282,21 @@ class TAO_PortableServer_Export ServantRetentionPolicy: public virtual CORBA::Po
     // the static operations
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
     static ServantRetentionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantRetentionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantRetentionPolicy_ptr _nil (void)
       {
         return (ServantRetentionPolicy_ptr)0;
       }
 
     virtual PortableServer::ServantRetentionPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1389,7 +1370,7 @@ class TAO_PortableServer_Export ServantRetentionPolicy: public virtual CORBA::Po
     static RequestProcessingPolicy_ptr tao_duplicate (RequestProcessingPolicy_ptr);
     static void tao_release (RequestProcessingPolicy_ptr);
     static RequestProcessingPolicy_ptr tao_nil (void);
-    static RequestProcessingPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static RequestProcessingPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1443,24 +1424,21 @@ class TAO_PortableServer_Export RequestProcessingPolicy: public virtual CORBA::P
     // the static operations
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
     static RequestProcessingPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestProcessingPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static RequestProcessingPolicy_ptr _nil (void)
       {
         return (RequestProcessingPolicy_ptr)0;
       }
 
     virtual PortableServer::RequestProcessingPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1522,7 +1500,7 @@ class TAO_PortableServer_Export RequestProcessingPolicy: public virtual CORBA::P
     static POAManager_ptr tao_duplicate (POAManager_ptr);
     static void tao_release (POAManager_ptr);
     static POAManager_ptr tao_nil (void);
-    static POAManager_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static POAManager_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1576,15 +1554,13 @@ class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
     // the static operations
     static POAManager_ptr _duplicate (POAManager_ptr obj);
     static POAManager_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static POAManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static POAManager_ptr _nil (void)
       {
         return (POAManager_ptr)0;
@@ -1612,13 +1588,13 @@ class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static AdapterInactive *_downcast (CORBA::Exception *);
@@ -1640,9 +1616,8 @@ class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
     };
     typedef State &State_out;
     virtual void activate (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POAManager::AdapterInactive
@@ -1651,20 +1626,18 @@ class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual void hold_requests (
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean wait_for_completion
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POAManager::AdapterInactive
       )) = 0;
 
     virtual void discard_requests (
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean wait_for_completion
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POAManager::AdapterInactive
@@ -1672,10 +1645,9 @@ class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
 
     virtual void deactivate (
         CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean wait_for_completion
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POAManager::AdapterInactive
@@ -1684,9 +1656,8 @@ class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual PortableServer::POAManager::State get_state (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1748,7 +1719,7 @@ class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
     static AdapterActivator_ptr tao_duplicate (AdapterActivator_ptr);
     static void tao_release (AdapterActivator_ptr);
     static AdapterActivator_ptr tao_nil (void);
-    static AdapterActivator_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static AdapterActivator_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1802,15 +1773,13 @@ class TAO_PortableServer_Export AdapterActivator : public virtual CORBA_Object
     // the static operations
     static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
     static AdapterActivator_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static AdapterActivator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static AdapterActivator_ptr _nil (void)
       {
         return (AdapterActivator_ptr)0;
@@ -1818,10 +1787,9 @@ class TAO_PortableServer_Export AdapterActivator : public virtual CORBA_Object
 
     virtual CORBA::Boolean unknown_adapter (
         PortableServer::POA_ptr parent,
-        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;
@@ -1881,7 +1849,7 @@ class TAO_PortableServer_Export AdapterActivator : public virtual CORBA_Object
     static ServantManager_ptr tao_duplicate (ServantManager_ptr);
     static void tao_release (ServantManager_ptr);
     static ServantManager_ptr tao_nil (void);
-    static ServantManager_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ServantManager_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1935,15 +1903,13 @@ class TAO_PortableServer_Export ServantManager : public virtual CORBA_Object
     // the static operations
     static ServantManager_ptr _duplicate (ServantManager_ptr obj);
     static ServantManager_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantManager_ptr _nil (void)
       {
         return (ServantManager_ptr)0;
@@ -2004,7 +1970,7 @@ class TAO_PortableServer_Export ServantManager : public virtual CORBA_Object
     static ServantActivator_ptr tao_duplicate (ServantActivator_ptr);
     static void tao_release (ServantActivator_ptr);
     static ServantActivator_ptr tao_nil (void);
-    static ServantActivator_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ServantActivator_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2058,15 +2024,13 @@ class TAO_PortableServer_Export ServantActivator: public virtual ServantManager
     // the static operations
     static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
     static ServantActivator_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantActivator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantActivator_ptr _nil (void)
       {
         return (ServantActivator_ptr)0;
@@ -2155,7 +2119,7 @@ class TAO_PortableServer_Export ServantActivator: public virtual ServantManager
     static ServantLocator_ptr tao_duplicate (ServantLocator_ptr);
     static void tao_release (ServantLocator_ptr);
     static ServantLocator_ptr tao_nil (void);
-    static ServantLocator_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static ServantLocator_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2212,15 +2176,13 @@ class TAO_PortableServer_Export ServantLocator: public virtual ServantManager
     // the static operations
     static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
     static ServantLocator_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantLocator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static ServantLocator_ptr _nil (void)
       {
         return (ServantLocator_ptr)0;
@@ -2292,15 +2254,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
     // the static operations
     static POA_ptr _duplicate (POA_ptr obj);
     static POA_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static POA_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static POA_ptr _nil (void)
       {
         return (POA_ptr)0;
@@ -2329,13 +2289,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
 
@@ -2371,13 +2331,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static AdapterNonExistent *_downcast (CORBA::Exception *);
@@ -2413,13 +2373,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static InvalidPolicy *_downcast (CORBA::Exception *);
@@ -2459,13 +2419,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static NoServant *_downcast (CORBA::Exception *);
@@ -2502,13 +2462,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static ObjectAlreadyActive *_downcast (CORBA::Exception *);
@@ -2543,13 +2503,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static ObjectNotActive *_downcast (CORBA::Exception *);
@@ -2584,13 +2544,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static ServantAlreadyActive *_downcast (CORBA::Exception *);
@@ -2625,13 +2585,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static ServantNotActive *_downcast (CORBA::Exception *);
@@ -2666,13 +2626,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static WrongAdapter *_downcast (CORBA::Exception *);
@@ -2707,13 +2667,13 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static WrongPolicy *_downcast (CORBA::Exception *);
@@ -2729,10 +2689,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
     virtual PortableServer::POA_ptr create_POA (
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
-        const CORBA::PolicyList & policies,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const CORBA::PolicyList & policies
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::AdapterAlreadyExists,
@@ -2741,10 +2700,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 
     virtual PortableServer::POA_ptr find_POA (
         const char * adapter_name,
-        CORBA::Boolean activate_it,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean activate_it
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::AdapterNonExistent
@@ -2752,10 +2710,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 
     virtual void destroy (
         CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean wait_for_completion
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2763,10 +2720,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
-        PortableServer::ThreadPolicyValue value,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::ThreadPolicyValue value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2774,28 +2730,25 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-        PortableServer::LifespanPolicyValue value,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::LifespanPolicyValue value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-        PortableServer::IdUniquenessPolicyValue value,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::IdUniquenessPolicyValue value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-        PortableServer::IdAssignmentPolicyValue value,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::IdAssignmentPolicyValue value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2803,28 +2756,25 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-        PortableServer::ImplicitActivationPolicyValue value,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::ImplicitActivationPolicyValue value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-        PortableServer::ServantRetentionPolicyValue value,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::ServantRetentionPolicyValue value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-        PortableServer::RequestProcessingPolicyValue value,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::RequestProcessingPolicyValue value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2832,33 +2782,29 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual char * the_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::POA_ptr the_parent (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::POAList * the_children (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::POAManager_ptr the_POAManager (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2866,45 +2812,40 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual PortableServer::AdapterActivator_ptr the_activator (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void the_activator (
-        PortableServer::AdapterActivator_ptr the_activator,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::AdapterActivator_ptr the_activator
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual PortableServer::ServantManager_ptr get_servant_manager (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongPolicy
       )) = 0;
 
     virtual void set_servant_manager (
-        PortableServer::ServantManager_ptr imgr,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::ServantManager_ptr imgr
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongPolicy
       )) = 0;
 
     virtual PortableServer::Servant get_servant (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::NoServant,
@@ -2912,10 +2853,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual void set_servant (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::Servant p_servant
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongPolicy
@@ -2924,10 +2864,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual PortableServer::ObjectId * activate_object (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::Servant p_servant
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ServantAlreadyActive,
@@ -2936,10 +2875,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 
     virtual void activate_object_with_id (
         const PortableServer::ObjectId & id,
-        PortableServer::Servant p_servant,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::Servant p_servant
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ServantAlreadyActive,
@@ -2948,10 +2886,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual void deactivate_object (
-        const PortableServer::ObjectId & oid,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const PortableServer::ObjectId & oid
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ObjectNotActive,
@@ -2959,10 +2896,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr create_reference (
-        const char * intf,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const char * intf
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongPolicy
@@ -2970,20 +2906,18 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId & oid,
-        const char * intf,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const char * intf
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongPolicy
       )) = 0;
 
     virtual PortableServer::ObjectId * servant_to_id (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::Servant p_servant
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ServantNotActive,
@@ -2991,10 +2925,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant p_servant,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        PortableServer::Servant p_servant
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ServantNotActive,
@@ -3002,10 +2935,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual PortableServer::Servant reference_to_servant (
-        CORBA::Object_ptr reference,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr reference
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ObjectNotActive,
@@ -3014,10 +2946,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual PortableServer::ObjectId * reference_to_id (
-        CORBA::Object_ptr reference,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Object_ptr reference
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongAdapter,
@@ -3025,10 +2956,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId & oid,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const PortableServer::ObjectId & oid
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ObjectNotActive,
@@ -3036,10 +2966,9 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr id_to_reference (
-        const PortableServer::ObjectId & oid,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const PortableServer::ObjectId & oid
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ObjectNotActive,
@@ -3047,9 +2976,8 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::OctetSeq * id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -3109,7 +3037,7 @@ class TAO_PortableServer_Export POA : public virtual CORBA_Object
     static Current_ptr tao_duplicate (Current_ptr);
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
-    static Current_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static Current_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -3163,15 +3091,13 @@ class TAO_PortableServer_Export Current: public virtual CORBA::Current
     // the static operations
     static Current_ptr _duplicate (Current_ptr obj);
     static Current_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
@@ -3199,13 +3125,13 @@ class TAO_PortableServer_Export Current: public virtual CORBA::Current
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static NoContext *_downcast (CORBA::Exception *);
@@ -3219,18 +3145,16 @@ class TAO_PortableServer_Export Current: public virtual CORBA::Current
 #endif /* end #if !defined */
 
     virtual PortableServer::POA_ptr get_POA (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::Current::NoContext
       )) = 0;
 
     virtual PortableServer::ObjectId * get_object_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::Current::NoContext
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index 9ba403e65a1..6cc1d32a906 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -21,7 +21,7 @@
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_
 
@@ -29,36 +29,36 @@
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (CORBA::ULong nelems)
   {
     PortableServer::POA **buf = 0;
-    
+
     ACE_NEW_RETURN (buf, PortableServer::POA*[nelems], 0);
-    
+
     for (CORBA::ULong i = 0; i < nelems; i++)
       {
         buf[i] = PortableServer::POA::_nil ();
       }
-    
+
     return buf;
   }
-  
-  ACE_INLINE void 
+
+  ACE_INLINE void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
   {
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (maximum))
   {
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -67,7 +67,7 @@
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-  
+
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -76,12 +76,12 @@
     {
       PortableServer::POA **tmp1 = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
       PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-      
+
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
           tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
         }
-      
+
       this->buffer_ = tmp1;
     }
     else
@@ -89,17 +89,17 @@
       this->buffer_ = 0;
     }
   }
-  
+
   ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList &
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
   {
     if (this == &rhs)
       return *this;
-    
+
     if (this->release_)
     {
       PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -113,20 +113,20 @@
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
-    
+
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
+
     PortableServer::POA **tmp1 = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
     PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-    
+
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
       {
         tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
       }
-    
+
     return *this;
   }
-  
+
   ACE_INLINE TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -135,7 +135,7 @@
     PortableServer::POA ** const tmp = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> (tmp + index, this->release_);
   }
-  
+
   ACE_INLINE PortableServer::POA* *
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (CORBA::Boolean orphan)
   {
@@ -169,18 +169,18 @@
     }
     return result;
   }
-  
+
   ACE_INLINE const PortableServer::POA* *
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_PORTABLESERVER_POALIST_CI_)
 #define _PORTABLESERVER_POALIST_CI_
@@ -236,7 +236,7 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
         {
           POAList *deep_copy =
             new POAList (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               POAList *tmp = deep_copy;
@@ -246,7 +246,7 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -262,27 +262,27 @@ PortableServer::POAList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POAList_var::operator const ::PortableServer::POAList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast 
+ACE_INLINE
+PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast 
+ACE_INLINE
+PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast 
+PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast
 {
   return this->ptr_;
 }
@@ -305,7 +305,7 @@ PortableServer::POAList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::PortableServer::POAList *&
 PortableServer::POAList_var::out (void)
 {
@@ -366,7 +366,7 @@ PortableServer::POAList_out::operator= (POAList *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast
 {
   return this->ptr_;
@@ -455,7 +455,7 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
         {
           ObjectId *deep_copy =
             new ObjectId (*p.ptr_);
-          
+
           if (deep_copy != 0)
             {
               ObjectId *tmp = deep_copy;
@@ -465,7 +465,7 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
             }
         }
     }
-  
+
   return *this;
 }
 
@@ -493,20 +493,20 @@ PortableServer::ObjectId_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast 
+ACE_INLINE
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast 
+ACE_INLINE
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast
 {
   return *this->ptr_;
 }
@@ -535,7 +535,7 @@ PortableServer::ObjectId_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE ::PortableServer::ObjectId *&
 PortableServer::ObjectId_var::out (void)
 {
@@ -596,7 +596,7 @@ PortableServer::ObjectId_out::operator= (ObjectId *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast
 {
   return this->ptr_;
@@ -659,11 +659,11 @@ tao_PortableServer_ThreadPolicy_nil (
 
 ACE_INLINE PortableServer::ThreadPolicy_ptr
 tao_PortableServer_ThreadPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::ThreadPolicy::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -711,11 +711,11 @@ tao_PortableServer_LifespanPolicy_nil (
 
 ACE_INLINE PortableServer::LifespanPolicy_ptr
 tao_PortableServer_LifespanPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::LifespanPolicy::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -761,11 +761,11 @@ tao_PortableServer_IdUniquenessPolicy_nil (
 
 ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
 tao_PortableServer_IdUniquenessPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::IdUniquenessPolicy::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -811,11 +811,11 @@ tao_PortableServer_IdAssignmentPolicy_nil (
 
 ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
 tao_PortableServer_IdAssignmentPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::IdAssignmentPolicy::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -863,11 +863,11 @@ tao_PortableServer_ImplicitActivationPolicy_nil (
 
 ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
 tao_PortableServer_ImplicitActivationPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::ImplicitActivationPolicy::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -913,11 +913,11 @@ tao_PortableServer_ServantRetentionPolicy_nil (
 
 ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
 tao_PortableServer_ServantRetentionPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantRetentionPolicy::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -963,11 +963,11 @@ tao_PortableServer_RequestProcessingPolicy_nil (
 
 ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
 tao_PortableServer_RequestProcessingPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::RequestProcessingPolicy::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1019,11 +1019,11 @@ tao_PortableServer_POAManager_nil (
 
 ACE_INLINE PortableServer::POAManager_ptr
 tao_PortableServer_POAManager_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::POAManager::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1071,11 +1071,11 @@ tao_PortableServer_AdapterActivator_nil (
 
 ACE_INLINE PortableServer::AdapterActivator_ptr
 tao_PortableServer_AdapterActivator_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::AdapterActivator::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1121,11 +1121,11 @@ tao_PortableServer_ServantManager_nil (
 
 ACE_INLINE PortableServer::ServantManager_ptr
 tao_PortableServer_ServantManager_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantManager::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1171,11 +1171,11 @@ tao_PortableServer_ServantActivator_nil (
 
 ACE_INLINE PortableServer::ServantActivator_ptr
 tao_PortableServer_ServantActivator_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantActivator::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1221,11 +1221,11 @@ tao_PortableServer_ServantLocator_nil (
 
 ACE_INLINE PortableServer::ServantLocator_ptr
 tao_PortableServer_ServantLocator_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantLocator::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1313,11 +1313,11 @@ tao_PortableServer_POA_nil (
 
 ACE_INLINE PortableServer::POA_ptr
 tao_PortableServer_POA_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::POA::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1367,11 +1367,11 @@ tao_PortableServer_Current_nil (
 
 ACE_INLINE PortableServer::Current_ptr
 tao_PortableServer_Current_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return PortableServer::Current::_narrow (p, ACE_TRY_ENV);
+  return PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1446,12 +1446,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Thread
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ThreadPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1467,12 +1467,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Lifesp
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::LifespanPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1486,12 +1486,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniq
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1505,12 +1505,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssi
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1526,12 +1526,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Implic
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1545,12 +1545,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Servan
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
@@ -1564,12 +1564,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Reques
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
+
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, _tao_temp);
     }
-  
+
   return _tao_result;
 }
 
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index f16a5be3f79..6a9ca1409a3 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -65,21 +65,21 @@ TAO_ServantBase::~TAO_ServantBase (void)
 }
 
 PortableServer::POA_ptr
-TAO_ServantBase::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServantBase::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var object =
-    TAO_ORB_Core_instance ()->root_poa (ACE_TRY_ENV);
+    TAO_ORB_Core_instance ()->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
-  return PortableServer::POA::_narrow (object.in (),
-                                       ACE_TRY_ENV);
+  return PortableServer::POA::_narrow (object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_ServantBase::_is_a (const char* logical_type_id,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_ServantBase::_is_a (const char* logical_type_id
+                        TAO_ENV_ARG_DECL)
 {
-  const char *id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (ACE_OS::strcmp (logical_type_id, id) == 0)
@@ -91,13 +91,13 @@ TAO_ServantBase::_is_a (const char* logical_type_id,
 }
 
 CORBA::Boolean
-TAO_ServantBase::_non_existent (CORBA::Environment &)
+TAO_ServantBase::_non_existent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 CORBA_InterfaceDef_ptr
-TAO_ServantBase::_get_interface (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServantBase::_get_interface (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -111,8 +111,8 @@ TAO_ServantBase::_get_interface (CORBA::Environment &ACE_TRY_ENV)
     }
 
   return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
-                                 this->_interface_repository_id (),
-                                 ACE_TRY_ENV);
+                                 this->_interface_repository_id ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 int
@@ -132,7 +132,7 @@ TAO_ServantBase::_bind (const char *opname,
 }
 
 TAO_Stub *
-TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
+TAO_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = 0;
 
@@ -151,16 +151,16 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
       stub = poa_current_impl->poa ()->key_to_stub (
           poa_current_impl->object_key (),
           this->_interface_repository_id (),
-          poa_current_impl->priority (),
-          ACE_TRY_ENV);
+          poa_current_impl->priority ()
+          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
     {
-      PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+      PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::Object_var object = poa->servant_to_reference (this, ACE_TRY_ENV);
+      CORBA::Object_var object = poa->servant_to_reference (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Get the stub object
@@ -180,8 +180,8 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV)
 void TAO_ServantBase::synchronous_upcall_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall,
-    void *derived_this,
-    CORBA::Environment &ACE_TRY_ENV
+    void *derived_this
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_Skeleton skel;
@@ -222,7 +222,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (
       // Invoke the skeleton, it will demarshal the arguments,
       // invoke the right operation on the skeleton class
       // (<derived_this>), and marshal any results.
-      skel (req, derived_this, servant_upcall, ACE_TRY_ENV);
+      skel (req, derived_this, servant_upcall TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // It is our job to send the already marshaled reply, but only
@@ -267,13 +267,13 @@ TAO_RefCountServantBase::~TAO_RefCountServantBase (void)
 }
 
 void
-TAO_RefCountServantBase::_add_ref (CORBA::Environment &)
+TAO_RefCountServantBase::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ++this->ref_count_;
 }
 
 void
-TAO_RefCountServantBase::_remove_ref (CORBA::Environment &)
+TAO_RefCountServantBase::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::ULong new_count = --this->ref_count_;
 
@@ -400,8 +400,8 @@ TAO_ServantBase_var::_retn (void)
 
 void
 TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
-                                  void *,
-                                  CORBA_Environment &ACE_TRY_ENV)
+                                  void *
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::BAD_OPERATION ());
 }
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 8b982192173..d6f33db3b57 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -46,34 +46,30 @@ public:
   // Destructor.
 
   virtual PortableServer::POA_ptr _default_POA (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   // Returns the default POA for this servant.
 
-  virtual CORBA::Boolean _is_a (const char* logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ());
+  virtual CORBA::Boolean _is_a (const char* logical_type_id
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Local implementation of the CORBA::Object::_is_a method.
 
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Default <_non_existent>: always returns false.
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      CORBA_Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void *_downcast (const char *repository_id) = 0;
   // Get the correct vtable.
 
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV);
+  virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL);
   // This is an auxiliar method for _this() and _narrow().
 
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *servant_upcall,
-                          CORBA_Environment &ACE_TRY_ENV) = 0;
+                          void *servant_upcall
+                          TAO_ENV_ARG_DECL) = 0;
   // Dispatches a request to the object: find the operation, cast the
   // type to the most derived type, demarshall all the parameters from
   // the request and finally invokes the operation, storing the
@@ -94,8 +90,8 @@ protected:
 
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
                                             void *servant_upcall,
-                                            void *derived_this,
-                                            CORBA::Environment &ACE_TRY_ENV);
+                                            void *derived_this
+                                            TAO_ENV_ARG_DECL);
 
   virtual int _find (const char *opname,
                      TAO_Skeleton &skelfunc,
@@ -149,12 +145,10 @@ public:
   ~TAO_RefCountServantBase (void);
   // Destructor.
 
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
-                           TAO_default_environment ());
+  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Increase reference count by one.
 
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Decreases reference count by one; if the resulting reference
   // count equals zero, _remove_ref invokes delete on its this pointer
   // in order to destroy the servant.
@@ -239,14 +233,13 @@ class TAO_PortableServer_Export TAO_Local_ServantBase
   //     registered with the POA.
   //
 protected:
-  TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
+  TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // This is an auxiliar method for _this().  Make sure *not* to
   // register with the default POA.
 
   void _dispatch (TAO_ServerRequest &request,
-                  void *servant_upcall,
-                  CORBA_Environment &ACE_TRY_ENV);
+                  void *servant_upcall
+                  TAO_ENV_ARG_DECL);
   // Throws CORBA::BAD_OPERATION exception.
 };
 
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index dcff57157eb..d8478e202b0 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -7,7 +7,7 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const
 }
 
 ACE_INLINE TAO_Stub *
-TAO_Local_ServantBase::_create_stub (CORBA_Environment & /*ACE_TRY_ENV*/)
+TAO_Local_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
 {
 #if 0
   PortableServer::ObjectId_var invalid_oid =
@@ -26,10 +26,12 @@ TAO_Local_ServantBase::_create_stub (CORBA_Environment & /*ACE_TRY_ENV*/)
   // POA. The unfortunate part is that calling default_POA() requires
   // the creation of a local stub, hence causing a infinite loop.
   return TAO_ORB_Core_instance ()->orb ()->create_stub_object (tmp_key,
-                                                               this->_interface_repository_id (),
-                                                               ACE_TRY_ENV);
+                                                               this->_interface_repository_id ()
+                                                               TAO_ENV_ARG_PARAMETER);
 #else
-  //  ACE_UNUSED_ARG (ACE_TRY_ENV);
+# if !defined (ACE_HAS_EXCEPTIONS)
+  ACE_UNUSED_ARG (TAO_ENV_SINGLE_ARG_PARAMETER);
+#endif
   return 0;
 #endif
 }
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index 42dc8cd6a03..4a0a126eb68 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -43,8 +43,8 @@ public:
 
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                         TAO_ServerRequest &req,
-                         CORBA::Environment &ACE_TRY_ENV) = 0;
+                         TAO_ServerRequest &req
+                         TAO_ENV_ARG_DECL) = 0;
 
   /// Factory method for creating new POA's.
   virtual TAO_POA *create_POA (const ACE_CString &name,
@@ -54,8 +54,8 @@ public:
                                ACE_Lock &lock,
                                TAO_SYNCH_MUTEX &thread_lock,
                                TAO_ORB_Core &orb_core,
-                               TAO_Object_Adapter *object_adapter,
-                               CORBA_Environment &ACE_TRY_ENV) = 0;
+                               TAO_Object_Adapter *object_adapter
+                               TAO_ENV_ARG_DECL) = 0;
 
 };
 
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
index 1a7509c7991..5927d4fcbe0 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
@@ -24,8 +24,8 @@ TAO_ServerRequestInterceptor_Adapter::
 void
 TAO_ServerRequestInterceptor_Adapter::
 receive_request_service_contexts (
-  TAO_ServerRequestInfo *ri,
-  CORBA::Environment &ACE_TRY_ENV)
+  TAO_ServerRequestInfo *ri
+  TAO_ENV_ARG_DECL)
 {
   // This method implements one of the "starting" server side
   // interception point.
@@ -54,8 +54,8 @@ receive_request_service_contexts (
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
       ri->forward_reference (exc);
-      this->send_other (ri,
-                        ACE_TRY_ENV);
+      this->send_other (ri
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
@@ -66,8 +66,8 @@ receive_request_service_contexts (
 
 void
 TAO_ServerRequestInterceptor_Adapter::
-receive_request (TAO_ServerRequestInfo *ri,
-                 CORBA::Environment &ACE_TRY_ENV)
+receive_request (TAO_ServerRequestInfo *ri
+                 TAO_ENV_ARG_DECL)
 {
   // This method implements an "intermediate" server side interception
   // point.  Interceptors are invoked in the same order they were
@@ -102,8 +102,8 @@ receive_request (TAO_ServerRequestInfo *ri,
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
       ri->forward_reference (exc);
-      this->send_other (ri,
-                        ACE_TRY_ENV);
+      this->send_other (ri
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
@@ -115,8 +115,8 @@ receive_request (TAO_ServerRequestInfo *ri,
 
 void
 TAO_ServerRequestInterceptor_Adapter::
-send_reply (TAO_ServerRequestInfo *ri,
-            CORBA::Environment &ACE_TRY_ENV)
+send_reply (TAO_ServerRequestInfo *ri
+            TAO_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -141,8 +141,6 @@ send_reply (TAO_ServerRequestInfo *ri,
       ACE_CHECK;
     }
 
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   // The send_reply() interception point does not raise a
   // PortableInterceptor::ForwardRequest exception so there is no need
   // to attempt to catch it here.
@@ -150,8 +148,8 @@ send_reply (TAO_ServerRequestInfo *ri,
 
 void
 TAO_ServerRequestInterceptor_Adapter::
-send_exception (TAO_ServerRequestInfo *ri,
-                CORBA::Environment &ACE_TRY_ENV)
+send_exception (TAO_ServerRequestInfo *ri
+                TAO_ENV_ARG_DECL)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -181,8 +179,8 @@ send_exception (TAO_ServerRequestInfo *ri,
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
       ri->forward_reference (exc);
-      this->send_other (ri,
-                        ACE_TRY_ENV);
+      this->send_other (ri
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
@@ -201,11 +199,11 @@ send_exception (TAO_ServerRequestInfo *ri,
 
       ri->exception (&ACE_ANY_EXCEPTION);
 
-      this->send_exception (ri, ACE_TRY_ENV);
+      this->send_exception (ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus status =
-        ri->reply_status (ACE_TRY_ENV);
+        ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only re-throw the exception if it hasn't been transformed by
@@ -221,8 +219,8 @@ send_exception (TAO_ServerRequestInfo *ri,
 
 void
 TAO_ServerRequestInterceptor_Adapter::
-send_other (TAO_ServerRequestInfo *ri,
-            CORBA::Environment &ACE_TRY_ENV)
+send_other (TAO_ServerRequestInfo *ri
+            TAO_ENV_ARG_DECL)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -252,8 +250,8 @@ send_other (TAO_ServerRequestInfo *ri,
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
       ri->forward_reference (exc);
-      this->send_other (ri,
-                        ACE_TRY_ENV);
+      this->send_other (ri
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.h b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
index cb3ec64bfd5..03aab708e15 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.h
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
@@ -70,27 +70,27 @@ public:
   /// This method implements the "starting" server side interception
   /// point.
   void receive_request_service_contexts (
-    TAO_ServerRequestInfo *ri,
-    CORBA::Environment &);
+    TAO_ServerRequestInfo *ri
+    TAO_ENV_ARG_DECL);
 
   /// This method an "intermediate" server side interception point.
-  void receive_request (TAO_ServerRequestInfo *ri,
-                        CORBA::Environment &);
+  void receive_request (TAO_ServerRequestInfo *ri
+                        TAO_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" server side
   /// interception points.
-  void send_reply (TAO_ServerRequestInfo *ri,
-                   CORBA::Environment &);
+  void send_reply (TAO_ServerRequestInfo *ri
+                   TAO_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" server side
   /// interception points.
-  void send_exception (TAO_ServerRequestInfo *ri,
-                       CORBA::Environment &);
+  void send_exception (TAO_ServerRequestInfo *ri
+                       TAO_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" server side
   /// interception points.
-  void send_other (TAO_ServerRequestInfo *ri,
-                   CORBA::Environment &);
+  void send_other (TAO_ServerRequestInfo *ri
+                   TAO_ENV_ARG_DECL);
   //@}
 
   /// Returns true if a LOCATION_FORWARD was generated, and false
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 19e6db913e1..e6fc87b261d 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -32,7 +32,7 @@ TAO_ServerRequestInfo::TAO_ServerRequestInfo (
 }
 
 CORBA::ULong
-TAO_ServerRequestInfo::request_id (CORBA::Environment &)
+TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The request ID returned by this method need not correspond to the
@@ -75,14 +75,14 @@ TAO_ServerRequestInfo::request_id (CORBA::Environment &)
 }
 
 char *
-TAO_ServerRequestInfo::operation (CORBA::Environment &)
+TAO_ServerRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->server_request_.operation ());
 }
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -91,7 +91,7 @@ TAO_ServerRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -100,7 +100,7 @@ TAO_ServerRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::ContextList *
-TAO_ServerRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -109,7 +109,7 @@ TAO_ServerRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::RequestContext *
-TAO_ServerRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -118,7 +118,7 @@ TAO_ServerRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -127,7 +127,7 @@ TAO_ServerRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_ServerRequestInfo::response_expected (CORBA::Environment &)
+TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_request_.response_expected ();
@@ -135,7 +135,7 @@ TAO_ServerRequestInfo::response_expected (CORBA::Environment &)
 
 # if TAO_HAS_CORBA_MESSAGING == 1
 Messaging::SyncScope
-TAO_ServerRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.sync_with_server ())
@@ -148,7 +148,7 @@ TAO_ServerRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
 PortableInterceptor::ReplyStatus
-TAO_ServerRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ == -1)
@@ -161,7 +161,7 @@ TAO_ServerRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Object_ptr
-TAO_ServerRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
@@ -175,8 +175,8 @@ TAO_ServerRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -188,49 +188,49 @@ TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id,
   if (pi_current == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  pi_current->check_validity (id, ACE_TRY_ENV);
+  pi_current->check_validity (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Retrieve the request scope PICurrent object.
   TAO_PICurrent_Impl &rsc = this->server_request_.rs_pi_current ();
 
-  return rsc.get_slot (id, ACE_TRY_ENV);
+  return rsc.get_slot (id TAO_ENV_ARG_PARAMETER);
 
 }
 
 IOP::ServiceContext *
 TAO_ServerRequestInfo::get_request_service_context (
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
     this->server_request_.request_service_context ();
 
   return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
+                                      id
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ServerRequestInfo::get_reply_service_context (
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
     this->server_request_.reply_service_context ();
 
   return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
+                                      id
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ServerRequestInfo::get_service_context_i (
     TAO_Service_Context &service_context_list,
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a new service context to be returned.  Assume
@@ -266,7 +266,7 @@ TAO_ServerRequestInfo::get_service_context_i (
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ServerRequestInfo::sending_exception (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -303,14 +303,14 @@ TAO_ServerRequestInfo::sending_exception (CORBA::Environment &ACE_TRY_ENV)
 // = TAO specific method done since there currently is no simple way
 // to extract exceptions from an Any
 CORBA::Exception *
-TAO_ServerRequestInfo::_sending_exception (CORBA::Environment &)
+TAO_ServerRequestInfo::_sending_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->caught_exception_;
 }
 
 CORBA::OctetSeq *
-TAO_ServerRequestInfo::object_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -353,11 +353,11 @@ TAO_ServerRequestInfo::object_id (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::OctetSeq *
-TAO_ServerRequestInfo::adapter_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
-    return this->servant_upcall_->poa ().id (ACE_TRY_ENV);
+    return this->servant_upcall_->poa ().id (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -366,7 +366,7 @@ TAO_ServerRequestInfo::adapter_id (CORBA::Environment &ACE_TRY_ENV)
 
 char *
 TAO_ServerRequestInfo::target_most_derived_interface (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Implemented in the generated skeleton.
@@ -377,8 +377,8 @@ TAO_ServerRequestInfo::target_most_derived_interface (
 }
 
 CORBA::Policy_ptr
-TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
+                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Currently, it is only possible to retrieve the server policy
@@ -402,7 +402,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type,
           //    object reference!!!
           CORBA::Policy_var policy = policies.get_policy_by_index (i);
 
-          CORBA::PolicyType ptype = policy->policy_type (ACE_TRY_ENV);
+          CORBA::PolicyType ptype = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
           if (ptype == type)
@@ -425,8 +425,8 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type,
 
 void
 TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
-                                 const CORBA::Any &data,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 const CORBA::Any &data
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -438,7 +438,7 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
   if (pi_current == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  pi_current->check_validity (id, ACE_TRY_ENV);
+  pi_current->check_validity (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Retrieve the "request scope current" (RSC).
@@ -450,14 +450,14 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
   TAO_PICurrent_Impl *tsc = rsc.pi_peer ();
   if (tsc != 0)
     tsc->copy (rsc, 1);  // Deep copy
-    
-  rsc.set_slot (id, data, ACE_TRY_ENV);
+
+  rsc.set_slot (id, data TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Boolean
-TAO_ServerRequestInfo::target_is_a (const char * /* id */,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo::target_is_a (const char * /* id */
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Implemented in the generated skeleton.
@@ -469,8 +469,8 @@ TAO_ServerRequestInfo::target_is_a (const char * /* id */,
 void
 TAO_ServerRequestInfo::add_reply_service_context (
     const IOP::ServiceContext & service_context,
-    CORBA::Boolean replace,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Boolean replace
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
index 3d0c8a11266..b7c39996b7c 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ b/TAO/tao/PortableServer/ServerRequestInfo.h
@@ -65,43 +65,43 @@ public:
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
   virtual CORBA::ULong request_id (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the operation name for the current request.
   virtual char * operation (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of arguments passed to the current operation.
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
   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 Dynamic::ContextList * contexts (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::RequestContext * operation_context (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns true for a two-way operation, and false otherwis.e
   virtual CORBA::Boolean response_expected (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 #if TAO_HAS_CORBA_MESSAGING == 1
@@ -109,7 +109,7 @@ public:
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
   virtual Messaging::SyncScope sync_scope (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
@@ -118,35 +118,35 @@ public:
   /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT,
   /// TRANSPORT_RETRY.
   virtual PortableInterceptor::ReplyStatus reply_status (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
   /// object reference to which the request was forwarded.
   virtual CORBA::Object_ptr forward_reference (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   /// Retrieve data from the "request scope" PICurrent object.
   virtual CORBA::Any * get_slot (
-      PortableInterceptor::SlotId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      PortableInterceptor::SlotId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
-      IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      IOP::ServiceId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
   virtual IOP::ServiceContext * get_reply_service_context (
-      IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      IOP::ServiceId id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return an Any containing the exception being sent, if any.
@@ -155,7 +155,7 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   virtual CORBA::Any * sending_exception (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -164,52 +164,52 @@ public:
    *       possible.
    */
   virtual CORBA::Exception * _sending_exception (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ObjectId for the target object.
   virtual CORBA::OctetSeq * object_id (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the AdapterId for the POA handling the current request.
   virtual CORBA::OctetSeq * adapter_id (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the most derived interface of the target object.
   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));
 
   /// Return the policy of the given type in effect for the current
   /// request.
   virtual CORBA::Policy_ptr get_server_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      CORBA::PolicyType type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Insert data into the "request scope" PICurrent object.
   virtual void set_slot (
       PortableInterceptor::SlotId id,
-      const CORBA::Any & data,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const CORBA::Any & data
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
   /// Returns true if the target's type corresponds to the given
   /// RepositoryId.
   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));
 
   /// Add the IOP::ServiceContext to the reply (outgoing)
   /// IOP::ServiceContextList.
   virtual void add_reply_service_context (
       const IOP::ServiceContext & service_context,
-      CORBA::Boolean replace,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      CORBA::Boolean replace
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 public:
@@ -246,8 +246,8 @@ protected:
   /// Helper method to get the request and response service contexts.
   IOP::ServiceContext *get_service_context_i (
     TAO_Service_Context &service_context_list,
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
+    IOP::ServiceId id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
index 13192281737..971f0e6cf42 100644
--- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
@@ -35,25 +35,25 @@ TAO_Strategized_Object_Proxy_Broker::~TAO_Strategized_Object_Proxy_Broker (void)
 }
 
 TAO_Object_Proxy_Impl &
-TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr 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];
 }
 
 void
-TAO_Strategized_Object_Proxy_Broker::create_proxy (int strategy,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Strategized_Object_Proxy_Broker::create_proxy (int strategy
+                                                   TAO_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h
index 93837842a05..94e90a7dc65 100644
--- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h
@@ -43,13 +43,13 @@ public:
   TAO_Strategized_Object_Proxy_Broker (void);
   ~TAO_Strategized_Object_Proxy_Broker (void);
 
-  virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object,
-                                               CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object
+                                               TAO_ENV_ARG_DECL);
 
 private:
 
-  void create_proxy (int collocation_strategy,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void create_proxy (int collocation_strategy
+                     TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
index 227c3c0092d..c7de619af4e 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
@@ -22,8 +22,8 @@ TAO_ThruPOA_Object_Proxy_Impl::~TAO_ThruPOA_Object_Proxy_Impl (void)
 
 CORBA::Boolean
 TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
-                                      const CORBA::Char *logical_type_id,
-                                      CORBA_Environment &ACE_TRY_ENV)
+                                      const CORBA::Char *logical_type_id
+                                      TAO_ENV_ARG_DECL)
 {
   TAO_Object_Adapter::Servant_Upcall
     servant_upcall (target->_stubobj ()->servant_orb_var ()->orb_core ());
@@ -32,18 +32,18 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
   servant_upcall.prepare_for_upcall (
     target->_object_key (),
     "_is_a",
-    forward_to.out (),
-    ACE_TRY_ENV);
+    forward_to.out ()
+    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  return servant_upcall.servant ()->_is_a (logical_type_id, ACE_TRY_ENV);
+  return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
 }
 
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 CORBA::Boolean
-TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
-                                              CORBA_Environment &ACE_TRY_ENV)
+TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
+                                              TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
@@ -58,11 +58,11 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
       servant_upcall.prepare_for_upcall (
          target->_object_key (),
          "_non_existent",
-         forward_to.out (),
-         ACE_TRY_ENV);
+         forward_to.out ()
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      return servant_upcall.servant ()->_non_existent (ACE_TRY_ENV);
+      return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
@@ -78,8 +78,8 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
 }
 
 CORBA_InterfaceDef_ptr
-TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target,
-                                               CORBA_Environment &ACE_TRY_ENV)
+TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
+                                               TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -92,11 +92,11 @@ TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target,
       servant_upcall.prepare_for_upcall (
          target->_object_key (),
          "_get_interface",
-         forward_to.out (),
-         ACE_TRY_ENV);
+         forward_to.out ()
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      return servant_upcall.servant ()->_get_interface (ACE_TRY_ENV);
+      return servant_upcall.servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
index 93c0832c312..fdb1cf2225d 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
@@ -48,17 +48,17 @@ public:
   virtual ~TAO_ThruPOA_Object_Proxy_Impl (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
-                                const CORBA::Char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV);
+                                const CORBA::Char *logical_type_id
+                                TAO_ENV_ARG_DECL);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target,
-                                        CORBA_Environment &ACE_TRY_ENV);
+  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
+                                        TAO_ENV_ARG_DECL);
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      const CORBA::Object_ptr target,
-      CORBA_Environment &ACE_TRY_ENV
+      const CORBA::Object_ptr target
+      TAO_ENV_ARG_DECL
     );
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index 0f2b325646e..3b67e9c9fd6 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -25,12 +25,12 @@
   ACE_CHECK_RETURN (RETURN)
 
 #define TAO_POA_GUARD \
-  TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV); \
+  TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \
   ACE_UNUSED_ARG (poa_guard); \
   ACE_CHECK
 
 #define TAO_POA_GUARD_RETURN(RETURN) \
-  TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV); \
+  TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \
   ACE_UNUSED_ARG (poa_guard); \
   ACE_CHECK_RETURN (RETURN)
 
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 35ea0e01e23..4f48a3ad126 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -22,14 +22,14 @@ TAO_Profile::~TAO_Profile (void)
 }
 
 void
-TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component
+                                   TAO_ENV_ARG_DECL)
 {
   // Sanity checks.
-  this->verify_orb_configuration (ACE_TRY_ENV);
+  this->verify_orb_configuration (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->verify_profile_version (ACE_TRY_ENV);
+  this->verify_profile_version (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ----------------------------------------------------------------
@@ -39,8 +39,8 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component,
 }
 
 void
-TAO_Profile::policies (CORBA::PolicyList *policy_list,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Profile::policies (CORBA::PolicyList *policy_list
+                       TAO_ENV_ARG_DECL)
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -66,7 +66,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list,
     {
       TAO_OutputCDR out_CDR;
       policy_value_seq[i].ptype =
-        (*policy_list)[i]->policy_type (ACE_TRY_ENV);
+        (*policy_list)[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
@@ -121,14 +121,14 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list,
 #else /* TAO_HAS_CORBA_MESSAGING == 1 */
 
   ACE_UNUSED_ARG (policy_list);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);  // FUZZ: ignore check_for_ace_check
+  TAO_ENV_ARG_NOT_USED;  // FUZZ: ignore check_for_ace_check
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 }
 
 
 CORBA::PolicyList&
-TAO_Profile::policies (CORBA::Environment &)
+TAO_Profile::policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -187,8 +187,8 @@ TAO_Profile::policies (CORBA::Environment &)
                   policy =
                     this->orb_core_->orb ()->create_policy (
                       policy_value_seq[i].ptype,
-                      dummy_any,
-                      ACE_TRY_ENV);
+                      dummy_any
+                       TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (!CORBA::is_nil (policy.in ()))
@@ -254,7 +254,7 @@ TAO_Profile::the_stub (void)
 }
 
 void
-TAO_Profile::verify_orb_configuration (CORBA::Environment &ACE_TRY_ENV)
+TAO_Profile::verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL)
 {
   // If the ORB isn't configured to support tagged components, then
   // throw an exception.
@@ -285,7 +285,7 @@ TAO_Profile::verify_orb_configuration (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Profile::verify_profile_version (CORBA::Environment &ACE_TRY_ENV)
+TAO_Profile::verify_profile_version (TAO_ENV_SINGLE_ARG_DECL)
 {
   // GIOP 1.0 does not support tagged components.  Throw an exception
   // if the profile is a GIOP 1.0 profile.
@@ -337,8 +337,8 @@ TAO_Unknown_Profile::endpoint_count (void)
 }
 
 void
-TAO_Unknown_Profile::parse_string (const char *,
-                                   CORBA::Environment &)
+TAO_Unknown_Profile::parse_string (const char *
+                                   TAO_ENV_ARG_DECL_NOT_USED)
 {
   // @@ THROW something????
 }
@@ -350,7 +350,7 @@ TAO_Unknown_Profile::object_key_delimiter (void) const
 }
 
 char *
-TAO_Unknown_Profile::to_string (CORBA::Environment &)
+TAO_Unknown_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // @@ THROW something?
   return 0;
@@ -404,8 +404,8 @@ TAO_Unknown_Profile::is_equivalent (const TAO_Profile* other_profile)
 }
 
 CORBA::ULong
-TAO_Unknown_Profile::hash (CORBA::ULong max,
-                           CORBA::Environment &)
+TAO_Unknown_Profile::hash (CORBA::ULong max
+                           TAO_ENV_ARG_DECL_NOT_USED)
 {
   return (ACE::hash_pjw (ACE_reinterpret_cast (const char*,
                                                this->body_.get_buffer ()),
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index aec9ce39d85..802dde5ec97 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -78,20 +78,20 @@ public:
   TAO_Tagged_Components& tagged_components (void);
 
   /// Add the given tagged component to the profile.
-  void add_tagged_component (const IOP::TaggedComponent &component,
-                             CORBA::Environment &ACE_TRY_ENV);
+  void add_tagged_component (const IOP::TaggedComponent &component
+                             TAO_ENV_ARG_DECL);
 
   /// The object key delimiter.
   virtual char object_key_delimiter (void) const = 0;
 
   /// Initialize this object using the given input string.
   /// Supports URL style of object references
-  virtual void parse_string (const char *string,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void parse_string (const char *string
+                             TAO_ENV_ARG_DECL) = 0;
 
   /// Return a string representation for this profile.  client must
   /// deallocate memory.
-  virtual char* to_string (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual char* to_string (TAO_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr) = 0;
@@ -131,8 +131,8 @@ public:
   virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile) = 0;
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual CORBA::ULong hash (CORBA::ULong max
+                             TAO_ENV_ARG_DECL) = 0;
 
   /**
    * This method is used to get the IOP::TaggedProfile. The profile
@@ -146,11 +146,11 @@ public:
 
   /// This method sets the client exposed policies, i.e., the ones
   /// propagated in the IOR, for this profile.
-  virtual void policies (CORBA::PolicyList *policy_list,
-                         CORBA::Environment &ACE_TRY_ENV);
+  virtual void policies (CORBA::PolicyList *policy_list
+                         TAO_ENV_ARG_DECL);
 
   /// Accessor for the client exposed policies of this profile.
-  virtual CORBA::PolicyList&  policies (CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::PolicyList&  policies (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Sets the TAO_Stub to which this profile is associated.
   virtual void the_stub (TAO_Stub *stub);
@@ -165,11 +165,11 @@ private:
 
   /// Verify that the current ORB's configuration supports tagged
   /// components in IORs.
-  void verify_orb_configuration (CORBA::Environment &ACE_TRY_ENV);
+  void verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Verify that the given profile supports tagged components,
   /// i.e. is not a GIOP 1.0 profile.
-  void verify_profile_version (CORBA::Environment &ACE_TRY_ENV);
+  void verify_profile_version (TAO_ENV_SINGLE_ARG_DECL);
 
   // Profiles should not be copied!
   ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&))
@@ -241,10 +241,10 @@ public:
                        TAO_ORB_Core *orb_core);
 
   // = The TAO_Profile methods look above
-  virtual void parse_string (const char *string,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void parse_string (const char *string
+                             TAO_ENV_ARG_DECL);
   virtual char object_key_delimiter (void) const;
-  virtual char* to_string (CORBA::Environment &ACE_TRY_ENV);
+  virtual char* to_string (TAO_ENV_SINGLE_ARG_DECL);
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
   virtual int encode_endpoints (void);
@@ -253,8 +253,8 @@ public:
   virtual TAO_Endpoint *endpoint (void);
   virtual size_t endpoint_count (void);
   virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::ULong hash (CORBA::ULong max
+                             TAO_ENV_ARG_DECL);
   virtual IOP::TaggedProfile &create_tagged_profile (void);
 
 private:
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index cec2e1a4e2e..26ec85f7fd9 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -35,8 +35,8 @@ public:
   virtual ~TAO_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
-  virtual void init_hooks (TAO_ORB_Core *orb_core,
-                           CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual void init_hooks (TAO_ORB_Core *orb_core
+                           TAO_ENV_ARG_DECL) = 0;
 
   virtual int call_client_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
@@ -51,13 +51,13 @@ public:
 
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
-                                   CORBA::Boolean restart,
-                                   CORBA::Environment &ACE_TRY_ENV) = 0;
+                                   CORBA::Boolean restart
+                                   TAO_ENV_ARG_DECL) = 0;
 
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
-                                            CORBA::Short &client_priority,
-                                            CORBA::Environment &ACE_TRY_ENV) = 0;
+                                            CORBA::Short &client_priority
+                                            TAO_ENV_ARG_DECL) = 0;
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
@@ -77,32 +77,32 @@ public:
    * these operations are no-ops.
    */
   //@{
-  virtual int get_thread_CORBA_priority (CORBA::Short &,
-                                         CORBA::Environment &) = 0;
+  virtual int get_thread_CORBA_priority (CORBA::Short &
+                                         TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
-  virtual int get_thread_native_priority (CORBA::Short &,
-                                          CORBA::Environment &) = 0;
+  virtual int get_thread_native_priority (CORBA::Short &
+                                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
   virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                    CORBA::Short &,
-                                                    CORBA::Environment &) = 0;
+                                                    CORBA::Short &
+                                                    TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
-  virtual int set_thread_CORBA_priority (CORBA::Short,
-                                         CORBA::Environment &) = 0;
+  virtual int set_thread_CORBA_priority (CORBA::Short
+                                         TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
-  virtual int set_thread_native_priority (CORBA::Short,
-                                          CORBA::Environment &) = 0;
+  virtual int set_thread_native_priority (CORBA::Short
+                                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
 
   //@}
 
   /// Sets the default_policies for ORB.
   /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
   /// default RTCORBA policies: ClientProtocolPolicy.
-  virtual int set_default_policies (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Sets the default ServerProtocolPolicy.
-  virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
-                                                  CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
+                                                  TAO_ENV_ARG_DECL) = 0;
 
 };
 
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index 80729fcd828..9cba7514220 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -14,15 +14,15 @@ TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
 }
 
 TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj
+                                       TAO_ENV_ARG_DECL)
 {
-  return TAO_Priority_Mapping_Manager::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return TAO_Priority_Mapping_Manager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Priority_Mapping_Manager_ptr
-TAO_Priority_Mapping_Manager::_unchecked_narrow (CORBA::Object_ptr obj,
-                                                 CORBA::Environment &)
+TAO_Priority_Mapping_Manager::_unchecked_narrow (CORBA::Object_ptr obj
+                                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return TAO_Priority_Mapping_Manager::_nil ();
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index e9f9364fb90..3fa4907dd04 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -66,15 +66,13 @@ public:
   // the static operations
   static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj);
   static TAO_Priority_Mapping_Manager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static TAO_Priority_Mapping_Manager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static TAO_Priority_Mapping_Manager_ptr _nil (void)
     {
       return (TAO_Priority_Mapping_Manager_ptr)0;
@@ -126,7 +124,7 @@ public:
   static TAO_Priority_Mapping_Manager_ptr duplicate (TAO_Priority_Mapping_Manager_ptr);
   static void release (TAO_Priority_Mapping_Manager_ptr);
   static TAO_Priority_Mapping_Manager_ptr nil (void);
-  static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * upcast (void *);
 
 private:
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
index 1d50d20e192..145ef13c934 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
@@ -118,11 +118,11 @@ TAO_Priority_Mapping_Manager_var::nil (void)
 
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
 TAO_Priority_Mapping_Manager_var::narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::TAO_Priority_Mapping_Manager::_narrow (p, ACE_TRY_ENV);
+  return ::TAO_Priority_Mapping_Manager::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index 5cf1dcb6942..c17161d2278 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -506,11 +506,11 @@ tao_RTCORBA_PriorityModelPolicy_nil (
 
 RTCORBA::PriorityModelPolicy_ptr
 tao_RTCORBA_PriorityModelPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::PriorityModelPolicy::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::PriorityModelPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -573,7 +573,7 @@ RTCORBA::PriorityModelPolicy_var::operator const ::RTCORBA::PriorityModelPolicy_
   return this->ptr_;
 }
 
-RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast 
+RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -633,11 +633,11 @@ RTCORBA::PriorityModelPolicy_var::tao_nil (void)
 
 ::RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::PriorityModelPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::PriorityModelPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -718,16 +718,16 @@ RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 {}
 
 RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return PriorityModelPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PriorityModelPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -818,11 +818,11 @@ tao_RTCORBA_ThreadpoolPolicy_nil (
 
 RTCORBA::ThreadpoolPolicy_ptr
 tao_RTCORBA_ThreadpoolPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ThreadpoolPolicy::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::ThreadpoolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -885,7 +885,7 @@ RTCORBA::ThreadpoolPolicy_var::operator const ::RTCORBA::ThreadpoolPolicy_ptr &(
   return this->ptr_;
 }
 
-RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast 
+RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -945,11 +945,11 @@ RTCORBA::ThreadpoolPolicy_var::tao_nil (void)
 
 ::RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ThreadpoolPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::ThreadpoolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1030,16 +1030,16 @@ RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 {}
 
 RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ThreadpoolPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ThreadpoolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1126,11 +1126,11 @@ tao_RTCORBA_ProtocolProperties_nil (
 
 RTCORBA::ProtocolProperties_ptr
 tao_RTCORBA_ProtocolProperties_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::ProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1193,7 +1193,7 @@ RTCORBA::ProtocolProperties_var::operator const ::RTCORBA::ProtocolProperties_pt
   return this->ptr_;
 }
 
-RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast 
+RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1253,11 +1253,11 @@ RTCORBA::ProtocolProperties_var::tao_nil (void)
 
 ::RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::ProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1338,16 +1338,16 @@ RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
 RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1522,11 +1522,11 @@ tao_RTCORBA_ServerProtocolPolicy_nil (
 
 RTCORBA::ServerProtocolPolicy_ptr
 tao_RTCORBA_ServerProtocolPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ServerProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::ServerProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1589,7 +1589,7 @@ RTCORBA::ServerProtocolPolicy_var::operator const ::RTCORBA::ServerProtocolPolic
   return this->ptr_;
 }
 
-RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast 
+RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1649,11 +1649,11 @@ RTCORBA::ServerProtocolPolicy_var::tao_nil (void)
 
 ::RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ServerProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::ServerProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1734,16 +1734,16 @@ RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 {}
 
 RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ServerProtocolPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ServerProtocolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1834,11 +1834,11 @@ tao_RTCORBA_ClientProtocolPolicy_nil (
 
 RTCORBA::ClientProtocolPolicy_ptr
 tao_RTCORBA_ClientProtocolPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ClientProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::ClientProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1901,7 +1901,7 @@ RTCORBA::ClientProtocolPolicy_var::operator const ::RTCORBA::ClientProtocolPolic
   return this->ptr_;
 }
 
-RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast 
+RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1961,11 +1961,11 @@ RTCORBA::ClientProtocolPolicy_var::tao_nil (void)
 
 ::RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ClientProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::ClientProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2046,16 +2046,16 @@ RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
 RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return ClientProtocolPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ClientProtocolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2146,11 +2146,11 @@ tao_RTCORBA_PrivateConnectionPolicy_nil (
 
 RTCORBA::PrivateConnectionPolicy_ptr
 tao_RTCORBA_PrivateConnectionPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::PrivateConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::PrivateConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2213,7 +2213,7 @@ RTCORBA::PrivateConnectionPolicy_var::operator const ::RTCORBA::PrivateConnectio
   return this->ptr_;
 }
 
-RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast 
+RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2273,11 +2273,11 @@ RTCORBA::PrivateConnectionPolicy_var::tao_nil (void)
 
 ::RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::PrivateConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::PrivateConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2358,16 +2358,16 @@ RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
 RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return PrivateConnectionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PrivateConnectionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2454,11 +2454,11 @@ tao_RTCORBA_TCPProtocolProperties_nil (
 
 RTCORBA::TCPProtocolProperties_ptr
 tao_RTCORBA_TCPProtocolProperties_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::TCPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::TCPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2521,7 +2521,7 @@ RTCORBA::TCPProtocolProperties_var::operator const ::RTCORBA::TCPProtocolPropert
   return this->ptr_;
 }
 
-RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast 
+RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2581,11 +2581,11 @@ RTCORBA::TCPProtocolProperties_var::tao_nil (void)
 
 ::RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::TCPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::TCPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2681,16 +2681,16 @@ RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 {}
 
 RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return TCPProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return TCPProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2777,11 +2777,11 @@ tao_RTCORBA_GIOPProtocolProperties_nil (
 
 RTCORBA::GIOPProtocolProperties_ptr
 tao_RTCORBA_GIOPProtocolProperties_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::GIOPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::GIOPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2844,7 +2844,7 @@ RTCORBA::GIOPProtocolProperties_var::operator const ::RTCORBA::GIOPProtocolPrope
   return this->ptr_;
 }
 
-RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast 
+RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2904,11 +2904,11 @@ RTCORBA::GIOPProtocolProperties_var::tao_nil (void)
 
 ::RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::GIOPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::GIOPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2989,16 +2989,16 @@ RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 {}
 
 RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return GIOPProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return GIOPProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3085,11 +3085,11 @@ tao_RTCORBA_UnixDomainProtocolProperties_nil (
 
 RTCORBA::UnixDomainProtocolProperties_ptr
 tao_RTCORBA_UnixDomainProtocolProperties_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::UnixDomainProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::UnixDomainProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3152,7 +3152,7 @@ RTCORBA::UnixDomainProtocolProperties_var::operator const ::RTCORBA::UnixDomainP
   return this->ptr_;
 }
 
-RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast 
+RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3212,11 +3212,11 @@ RTCORBA::UnixDomainProtocolProperties_var::tao_nil (void)
 
 ::RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3297,16 +3297,16 @@ RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 {}
 
 RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return UnixDomainProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return UnixDomainProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3393,11 +3393,11 @@ tao_RTCORBA_SharedMemoryProtocolProperties_nil (
 
 RTCORBA::SharedMemoryProtocolProperties_ptr
 tao_RTCORBA_SharedMemoryProtocolProperties_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::SharedMemoryProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::SharedMemoryProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3460,7 +3460,7 @@ RTCORBA::SharedMemoryProtocolProperties_var::operator const ::RTCORBA::SharedMem
   return this->ptr_;
 }
 
-RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast 
+RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3520,11 +3520,11 @@ RTCORBA::SharedMemoryProtocolProperties_var::tao_nil (void)
 
 ::RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3605,16 +3605,16 @@ RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 {}
 
 RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return SharedMemoryProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return SharedMemoryProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3992,11 +3992,11 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_nil (
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 tao_RTCORBA_PriorityBandedConnectionPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4059,7 +4059,7 @@ RTCORBA::PriorityBandedConnectionPolicy_var::operator const ::RTCORBA::PriorityB
   return this->ptr_;
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast 
+RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -4119,11 +4119,11 @@ RTCORBA::PriorityBandedConnectionPolicy_var::tao_nil (void)
 
 ::RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4204,16 +4204,16 @@ RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return PriorityBandedConnectionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PriorityBandedConnectionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4300,11 +4300,11 @@ tao_RTCORBA_Current_nil (
 
 RTCORBA::Current_ptr
 tao_RTCORBA_Current_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::Current::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4367,7 +4367,7 @@ RTCORBA::Current_var::operator const ::RTCORBA::Current_ptr &() const // cast
   return this->ptr_;
 }
 
-RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast 
+RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -4427,11 +4427,11 @@ RTCORBA::Current_var::tao_nil (void)
 
 ::RTCORBA::Current_ptr
 RTCORBA::Current_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::Current::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4512,16 +4512,16 @@ RTCORBA::Current::~Current (void)
 {}
 
 RTCORBA::Current_ptr RTCORBA::Current::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Current::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::Current_ptr RTCORBA::Current::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4608,11 +4608,11 @@ tao_RTCORBA_Mutex_nil (
 
 RTCORBA::Mutex_ptr
 tao_RTCORBA_Mutex_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::Mutex::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::Mutex::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4675,7 +4675,7 @@ RTCORBA::Mutex_var::operator const ::RTCORBA::Mutex_ptr &() const // cast
   return this->ptr_;
 }
 
-RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast 
+RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -4735,11 +4735,11 @@ RTCORBA::Mutex_var::tao_nil (void)
 
 ::RTCORBA::Mutex_ptr
 RTCORBA::Mutex_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::Mutex::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::Mutex::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4820,16 +4820,16 @@ RTCORBA::Mutex::~Mutex (void)
 {}
 
 RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return Mutex::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return Mutex::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::Mutex_ptr RTCORBA::Mutex::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4904,11 +4904,11 @@ tao_RTCORBA_RTORB_nil (
 
 RTCORBA::RTORB_ptr
 tao_RTCORBA_RTORB_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTCORBA::RTORB::_narrow (p, ACE_TRY_ENV);
+  return RTCORBA::RTORB::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4971,7 +4971,7 @@ RTCORBA::RTORB_var::operator const ::RTCORBA::RTORB_ptr &() const // cast
   return this->ptr_;
 }
 
-RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast 
+RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -5031,11 +5031,11 @@ RTCORBA::RTORB_var::tao_nil (void)
 
 ::RTCORBA::RTORB_ptr
 RTCORBA::RTORB_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::RTORB::_narrow (p, ACE_TRY_ENV);
+  return ::RTCORBA::RTORB::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5116,16 +5116,16 @@ RTCORBA::RTORB::~RTORB (void)
 {}
 
 RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTORB::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return RTORB::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::RTORB_ptr RTCORBA::RTORB::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -5219,16 +5219,16 @@ void RTCORBA::RTORB::MutexNotFound::_raise ()
 }
 
 void RTCORBA::RTORB::MutexNotFound::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void RTCORBA::RTORB::MutexNotFound::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5287,16 +5287,16 @@ void RTCORBA::RTORB::InvalidThreadpool::_raise ()
 }
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &
+    TAO_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_InputCDR &
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5347,7 +5347,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::Threadpoo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLane, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLane TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5438,7 +5438,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::Threadpoo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLanes, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLanes TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5501,7 +5501,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::PriorityModel &
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityModel, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityModel TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5631,7 +5631,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBand, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBand TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5722,7 +5722,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBands, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBands TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 1b93e5bdf5a..f7ff8be6f89 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -175,15 +175,15 @@ TAO_NAMESPACE  RTCORBA
         const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void);
-    
+
       // = Accessors.
       ThreadpoolLane &operator[] (CORBA::ULong i);
       const ThreadpoolLane &operator[] (CORBA::ULong i) const;
-    
+
       // = Static operations.
       static ThreadpoolLane *allocbuf (CORBA::ULong size);
       static void freebuf (ThreadpoolLane *buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
@@ -236,7 +236,7 @@ TAO_NAMESPACE  RTCORBA
     typedef ThreadpoolLanes_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    
+
   };
 
 #endif /* end #if !defined */
@@ -322,7 +322,7 @@ TAO_NAMESPACE  RTCORBA
         CLIENT_PROPAGATED,
         SERVER_DECLARED
   };
-  
+
   typedef PriorityModel &PriorityModel_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityModel;
 
@@ -366,11 +366,11 @@ TAO_NAMESPACE  RTCORBA
     static void tao_release (PriorityModelPolicy_ptr);
     static PriorityModelPolicy_ptr tao_nil (void);
     static PriorityModelPolicy_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     PriorityModelPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -422,36 +422,32 @@ TAO_NAMESPACE  RTCORBA
 
     // the static operations
     static PriorityModelPolicy_ptr _duplicate (PriorityModelPolicy_ptr obj);
-    
+
     static PriorityModelPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static PriorityModelPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static PriorityModelPolicy_ptr _nil (void)
       {
         return (PriorityModelPolicy_ptr)0;
       }
 
     virtual RTCORBA::PriorityModel priority_model (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::Priority server_priority (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -464,7 +460,7 @@ TAO_NAMESPACE  RTCORBA
     PriorityModelPolicy ();
 
     virtual ~PriorityModelPolicy (void);
-  
+
   private:
     PriorityModelPolicy (const PriorityModelPolicy &);
     void operator= (const PriorityModelPolicy &);
@@ -515,11 +511,11 @@ TAO_NAMESPACE  RTCORBA
     static void tao_release (ThreadpoolPolicy_ptr);
     static ThreadpoolPolicy_ptr tao_nil (void);
     static ThreadpoolPolicy_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ThreadpoolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -571,28 +567,25 @@ TAO_NAMESPACE  RTCORBA
 
     // the static operations
     static ThreadpoolPolicy_ptr _duplicate (ThreadpoolPolicy_ptr obj);
-    
+
     static ThreadpoolPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ThreadpoolPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ThreadpoolPolicy_ptr _nil (void)
       {
         return (ThreadpoolPolicy_ptr)0;
       }
 
     virtual RTCORBA::ThreadpoolId threadpool (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -605,7 +598,7 @@ TAO_NAMESPACE  RTCORBA
     ThreadpoolPolicy ();
 
     virtual ~ThreadpoolPolicy (void);
-  
+
   private:
     ThreadpoolPolicy (const ThreadpoolPolicy &);
     void operator= (const ThreadpoolPolicy &);
@@ -654,11 +647,11 @@ TAO_NAMESPACE  RTCORBA
     static void tao_release (ProtocolProperties_ptr);
     static ProtocolProperties_ptr tao_nil (void);
     static ProtocolProperties_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -697,7 +690,7 @@ TAO_NAMESPACE  RTCORBA
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
 
-class TAO_RTCORBA_Export ProtocolProperties 
+class TAO_RTCORBA_Export ProtocolProperties
   : public virtual CORBA_Object,
     public TAO_Encodable
   {
@@ -711,19 +704,17 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-    
+
     static ProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ProtocolProperties_ptr _nil (void)
       {
         return (ProtocolProperties_ptr)0;
@@ -742,7 +733,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     ProtocolProperties ();
 
     virtual ~ProtocolProperties (void);
-  
+
   private:
     ProtocolProperties (const ProtocolProperties &);
     void operator= (const ProtocolProperties &);
@@ -764,7 +755,7 @@ class TAO_RTCORBA_Export ProtocolProperties
         IOP::ProfileId protocol_type;
     ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) orb_protocol_properties;
     ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) transport_protocol_properties;
-    
+
   };
 
   class TAO_RTCORBA_Export Protocol_var
@@ -841,15 +832,15 @@ class TAO_RTCORBA_Export ProtocolProperties
         const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void);
-    
+
       // = Accessors.
       Protocol &operator[] (CORBA::ULong i);
       const Protocol &operator[] (CORBA::ULong i) const;
-    
+
       // = Static operations.
       static Protocol *allocbuf (CORBA::ULong size);
       static void freebuf (Protocol *buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
@@ -902,7 +893,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     typedef ProtocolList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    
+
   };
 
 #endif /* end #if !defined */
@@ -1018,11 +1009,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (ServerProtocolPolicy_ptr);
     static ServerProtocolPolicy_ptr tao_nil (void);
     static ServerProtocolPolicy_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ServerProtocolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1074,28 +1065,25 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
-    
+
     static ServerProtocolPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ServerProtocolPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ServerProtocolPolicy_ptr _nil (void)
       {
         return (ServerProtocolPolicy_ptr)0;
       }
 
     virtual RTCORBA::ProtocolList * protocols (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1108,7 +1096,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     ServerProtocolPolicy ();
 
     virtual ~ServerProtocolPolicy (void);
-  
+
   private:
     ServerProtocolPolicy (const ServerProtocolPolicy &);
     void operator= (const ServerProtocolPolicy &);
@@ -1159,11 +1147,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (ClientProtocolPolicy_ptr);
     static ClientProtocolPolicy_ptr tao_nil (void);
     static ClientProtocolPolicy_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ClientProtocolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1215,28 +1203,25 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
-    
+
     static ClientProtocolPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ClientProtocolPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static ClientProtocolPolicy_ptr _nil (void)
       {
         return (ClientProtocolPolicy_ptr)0;
       }
 
     virtual RTCORBA::ProtocolList * protocols (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1249,7 +1234,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     ClientProtocolPolicy ();
 
     virtual ~ClientProtocolPolicy (void);
-  
+
   private:
     ClientProtocolPolicy (const ClientProtocolPolicy &);
     void operator= (const ClientProtocolPolicy &);
@@ -1300,11 +1285,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (PrivateConnectionPolicy_ptr);
     static PrivateConnectionPolicy_ptr tao_nil (void);
     static PrivateConnectionPolicy_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     PrivateConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1356,19 +1341,17 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
-    
+
     static PrivateConnectionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static PrivateConnectionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static PrivateConnectionPolicy_ptr _nil (void)
       {
         return (PrivateConnectionPolicy_ptr)0;
@@ -1382,7 +1365,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     PrivateConnectionPolicy ();
 
     virtual ~PrivateConnectionPolicy (void);
-  
+
   private:
     PrivateConnectionPolicy (const PrivateConnectionPolicy &);
     void operator= (const PrivateConnectionPolicy &);
@@ -1431,11 +1414,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (TCPProtocolProperties_ptr);
     static TCPProtocolProperties_ptr tao_nil (void);
     static TCPProtocolProperties_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     TCPProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1487,105 +1470,93 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static TCPProtocolProperties_ptr _duplicate (TCPProtocolProperties_ptr obj);
-    
+
     static TCPProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static TCPProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static TCPProtocolProperties_ptr _nil (void)
       {
         return (TCPProtocolProperties_ptr)0;
       }
 
     virtual CORBA::Long send_buffer_size (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void send_buffer_size (
-        CORBA::Long send_buffer_size,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Long send_buffer_size
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Long recv_buffer_size (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void recv_buffer_size (
-        CORBA::Long recv_buffer_size,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Long recv_buffer_size
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean keep_alive (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void keep_alive (
-        CORBA::Boolean keep_alive,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean keep_alive
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean dont_route (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void dont_route (
-        CORBA::Boolean dont_route,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean dont_route
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean no_delay (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void no_delay (
-        CORBA::Boolean no_delay,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean no_delay
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1598,7 +1569,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     TCPProtocolProperties ();
 
     virtual ~TCPProtocolProperties (void);
-  
+
   private:
     TCPProtocolProperties (const TCPProtocolProperties &);
     void operator= (const TCPProtocolProperties &);
@@ -1647,11 +1618,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (GIOPProtocolProperties_ptr);
     static GIOPProtocolProperties_ptr tao_nil (void);
     static GIOPProtocolProperties_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     GIOPProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1703,19 +1674,17 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static GIOPProtocolProperties_ptr _duplicate (GIOPProtocolProperties_ptr obj);
-    
+
     static GIOPProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static GIOPProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static GIOPProtocolProperties_ptr _nil (void)
       {
         return (GIOPProtocolProperties_ptr)0;
@@ -1729,7 +1698,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     GIOPProtocolProperties ();
 
     virtual ~GIOPProtocolProperties (void);
-  
+
   private:
     GIOPProtocolProperties (const GIOPProtocolProperties &);
     void operator= (const GIOPProtocolProperties &);
@@ -1778,11 +1747,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (UnixDomainProtocolProperties_ptr);
     static UnixDomainProtocolProperties_ptr tao_nil (void);
     static UnixDomainProtocolProperties_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     UnixDomainProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1834,54 +1803,48 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj);
-    
+
     static UnixDomainProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static UnixDomainProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static UnixDomainProtocolProperties_ptr _nil (void)
       {
         return (UnixDomainProtocolProperties_ptr)0;
       }
 
     virtual CORBA::Long send_buffer_size (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void send_buffer_size (
-        CORBA::Long send_buffer_size,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Long send_buffer_size
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Long recv_buffer_size (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void recv_buffer_size (
-        CORBA::Long recv_buffer_size,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Long recv_buffer_size
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1894,7 +1857,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     UnixDomainProtocolProperties ();
 
     virtual ~UnixDomainProtocolProperties (void);
-  
+
   private:
     UnixDomainProtocolProperties (const UnixDomainProtocolProperties &);
     void operator= (const UnixDomainProtocolProperties &);
@@ -1943,11 +1906,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (SharedMemoryProtocolProperties_ptr);
     static SharedMemoryProtocolProperties_ptr tao_nil (void);
     static SharedMemoryProtocolProperties_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     SharedMemoryProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1999,71 +1962,63 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj);
-    
+
     static SharedMemoryProtocolProperties_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static SharedMemoryProtocolProperties_ptr _nil (void)
       {
         return (SharedMemoryProtocolProperties_ptr)0;
       }
 
     virtual CORBA::Long preallocate_buffer_size (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void preallocate_buffer_size (
-        CORBA::Long preallocate_buffer_size,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Long preallocate_buffer_size
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * mmap_filename (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void mmap_filename (
-        const char * mmap_filename,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const char * mmap_filename
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * mmap_lockname (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void mmap_lockname (
-        const char * mmap_lockname,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const char * mmap_lockname
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2076,7 +2031,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     SharedMemoryProtocolProperties ();
 
     virtual ~SharedMemoryProtocolProperties (void);
-  
+
   private:
     SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &);
     void operator= (const SharedMemoryProtocolProperties &);
@@ -2099,7 +2054,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     ACE_NESTED_CLASS (RTCORBA, Priority) low;
     ACE_NESTED_CLASS (RTCORBA, Priority) high;
-    
+
   };
 
   class TAO_RTCORBA_Export PriorityBand_var
@@ -2164,15 +2119,15 @@ class TAO_RTCORBA_Export ProtocolProperties
         const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs
       );
     virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void);
-    
+
       // = Accessors.
       PriorityBand &operator[] (CORBA::ULong i);
       const PriorityBand &operator[] (CORBA::ULong i) const;
-    
+
       // = Static operations.
       static PriorityBand *allocbuf (CORBA::ULong size);
       static void freebuf (PriorityBand *buffer);
-    
+
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
@@ -2225,7 +2180,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     typedef PriorityBands_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    
+
   };
 
 #endif /* end #if !defined */
@@ -2346,11 +2301,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (PriorityBandedConnectionPolicy_ptr);
     static PriorityBandedConnectionPolicy_ptr tao_nil (void);
     static PriorityBandedConnectionPolicy_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     PriorityBandedConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2402,28 +2357,25 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
-    
+
     static PriorityBandedConnectionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static PriorityBandedConnectionPolicy_ptr _nil (void)
       {
         return (PriorityBandedConnectionPolicy_ptr)0;
       }
 
     virtual RTCORBA::PriorityBands * priority_bands (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2436,7 +2388,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     PriorityBandedConnectionPolicy ();
 
     virtual ~PriorityBandedConnectionPolicy (void);
-  
+
   private:
     PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
     void operator= (const PriorityBandedConnectionPolicy &);
@@ -2485,11 +2437,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (Current_ptr);
     static Current_ptr tao_nil (void);
     static Current_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2541,37 +2493,33 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
 
     virtual RTCORBA::Priority the_priority (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void the_priority (
-        RTCORBA::Priority the_priority,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::Priority the_priority
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2584,7 +2532,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     Current ();
 
     virtual ~Current (void);
-  
+
   private:
     Current (const Current &);
     void operator= (const Current &);
@@ -2633,11 +2581,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (Mutex_ptr);
     static Mutex_ptr tao_nil (void);
     static Mutex_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Mutex_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2689,45 +2637,40 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static Mutex_ptr _duplicate (Mutex_ptr obj);
-    
+
     static Mutex_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static Mutex_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static Mutex_ptr _nil (void)
       {
         return (Mutex_ptr)0;
       }
 
     virtual void lock (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void unlock (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean try_lock (
-        TimeBase::TimeT max_wait,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TimeBase::TimeT max_wait
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2740,7 +2683,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     Mutex ();
 
     virtual ~Mutex (void);
-  
+
   private:
     Mutex (const Mutex &);
     void operator= (const Mutex &);
@@ -2789,11 +2732,11 @@ class TAO_RTCORBA_Export ProtocolProperties
     static void tao_release (RTORB_ptr);
     static RTORB_ptr tao_nil (void);
     static RTORB_ptr tao_narrow (
-        CORBA::Object *,
-        CORBA::Environment &
+        CORBA::Object *
+        TAO_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     RTORB_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2845,37 +2788,33 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     // the static operations
     static RTORB_ptr _duplicate (RTORB_ptr obj);
-    
+
     static RTORB_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static RTORB_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
     static RTORB_ptr _nil (void)
       {
         return (RTORB_ptr)0;
       }
 
     virtual RTCORBA::Mutex_ptr create_mutex (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void destroy_mutex (
-        RTCORBA::Mutex_ptr the_mutex,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::Mutex_ptr the_mutex
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2902,13 +2841,13 @@ class TAO_RTCORBA_Export ProtocolProperties
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static MutexNotFound *_downcast (CORBA::Exception *);
@@ -2923,19 +2862,17 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
-        CORBA::Boolean_out created_flag,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean_out created_flag
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::Mutex_ptr open_named_mutex (
-        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,
         RTCORBA::RTORB::MutexNotFound
@@ -2946,10 +2883,9 @@ class TAO_RTCORBA_Export ProtocolProperties
         CORBA::Long recv_buffer_size,
         CORBA::Boolean keep_alive,
         CORBA::Boolean dont_route,
-        CORBA::Boolean no_delay,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Boolean no_delay
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -2976,13 +2912,13 @@ class TAO_RTCORBA_Export ProtocolProperties
       virtual void _raise (void);
 
       virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
+          TAO_OutputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
+          TAO_InputCDR &
+          TAO_ENV_ARG_DECL_NOT_USED
         );
 
       static InvalidThreadpool *_narrow (CORBA::Exception *);
@@ -3002,10 +2938,9 @@ class TAO_RTCORBA_Export ProtocolProperties
         RTCORBA::Priority default_priority,
         CORBA::Boolean allow_request_buffering,
         CORBA::ULong max_buffered_requests,
-        CORBA::ULong max_request_buffer_size,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::ULong max_request_buffer_size
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -3016,19 +2951,17 @@ class TAO_RTCORBA_Export ProtocolProperties
         CORBA::Boolean allow_borrowing,
         CORBA::Boolean allow_request_buffering,
         CORBA::ULong max_buffered_requests,
-        CORBA::ULong max_request_buffer_size,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::ULong max_request_buffer_size
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void destroy_threadpool (
-        RTCORBA::ThreadpoolId threadpool,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::ThreadpoolId threadpool
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         RTCORBA::RTORB::InvalidThreadpool
@@ -3036,54 +2969,48 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
         RTCORBA::PriorityModel priority_model,
-        RTCORBA::Priority server_priority,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::Priority server_priority
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
-        RTCORBA::ThreadpoolId threadpool,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::ThreadpoolId threadpool
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
-        const RTCORBA::PriorityBands & priority_bands,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const RTCORBA::PriorityBands & priority_bands
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
-        const RTCORBA::ProtocolList & protocols,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const RTCORBA::ProtocolList & protocols
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
-        const RTCORBA::ProtocolList & protocols,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        const RTCORBA::ProtocolList & protocols
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -3096,7 +3023,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     RTORB ();
 
     virtual ~RTORB (void);
-  
+
   private:
     RTORB (const RTORB &);
     void operator= (const RTORB &);
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index 87be7a060b6..f49b60d835a 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -28,16 +28,16 @@ TAO_RT_Current::~TAO_RT_Current (void)
 }
 
 RTCORBA::Priority
-TAO_RT_Current::the_priority (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Current::the_priority (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::Priority priority;
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_TRY_ENV);
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  int result = tph->get_thread_CORBA_priority (priority,
-                                               ACE_TRY_ENV);
+  int result = tph->get_thread_CORBA_priority (priority
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == -1)
@@ -47,16 +47,16 @@ TAO_RT_Current::the_priority (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_RT_Current::the_priority (RTCORBA::Priority the_priority,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Current::the_priority (RTCORBA::Priority the_priority
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_TRY_ENV);
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  int result = tph->set_thread_CORBA_priority (the_priority,
-                                               ACE_TRY_ENV);
+  int result = tph->set_thread_CORBA_priority (the_priority
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == -1)
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 856e3d63706..074c77428da 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -50,14 +50,11 @@ public:
   /// Default constructor.
   TAO_RT_Current (TAO_ORB_Core *orb_core);
 
-  virtual RTCORBA::Priority the_priority (CORBA::Environment
-                                          &ACE_TRY_ENV =
-                                          TAO_default_environment ())
+  virtual RTCORBA::Priority the_priority (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void the_priority (RTCORBA::Priority the_priority,
-                             CORBA::Environment &ACE_TRY_ENV =
-                             TAO_default_environment ())
+  virtual void the_priority (RTCORBA::Priority the_priority
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index 425c34bee14..515421473a5 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -42,8 +42,8 @@ RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
 }
 
 TAO_Invocation_Endpoint_Selector *
-RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation,
-                                             CORBA::Environment &ACE_TRY_ENV)
+RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation
+                                             TAO_ENV_ARG_DECL)
 {
   // Initialize selection state with all RTCORBA policies affecting
   // endpoint selection.
@@ -64,17 +64,17 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation,
     }
 
   CORBA::Policy_var priority_model_policy =
-    rt_stub->exposed_priority_model (ACE_TRY_ENV);
+    rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   //  state.private_connection_ =
   //   rt_stub->private_connection ();
 
   CORBA::Policy_var client_protocol_policy =
-    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation, ACE_TRY_ENV);
+    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation, ACE_TRY_ENV);
+  CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   //
@@ -106,7 +106,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation,
   CORBA::Short server_priority = 0;
   CORBA::Boolean is_client_propagated = 0;
 
-  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   tph->get_selector_hook (priority_model_policy.in (),
@@ -144,8 +144,8 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation,
 
 void
 RT_Endpoint_Selector_Factory::
-init_client_protocol (TAO_GIOP_Invocation *,
-                      CORBA::Environment &)
+init_client_protocol (TAO_GIOP_Invocation *
+                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RT_Endpoint_Selector_Factory:init_client_protocol - Is deprecated!")));
   /*
@@ -155,7 +155,7 @@ init_client_protocol (TAO_GIOP_Invocation *,
   ACE_TRY
     {
       invocation->endpoint_selection_state_.client_protocol_policy_ =
-        rt_stub->effective_client_protocol (ACE_TRY_ENV);
+        rt_stub->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
index 9d73b7392a1..1efa78fc1d7 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -64,8 +64,8 @@ public:
   /// Get an Invocation's endpoint selection strategy and
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
-                             TAO_GIOP_Invocation *invocation,
-                             CORBA::Environment &ACE_TRY_ENV);
+                             TAO_GIOP_Invocation *invocation
+                             TAO_ENV_ARG_DECL);
 
 protected:
 
@@ -73,13 +73,13 @@ protected:
 
   /// Initializes RTCORBA::ClientProtocolPolicy in the endpoint
   /// selection state.
-  void init_client_protocol (TAO_GIOP_Invocation *invocation,
-                             CORBA::Environment &ACE_TRY_ENV);
+  void init_client_protocol (TAO_GIOP_Invocation *invocation
+                             TAO_ENV_ARG_DECL);
 
   /// Initializes RTCORBA::PriorityBandsPolicy in the endpoint
   /// selection state.
   //  void init_bands (TAO_GIOP_Invocation *invocation,
-  //                 CORBA::Environment &ACE_TRY_ENV);
+  //                 TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The possible endpoint selector strategies that can be
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index 9ba2b8b9c7c..a40e7fa42b6 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -10,8 +10,8 @@ ACE_RCSID(tao, RT_Endpoint_Utils, "$Id$")
 // ****************************************************************
 
 CORBA::Policy *
-TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation,
-                                              CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation
+                                              TAO_ENV_ARG_DECL)
 {
   CORBA::Policy *bands_policy = CORBA::Policy::_nil ();
   TAO_RT_Stub *rt_stub =
@@ -20,7 +20,7 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation,
   ACE_TRY
     {
       bands_policy =
-        rt_stub->effective_priority_banded_connection (ACE_TRY_ENV);
+        rt_stub->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
@@ -40,8 +40,8 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation,
 }
 
 CORBA::Policy *
-TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation,
-                                               CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation
+                                               TAO_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub =
     ACE_dynamic_cast (TAO_RT_Stub *, invocation->stub ());
@@ -49,7 +49,7 @@ TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation,
   CORBA::Policy *retval = 0;
   ACE_TRY
     {
-      retval = rt_stub->effective_client_protocol (ACE_TRY_ENV);
+      retval = rt_stub->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
index ca20b0de1d0..26f39e1d7d8 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
@@ -36,11 +36,11 @@ class TAO_GIOP_Invocation;
 class TAO_RTCORBA_Export TAO_RT_Endpoint_Utils
 {
 public:
-  static CORBA::Policy *priority_bands_policy (TAO_GIOP_Invocation *invocation,
-                                               CORBA::Environment &ACE_TRY_ENV);
+  static CORBA::Policy *priority_bands_policy (TAO_GIOP_Invocation *invocation
+                                               TAO_ENV_ARG_DECL);
 
-  static CORBA::Policy *client_protocol_policy (TAO_GIOP_Invocation *invocation,
-                                                CORBA::Environment &ACE_TRY_ENV);
+  static CORBA::Policy *client_protocol_policy (TAO_GIOP_Invocation *invocation
+                                                TAO_ENV_ARG_DECL);
 
 private:
   /// ctor.
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 1d75ca7f3cf..707bc3fe74e 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -23,8 +23,8 @@ ACE_RCSID(tao, RT_Invocation_Endpoint_Selectors, "$Id$")
 // ****************************************************************
 
 void
-TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
+                                                   TAO_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub =
     ACE_dynamic_cast (TAO_RT_Stub *,
@@ -44,14 +44,14 @@ TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocati
               TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                              ACE_reinterpret_cast (long, invocation->stub ()));
 
-              status = invocation->perform_call (private_desc, ACE_TRY_ENV);
+              status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
           else
             {
               TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-              status = invocation->perform_call (default_desc, ACE_TRY_ENV);
+              status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
@@ -75,19 +75,19 @@ TAO_Priority_Endpoint_Selector::~TAO_Priority_Endpoint_Selector (void)
 }
 
 void
-TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation,
-                                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
+                                                 TAO_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
                                            invocation->stub ());
   CORBA::Short client_priority;
 
   // Get client priority.
-  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (tph->get_thread_CORBA_priority (client_priority,
-                                      ACE_TRY_ENV)
+  if (tph->get_thread_CORBA_priority (client_priority
+                                      TAO_ENV_ARG_PARAMETER)
       == -1)
     ACE_THROW (CORBA::DATA_CONVERSION (1,
                CORBA::COMPLETED_NO));
@@ -158,7 +158,7 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
                 {
                   if (invocation->inconsistent_policies ().ptr ())
                     {
-                      CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (ACE_TRY_ENV);
+                      CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
                       ACE_CHECK;
 
                       invocation->inconsistent_policies ()->length (1);
@@ -177,14 +177,14 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
           TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                          ACE_reinterpret_cast (long, invocation->stub ()));
 
-          status = invocation->perform_call (private_desc, ACE_TRY_ENV);
+          status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
           TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-          status = invocation->perform_call (default_desc, ACE_TRY_ENV);
+          status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -222,22 +222,22 @@ TAO_Bands_Endpoint_Selector::~TAO_Bands_Endpoint_Selector (void)
 }
 
 void
-TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation,
-                                              CORBA::Environment &ACE_TRY_ENV)
+TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
+                                              TAO_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
                                            invocation->stub ());
   TAO_Protocols_Hooks *protocol_hooks =
-    invocation->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+    invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation,
-                                                                              ACE_TRY_ENV);
+  CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation
+                                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Figure out target priority.
   CORBA::Policy_var priority_model_policy =
-    rt_stub->exposed_priority_model (ACE_TRY_ENV);
+    rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Short server_priority = 0;
@@ -254,8 +254,8 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation,
       // Get Client priority.
 
       int status =
-        protocol_hooks->get_thread_CORBA_priority (p, // side effect
-                                                   ACE_TRY_ENV);
+        protocol_hooks->get_thread_CORBA_priority (p  // side effect
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (status == -1)
         {
@@ -366,14 +366,14 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation,
           TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                          ACE_reinterpret_cast (long, invocation->stub ()));
 
-          status = invocation->perform_call (private_desc, ACE_TRY_ENV);
+          status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
           TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-          status = invocation->perform_call (default_desc, ACE_TRY_ENV);
+          status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -399,16 +399,16 @@ TAO_Protocol_Endpoint_Selector::~TAO_Protocol_Endpoint_Selector (void)
 
 void
 TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation
-                                                 *invocation,
-                                                 CORBA::Environment &ACE_TRY_ENV)
+                                                 *invocation
+                                                 TAO_ENV_ARG_DECL)
 {
   /// Narrow down to the right policy.
   CORBA::Policy_var cp =
-    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation, ACE_TRY_ENV);
+    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::ClientProtocolPolicy_var cp_policy =
-    RTCORBA::ClientProtocolPolicy::_narrow (cp.in (), ACE_TRY_ENV);
+    RTCORBA::ClientProtocolPolicy::_narrow (cp.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   /// Cast to TAO_ClientProtocolPolicy
@@ -454,14 +454,14 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation
                   TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                                  ACE_reinterpret_cast (long, invocation->stub ()));
 
-                  status = invocation->perform_call (private_desc, ACE_TRY_ENV);
+                  status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
                   ACE_CHECK;
                 }
               else
                 {
                   TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-                  status = invocation->perform_call (default_desc, ACE_TRY_ENV);
+                  status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
                   ACE_CHECK;
                 }
 
@@ -497,8 +497,8 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation
 
 void
 TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation
-                                     *,
-                                     CORBA::Environment &)
+                                     *
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("You Are not Suppesed to call: TAO_Protocol_Endpoint_Selector::next!!!\n")));
   //  invocation->profile_index ()++;
@@ -509,8 +509,8 @@ TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation
 void
 TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation
                                         *invocation,
-                                         const TAO_MProfile& /* mprofile */,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                         const TAO_MProfile& /* mprofile */
+                                        TAO_ENV_ARG_DECL)
 {
   // Location forwarding is currently not supported when using
   // RTCORBA::ClientProtocolPolicy.  With the current profile
@@ -522,7 +522,7 @@ TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation
   // a location forward reply, we act as if the profile we used
   // didn't work, and we try the next one.  Should we throw not
   // supported exception instead?
-  this->next (invocation, ACE_TRY_ENV);
+  this->next (invocation TAO_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index 32dee2d0702..af531a3c749 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -42,8 +42,8 @@ class TAO_RTCORBA_Export TAO_RT_Default_Endpoint_Selector :
   public TAO_Default_Endpoint_Selector
 {
 public:
-  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation
+                                TAO_ENV_ARG_DECL);
 };
 
 // ****************************************************************
@@ -67,8 +67,8 @@ public:
   /// Destructor.
   virtual ~TAO_Priority_Endpoint_Selector (void);
 
-  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation
+                                TAO_ENV_ARG_DECL);
 private:
   /// Helper for <select_endpoint>.
   int is_multihomed (TAO_Endpoint *endpoint);
@@ -95,8 +95,8 @@ public:
   /// Destructor.
   virtual ~TAO_Bands_Endpoint_Selector (void);
 
-  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation
+                                TAO_ENV_ARG_DECL);
 };
 
 // ****************************************************************
@@ -121,13 +121,13 @@ public:
   /// Destructor.
   virtual ~TAO_Protocol_Endpoint_Selector (void);
 
-  virtual void select_endpoint (TAO_GIOP_Invocation *invocation,
-                                CORBA::Environment &ACE_TRY_ENV);
-  virtual void next (TAO_GIOP_Invocation *invocation,
-                     CORBA::Environment &ACE_TRY_ENV);
+  virtual void select_endpoint (TAO_GIOP_Invocation *invocation
+                                TAO_ENV_ARG_DECL);
+  virtual void next (TAO_GIOP_Invocation *invocation
+                     TAO_ENV_ARG_DECL);
   virtual void forward (TAO_GIOP_Invocation *invocation,
-                        const TAO_MProfile &mprofile,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        const TAO_MProfile &mprofile
+                        TAO_ENV_ARG_DECL);
   virtual void success (TAO_GIOP_Invocation *invocation);
   virtual void close_connection (TAO_GIOP_Invocation *invocation);
 };
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 57e18ff2942..48c3e5c36d4 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -13,7 +13,7 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void)
 }
 
 void
-TAO_RT_Mutex::lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Mutex::lock (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.acquire () != 0)
@@ -21,7 +21,7 @@ TAO_RT_Mutex::lock (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_RT_Mutex::unlock (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Mutex::unlock (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.release () != 0)
@@ -29,8 +29,8 @@ TAO_RT_Mutex::unlock (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Boolean
-TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time,
-                        CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result;
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index c16cb59a3b7..e045ad430a6 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -56,13 +56,11 @@ public:
   virtual ~TAO_RT_Mutex (void);
 
   /// Acquire the lock.
-  virtual void lock (CORBA::Environment &ACE_TRY_ENV =
-                     TAO_default_environment ())
+  virtual void lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Release the lock.
-  virtual void unlock (CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ())
+  virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -71,9 +69,8 @@ public:
    * if you're interested in writing maximally portable programs avoid
    * using this operation in your program designs.
    */
-  virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait,
-                                   CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+  virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the name of the mutex.
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 037fa0238ba..410cdedadfd 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -34,41 +34,41 @@ TAO_RT_ORB::~TAO_RT_ORB (void)
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::create_mutex (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::create_mutex (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->mutex_mgr_.create_mutex (ACE_TRY_ENV);
+  return this->mutex_mgr_.create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->mutex_mgr_.destroy_mutex (mutex,
-                                  ACE_TRY_ENV);
+  this->mutex_mgr_.destroy_mutex (mutex
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 
 RTCORBA::Mutex_ptr
 TAO_RT_ORB::create_named_mutex (const char *name,
-                                CORBA::Boolean_out created_flag,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Boolean_out created_flag
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mutex_mgr_.create_named_mutex (name,
-                                              created_flag,
-                                              ACE_TRY_ENV);
+                                              created_flag
+                                              TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::open_named_mutex (const char *name,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::open_named_mutex (const char *name
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::MutexNotFound))
 {
-  return this->mutex_mgr_.open_named_mutex (name,
-                                            ACE_TRY_ENV);
+  return this->mutex_mgr_.open_named_mutex (name
+                                            TAO_ENV_ARG_PARAMETER);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -82,7 +82,7 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_mutex (CORBA::Environment &ACE_TRY_ENV)
+TAO_Named_RT_Mutex_Manager::create_mutex (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RT_Mutex *mutex = 0;
@@ -102,8 +102,8 @@ TAO_Named_RT_Mutex_Manager::create_mutex (CORBA::Environment &ACE_TRY_ENV)
 // as also indicated by the comment below.
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
 void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RT_Mutex *tao_mutex =
@@ -131,8 +131,8 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex,
 }
 #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr,
-                                           CORBA::Environment &)
+TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr
+                                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -140,8 +140,8 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr,
 
 RTCORBA::Mutex_ptr
 TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
-                                                CORBA::Boolean_out created_flag,
-                                                CORBA::Environment &ACE_TRY_ENV)
+                                                CORBA::Boolean_out created_flag
+                                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
@@ -198,8 +198,8 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name,
-                                              CORBA::Environment &ACE_TRY_ENV)
+TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name
+                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::MutexNotFound))
 {
@@ -234,8 +234,8 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                             CORBA::Long recv_buffer_size,
                                             CORBA::Boolean keep_alive,
                                             CORBA::Boolean dont_route,
-                                            CORBA::Boolean no_delay,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Boolean no_delay
+                                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException ))
 {
   TAO_TCP_Properties *tmp;
@@ -259,8 +259,8 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                RTCORBA::Priority default_priority,
                                CORBA::Boolean allow_request_buffering,
                                CORBA::ULong max_buffered_requests,
-                               CORBA::ULong max_request_buffer_size,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::ULong max_request_buffer_size
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool (stacksize,
@@ -269,8 +269,8 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                                default_priority,
                                                allow_request_buffering,
                                                max_buffered_requests,
-                                               max_request_buffer_size,
-                                               ACE_TRY_ENV);
+                                               max_request_buffer_size
+                                               TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -279,8 +279,8 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                           CORBA::Boolean allow_borrowing,
                                           CORBA::Boolean allow_request_buffering,
                                           CORBA::ULong max_buffered_requests,
-                                          CORBA::ULong max_request_buffer_size,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::ULong max_request_buffer_size
+                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool_with_lanes (stacksize,
@@ -288,24 +288,24 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                           allow_borrowing,
                                                           allow_request_buffering,
                                                           max_buffered_requests,
-                                                          max_request_buffer_size,
-                                                          ACE_TRY_ENV);
+                                                          max_request_buffer_size
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
-  this->tp_manager_->destroy_threadpool (threadpool,
-                                         ACE_TRY_ENV);
+  this->tp_manager_->destroy_threadpool (threadpool
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
 TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
-                                          RTCORBA::Priority server_priority,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          RTCORBA::Priority server_priority
+                                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy *tmp;
@@ -319,8 +319,8 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
 }
 
 RTCORBA::ThreadpoolPolicy_ptr
-TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ThreadpoolPolicy *tmp;
@@ -335,8 +335,8 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool,
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 TAO_RT_ORB::create_priority_banded_connection_policy (const
-                                                      RTCORBA::PriorityBands & priority_bands,
-                                                      CORBA::Environment &ACE_TRY_ENV)
+                                                      RTCORBA::PriorityBands & priority_bands
+                                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp;
@@ -350,7 +350,7 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
-TAO_RT_ORB::create_private_connection_policy (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy *tmp;
@@ -364,8 +364,8 @@ TAO_RT_ORB::create_private_connection_policy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 RTCORBA::ServerProtocolPolicy_ptr
-TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy *tmp;
@@ -379,8 +379,8 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco
 }
 
 RTCORBA::ClientProtocolPolicy_ptr
-TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy *tmp;
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index 55f7f5bd2b5..c9f7ddd89ab 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -54,26 +54,20 @@ public:
   /// Destructor.
   ~TAO_Named_RT_Mutex_Manager (void);
 
-  RTCORBA::Mutex_ptr create_mutex (CORBA::Environment
-                                   &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+  RTCORBA::Mutex_ptr create_mutex (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex,
-                      CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ())
+  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                         CORBA::Boolean_out created_flag,
-                                         CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+                                         CORBA::Boolean_out created_flag
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  RTCORBA::Mutex_ptr open_named_mutex (const char * name,
-                                       CORBA::Environment &ACE_TRY_ENV =
-                                       TAO_default_environment () )
+  RTCORBA::Mutex_ptr open_named_mutex (const char * name
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::MutexNotFound
                      ));
@@ -116,9 +110,7 @@ public:
    * consistant priority inheritance/piority ceiling semantics
    * can be guaranteed.
    */
-  virtual RTCORBA::Mutex_ptr create_mutex (CORBA::Environment
-                                           &ACE_TRY_ENV =
-                                           TAO_default_environment ())
+  virtual RTCORBA::Mutex_ptr create_mutex (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -126,9 +118,8 @@ public:
    * instances are destroyed as soon as their reference counts go to
    * 0.
    */
-  virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex,
-                              CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ())
+  virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -137,16 +128,13 @@ public:
    * is set to 0.
    */
   virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                                 CORBA::Boolean_out created_flag,
-                                                 CORBA::Environment
-                                                 &ACE_TRY_ENV =
-                                                 TAO_default_environment ())
+                                                 CORBA::Boolean_out created_flag
+                                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Retrieve a previously created mutex.
-  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name,
-                                                CORBA::Environment &ACE_TRY_ENV =
-                                                TAO_default_environment () )
+  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name
+                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS )
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RTCORBA::RTORB::MutexNotFound
                       ));
@@ -161,9 +149,8 @@ public:
                                   CORBA::Long recv_buffer_size,
                                   CORBA::Boolean keep_alive,
                                   CORBA::Boolean dont_route,
-                                  CORBA::Boolean no_delay,
-                                  CORBA::Environment
-                                  &ACE_TRY_ENV = TAO_default_environment ())
+                                  CORBA::Boolean no_delay
+                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException ));
 
   /// Create a RTCORBA threadpool to manage a set of threads without lanes.
@@ -174,9 +161,8 @@ public:
                      RTCORBA::Priority default_priority,
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
-                     CORBA::ULong max_request_buffer_size,
-                     CORBA::Environment
-                     &ACE_TRY_ENV = TAO_default_environment ())
+                     CORBA::ULong max_request_buffer_size
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -189,15 +175,13 @@ public:
                                 CORBA::Boolean allow_borrowing,
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
-                                CORBA::ULong max_request_buffer_size,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ())
+                                CORBA::ULong max_request_buffer_size
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Free the resources associated with the specified threadpool.
-  virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool,
-                                   CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+  virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
@@ -205,16 +189,14 @@ public:
   virtual RTCORBA::PriorityModelPolicy_ptr
   create_priority_model_policy (
                                 RTCORBA::PriorityModel priority_model,
-                                RTCORBA::Priority server_priority,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ())
+                                RTCORBA::Priority server_priority
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a ThreadpoolPolicy instance for POA creation
   virtual RTCORBA::ThreadpoolPolicy_ptr
-  create_threadpool_policy (RTCORBA::ThreadpoolId threadpool,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ())
+  create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -223,9 +205,8 @@ public:
    */
   virtual RTCORBA::PriorityBandedConnectionPolicy_ptr
   create_priority_banded_connection_policy (const RTCORBA::PriorityBands &
-                                            priority_bands,
-                                            CORBA::Environment &ACE_TRY_ENV =
-                                            TAO_default_environment ())
+                                            priority_bands
+                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -234,8 +215,7 @@ public:
    * to the server.
    */
   virtual RTCORBA::PrivateConnectionPolicy_ptr
-  create_private_connection_policy (CORBA::Environment &ACE_TRY_ENV =
-                                    TAO_default_environment ())
+  create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -243,9 +223,8 @@ public:
    * communication protocols on the server side.
    */
   virtual RTCORBA::ServerProtocolPolicy_ptr
-  create_server_protocol_policy (const RTCORBA::ProtocolList & protocols,
-                                 CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+  create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -253,9 +232,8 @@ public:
    * communication protocols on the client side.
    */
   virtual RTCORBA::ClientProtocolPolicy_ptr
-  create_client_protocol_policy (const RTCORBA::ProtocolList & protocols,
-                                 CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+  create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the Thread Pool Manager.
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index c9e95c163db..72112c0bfba 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -47,8 +47,6 @@ TAO_RT_ORBInitializer::pre_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   //
   // Register all of the RT related services.
   //
@@ -122,16 +120,16 @@ TAO_RT_ORBInitializer::pre_init (
   TAO_Priority_Mapping_Manager_var safe_manager = manager;
 
   info->register_initial_reference ("PriorityMappingManager",
-                                    manager,
-                                    ACE_TRY_ENV);
+                                    manager
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ This is busted.  TAO_ORBInitInfo should do proper reference
   //    counting.
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
-  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info,
-                                                           ACE_TRY_ENV);
+  TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
@@ -159,8 +157,8 @@ TAO_RT_ORBInitializer::pre_init (
   CORBA::Object_var safe_rt_orb = rt_orb;
 
   info->register_initial_reference (TAO_OBJID_RTORB,
-                                    rt_orb,
-                                    ACE_TRY_ENV);
+                                    rt_orb
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the RT_Current.
@@ -176,8 +174,8 @@ TAO_RT_ORBInitializer::pre_init (
   CORBA::Object_var safe_rt_current = current;
 
   info->register_initial_reference (TAO_OBJID_RTCURRENT,
-                                    current,
-                                    ACE_TRY_ENV);
+                                    current
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_);
@@ -190,18 +188,16 @@ TAO_RT_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
-  this->register_policy_factories (info,
-                                   ACE_TRY_ENV);
+  this->register_policy_factories (info
+                                   TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
 
 void
 TAO_RT_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
   // Register the RTCORBA policy factories.
 
@@ -216,19 +212,19 @@ TAO_RT_ORBInitializer::register_policy_factories (
 
   CORBA::PolicyType type = RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index d119a26e52b..b36cd5f78a0 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -66,8 +66,8 @@ private:
 
   /// Register RTCORBA policy factories.
   void register_policy_factories (
-    PortableInterceptor::ORBInitInfo_ptr info,
-    CORBA::Environment &ACE_TRY_ENV);
+    PortableInterceptor::ORBInitInfo_ptr info
+    TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index e32fd36fd83..3a0b8f2a0a3 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -136,8 +136,8 @@ TAO_RT_ORB_Loader::init (int argc,
       ACE_TRY_CHECK;
       orb_initializer = temp_orb_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 87420a3953a..03055fd71e9 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -19,8 +19,6 @@ TAO_RT_PolicyFactory::create_policy (
 {
   CORBA::Policy_ptr policy = CORBA::Policy::_nil ();
 
-  TAO_ENV_ARG_DEFN;
-
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
     {
       ACE_NEW_THROW_EX (policy,
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index ac6aaaa5a61..807c128cd02 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -36,28 +36,28 @@ TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void)
 }
 
 RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::priority_model (CORBA::Environment &)
+TAO_PriorityModelPolicy::priority_model (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->priority_model_;
 }
 
 RTCORBA::Priority
-TAO_PriorityModelPolicy::server_priority (CORBA::Environment &)
+TAO_PriorityModelPolicy::server_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_priority_;
 }
 
 CORBA::PolicyType
-TAO_PriorityModelPolicy::policy_type (CORBA::Environment &)
+TAO_PriorityModelPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityModelPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PriorityModelPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy* tmp;
@@ -70,7 +70,7 @@ TAO_PriorityModelPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
   return tmp;
 }
 
-void TAO_PriorityModelPolicy::destroy (CORBA::Environment &)
+void TAO_PriorityModelPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -135,21 +135,21 @@ TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void)
 }
 
 RTCORBA::ThreadpoolId
-TAO_ThreadpoolPolicy::threadpool (CORBA::Environment &)
+TAO_ThreadpoolPolicy::threadpool (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->id_;
 }
 
 CORBA::PolicyType
-TAO_ThreadpoolPolicy::policy_type (CORBA::Environment &)
+TAO_ThreadpoolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::THREADPOOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ThreadpoolPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ThreadpoolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ThreadpoolPolicy* tmp;
@@ -162,7 +162,7 @@ TAO_ThreadpoolPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
   return tmp;
 }
 
-void TAO_ThreadpoolPolicy::destroy (CORBA::Environment &)
+void TAO_ThreadpoolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -198,14 +198,14 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_PrivateConnectionPolicy::policy_type (CORBA::Environment &)
+TAO_PrivateConnectionPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrivateConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy* tmp;
@@ -219,7 +219,7 @@ TAO_PrivateConnectionPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_PrivateConnectionPolicy::destroy (CORBA::Environment &)
+TAO_PrivateConnectionPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -253,7 +253,7 @@ TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void)
 
 RTCORBA::PriorityBands *
 TAO_PriorityBandedConnectionPolicy::priority_bands (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::PriorityBands *tmp;
@@ -267,14 +267,14 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (
 }
 
 CORBA::PolicyType
-TAO_PriorityBandedConnectionPolicy::policy_type (CORBA::Environment &)
+TAO_PriorityBandedConnectionPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityBandedConnectionPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PriorityBandedConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp;
@@ -287,7 +287,7 @@ TAO_PriorityBandedConnectionPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
   return tmp;
 }
 
-void TAO_PriorityBandedConnectionPolicy::destroy (CORBA::Environment &)
+void TAO_PriorityBandedConnectionPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -345,74 +345,74 @@ TAO_TCP_Properties::~TAO_TCP_Properties (void)
 }
 
 CORBA::Long
-TAO_TCP_Properties::send_buffer_size (CORBA::Environment &)
+TAO_TCP_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
 
 void
-TAO_TCP_Properties::send_buffer_size (CORBA::Long send_buffer_size,
-                                      CORBA::Environment &)
+TAO_TCP_Properties::send_buffer_size (CORBA::Long send_buffer_size
+                                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_TCP_Properties::recv_buffer_size (CORBA::Environment &)
+TAO_TCP_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
 
 void
-TAO_TCP_Properties::recv_buffer_size (CORBA::Long recv_buffer_size,
-                                      CORBA::Environment &)
+TAO_TCP_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
+                                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::keep_alive (CORBA::Environment &)
+TAO_TCP_Properties::keep_alive (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
 }
 
 void
-TAO_TCP_Properties::keep_alive (CORBA::Boolean keep_alive,
-                                CORBA::Environment &)
+TAO_TCP_Properties::keep_alive (CORBA::Boolean keep_alive
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::dont_route (CORBA::Environment &)
+TAO_TCP_Properties::dont_route (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
 }
 
 void
-TAO_TCP_Properties::dont_route (CORBA::Boolean dont_route,
-                                CORBA::Environment &)
+TAO_TCP_Properties::dont_route (CORBA::Boolean dont_route
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_TCP_Properties::no_delay (CORBA::Environment &)
+CORBA::Boolean TAO_TCP_Properties::no_delay (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
 }
 
 void
-TAO_TCP_Properties::no_delay (CORBA::Boolean no_delay,
-                              CORBA::Environment &)
+TAO_TCP_Properties::no_delay (CORBA::Boolean no_delay
+                              TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
@@ -464,30 +464,30 @@ TAO_Unix_Domain_Properties::~TAO_Unix_Domain_Properties (void)
 }
 
 CORBA::Long
-TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Environment &)
+TAO_Unix_Domain_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
 }
 
 void
-TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Long send_buffer_size,
-                                              CORBA::Environment &)
+TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Long send_buffer_size
+                                              TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Environment &)
+TAO_Unix_Domain_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
 }
 
 void
-TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Long recv_buffer_size,
-                                              CORBA::Environment &)
+TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
+                                              TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
@@ -523,45 +523,45 @@ TAO_SMEM_Properties::~TAO_SMEM_Properties (void)
 
 
 CORBA::Long
-TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Environment &)
+TAO_SMEM_Properties::preallocate_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->preallocate_buffer_size_;
 }
 
 void
-TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size,
-                                              CORBA::Environment &)
+TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
+                                              TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->preallocate_buffer_size_ = preallocate_buffer_size;
 }
 
 char *
-TAO_SMEM_Properties::mmap_filename (CORBA::Environment &)
+TAO_SMEM_Properties::mmap_filename (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_filename_.rep ();
 }
 
 void
-TAO_SMEM_Properties::mmap_filename (const char * mmap_filename,
-                                    CORBA::Environment &)
+TAO_SMEM_Properties::mmap_filename (const char * mmap_filename
+                                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_filename_.set (mmap_filename);
 }
 
 char *
-TAO_SMEM_Properties::mmap_lockname (CORBA::Environment &)
+TAO_SMEM_Properties::mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_lockname_.rep ();
 }
 
 void
-TAO_SMEM_Properties::mmap_lockname (const char * mmap_lockname,
-                                    CORBA::Environment &)
+TAO_SMEM_Properties::mmap_lockname (const char * mmap_lockname
+                                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_lockname_.set (mmap_lockname);
@@ -609,7 +609,7 @@ TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void)
 }
 
 RTCORBA::ProtocolList *
-TAO_ServerProtocolPolicy::protocols (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp;
@@ -623,14 +623,14 @@ TAO_ServerProtocolPolicy::protocols (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::PolicyType
-TAO_ServerProtocolPolicy::policy_type (CORBA::Environment &)
+TAO_ServerProtocolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ServerProtocolPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy* tmp;
@@ -644,7 +644,7 @@ TAO_ServerProtocolPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_ServerProtocolPolicy::destroy (CORBA::Environment &)
+TAO_ServerProtocolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -664,7 +664,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
   CORBA::Policy_var policy =
     orb_core->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       RTCORBA::ServerProtocolPolicy_var server_protocols_policy;
@@ -673,8 +673,8 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
       if (!CORBA::is_nil (policy.in ()))
         {
           server_protocols_policy =
-            RTCORBA::ServerProtocolPolicy::_narrow (policy.in (),
-                                                    ACE_TRY_ENV);
+            RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           server_protocols =
@@ -693,8 +693,8 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                     {
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in (),
-                          ACE_TRY_ENV);
+                          protocols[j].transport_protocol_properties.in ()
+                          TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       if (ACE_OS::strcmp (protocol_type,
@@ -705,8 +705,8 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                     {
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in (),
-                          ACE_TRY_ENV);
+                          protocols[j].transport_protocol_properties.in ()
+                          TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                         if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -726,8 +726,8 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
           if (!CORBA::is_nil (policy.in ()))
             {
               server_protocols_policy =
-                RTCORBA::ServerProtocolPolicy::_narrow (policy.in (),
-                                                        ACE_TRY_ENV);
+                RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               server_protocols =
@@ -746,8 +746,8 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                         {
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in (),
-                              ACE_TRY_ENV);
+                              protocols[j].transport_protocol_properties.in ()
+                              TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
@@ -758,8 +758,8 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                         {
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in (),
-                              ACE_TRY_ENV);
+                              protocols[j].transport_protocol_properties.in ()
+                              TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -773,35 +773,35 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
       if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
         {
           RTCORBA::TCPProtocolProperties_var tcp_properties =
-            RTCORBA::TCPProtocolProperties::_narrow (properties.in (),
-                                                     ACE_TRY_ENV);
+            RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           send_buffer_size =
-            tcp_properties->send_buffer_size (ACE_TRY_ENV);
+            tcp_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           recv_buffer_size =
-            tcp_properties->recv_buffer_size (ACE_TRY_ENV);
+            tcp_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          no_delay = tcp_properties->no_delay (ACE_TRY_ENV);
+          no_delay = tcp_properties->no_delay (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
         {
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
-            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in (),
-                                                            ACE_TRY_ENV);
+            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
+                                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (uiop_properties.in ()))
             {
               // Extract and locally store properties of interest.
               send_buffer_size =
-                uiop_properties->send_buffer_size (ACE_TRY_ENV);
+                uiop_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
               recv_buffer_size =
-                uiop_properties->recv_buffer_size (ACE_TRY_ENV);
+                uiop_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -854,7 +854,7 @@ TAO_ClientProtocolPolicy::~TAO_ClientProtocolPolicy ()
 }
 
 RTCORBA::ProtocolList *
-TAO_ClientProtocolPolicy::protocols (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp;
@@ -868,14 +868,14 @@ TAO_ClientProtocolPolicy::protocols (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::PolicyType
-TAO_ClientProtocolPolicy::policy_type (CORBA::Environment &)
+TAO_ClientProtocolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ClientProtocolPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy* tmp;
@@ -889,7 +889,7 @@ TAO_ClientProtocolPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_ClientProtocolPolicy::destroy (CORBA::Environment &)
+TAO_ClientProtocolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -908,7 +908,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
   CORBA::Policy_var policy =
     orb_core->policy_manager ()->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       RTCORBA::ClientProtocolPolicy_var client_protocols_policy;
@@ -917,8 +917,8 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
       if (!CORBA::is_nil (policy.in ()))
         {
           client_protocols_policy =
-            RTCORBA::ClientProtocolPolicy::_narrow (policy.in (),
-                                                    ACE_TRY_ENV);
+            RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           client_protocols =
@@ -937,8 +937,8 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                     {
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in (),
-                          ACE_TRY_ENV);
+                          protocols[j].transport_protocol_properties.in ()
+                          TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
@@ -948,8 +948,8 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                     {
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
-                          protocols[j].transport_protocol_properties.in (),
-                          ACE_TRY_ENV);
+                          protocols[j].transport_protocol_properties.in ()
+                          TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -970,8 +970,8 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
           if (!CORBA::is_nil (policy.in ()))
             {
               client_protocols_policy =
-                RTCORBA::ClientProtocolPolicy::_narrow (policy.in (),
-                                                        ACE_TRY_ENV);
+                RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               client_protocols =
@@ -989,8 +989,8 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                         {
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in (),
-                              ACE_TRY_ENV);
+                              protocols[j].transport_protocol_properties.in ()
+                              TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
@@ -1001,8 +1001,8 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                         {
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
-                              protocols[j].transport_protocol_properties.in (),
-                              ACE_TRY_ENV);
+                              protocols[j].transport_protocol_properties.in ()
+                              TAO_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -1016,32 +1016,32 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
       if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
         {
           RTCORBA::TCPProtocolProperties_var tcp_properties =
-            RTCORBA::TCPProtocolProperties::_narrow (properties.in (),
-                                                     ACE_TRY_ENV);
+            RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           send_buffer_size =
-            tcp_properties->send_buffer_size (ACE_TRY_ENV);
+            tcp_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           recv_buffer_size =
-            tcp_properties->recv_buffer_size (ACE_TRY_ENV);
+            tcp_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          no_delay = tcp_properties->no_delay (ACE_TRY_ENV);
+          no_delay = tcp_properties->no_delay (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
         {
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
-            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in (),
-                                                            ACE_TRY_ENV);
+            RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
+                                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (uiop_properties.in ()))
             {
               // Extract and locally store properties of interest.
               send_buffer_size =
-                uiop_properties->send_buffer_size (ACE_TRY_ENV);
+                uiop_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
               recv_buffer_size =
                 uiop_properties->recv_buffer_size ();
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index 412ac3db2ec..fb5ff0db0ad 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -64,27 +64,19 @@ public:
    */
   RTCORBA::PriorityModel get_priority_model (void);
 
-  virtual RTCORBA::PriorityModel priority_model (CORBA::Environment
-                                                 &ACE_TRY_ENV =
-                                                 TAO_default_environment ())
+  virtual RTCORBA::PriorityModel priority_model (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual RTCORBA::Priority server_priority (CORBA::Environment
-                                             &ACE_TRY_ENV =
-                                             TAO_default_environment ())
+  virtual RTCORBA::Priority server_priority (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method writes a CDR representation of the object state.
@@ -137,22 +129,16 @@ public:
   /// Copy constructor.
   TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
 
-  virtual RTCORBA::ThreadpoolId threadpool (CORBA::Environment
-                                            &ACE_TRY_ENV =
-                                            TAO_default_environment ())
+  virtual RTCORBA::ThreadpoolId threadpool (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -195,17 +181,13 @@ public:
   /// Copy constructor.
   TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
 
-  virtual CORBA::PolicyType policy_type (CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -251,22 +233,17 @@ public:
    */
   RTCORBA::PriorityBands &priority_bands_rep (void);
 
-  virtual RTCORBA::PriorityBands * priority_bands (CORBA::Environment
-                                                   &ACE_TRY_ENV =
-                                                   TAO_default_environment ())
+  virtual RTCORBA::PriorityBands * priority_bands
+                                    (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// This method writes a CDR representation of the current object.
@@ -326,22 +303,17 @@ public:
    */
   RTCORBA::ProtocolList & protocols_rep (void);
 
-  virtual RTCORBA::ProtocolList * protocols (CORBA::Environment
-                                             &ACE_TRY_ENV =
-                                             TAO_default_environment ())
+  virtual RTCORBA::ProtocolList * protocols
+                                     (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static int hook (TAO_ORB_Core *orb_core,
@@ -396,18 +368,14 @@ public:
    */
   RTCORBA::ProtocolList & protocols_rep (void);
 
-  virtual RTCORBA::ProtocolList * protocols (CORBA::Environment
-                                             &ACE_TRY_ENV =
-                                             TAO_default_environment ())
+  virtual RTCORBA::ProtocolList * protocols
+                                   (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
+  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ())
+  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static int hook (TAO_ORB_Core *orb_core,
@@ -416,8 +384,7 @@ public:
                    int &no_delay,
                    const char* protocol_type);
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
-                        TAO_default_environment ())
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = CDR Encoder/Decoder.
@@ -473,51 +440,39 @@ public:
                       CORBA::Boolean dont_route = 0,
                       CORBA::Boolean no_delay = 1);
 
-  virtual CORBA::Long send_buffer_size (CORBA::Environment
-                                        &ACE_TRY_ENV =
-                                        TAO_default_environment ())
+  virtual CORBA::Long send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_buffer_size (CORBA::Long send_buffer_size,
-                                 CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+  virtual void send_buffer_size (CORBA::Long send_buffer_size
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long recv_buffer_size (CORBA::Environment
-                                        &ACE_TRY_ENV =
-                                        TAO_default_environment ())
+  virtual CORBA::Long recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void recv_buffer_size (CORBA::Long recv_buffer_size,
-                                 CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+  virtual void recv_buffer_size (CORBA::Long recv_buffer_size
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean keep_alive (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ())
+  virtual CORBA::Boolean keep_alive (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void keep_alive (CORBA::Boolean keep_alive,
-                           CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+  virtual void keep_alive (CORBA::Boolean keep_alive
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean dont_route (CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ())
+  virtual CORBA::Boolean dont_route (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void dont_route (CORBA::Boolean dont_route,
-                           CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+  virtual void dont_route (CORBA::Boolean dont_route
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean no_delay (CORBA::Environment &ACE_TRY_ENV =
-                                   TAO_default_environment ())
+  virtual CORBA::Boolean no_delay (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void no_delay (CORBA::Boolean no_delay,
-                         CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+  virtual void no_delay (CORBA::Boolean no_delay
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -565,24 +520,18 @@ public:
                               CORBA::Long recv_buffer_size =
                               ACE_DEFAULT_MAX_SOCKET_BUFSIZ);
 
-  virtual CORBA::Long send_buffer_size (CORBA::Environment
-                                        &ACE_TRY_ENV =
-                                        TAO_default_environment ())
+  virtual CORBA::Long send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_buffer_size (CORBA::Long send_buffer_size,
-                                 CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+  virtual void send_buffer_size (CORBA::Long send_buffer_size
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long recv_buffer_size (CORBA::Environment
-                                        &ACE_TRY_ENV =
-                                        TAO_default_environment ())
+  virtual CORBA::Long recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void recv_buffer_size (CORBA::Long recv_buffer_size,
-                                 CORBA::Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ())
+  virtual void recv_buffer_size (CORBA::Long recv_buffer_size
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -637,34 +586,26 @@ public:
 
   // = IDL interface methods.
 
-  virtual CORBA::Long preallocate_buffer_size (CORBA::Environment
-                                               &ACE_TRY_ENV =
-                                               TAO_default_environment
-                                               ())
+  virtual CORBA::Long preallocate_buffer_size
+                                   (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void preallocate_buffer_size (CORBA::Long preallocate_buffer_size,
-                                        CORBA::Environment
-                                        &ACE_TRY_ENV = TAO_default_environment
-                                        ())
+  virtual void preallocate_buffer_size (CORBA::Long preallocate_buffer_size
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * mmap_filename (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ())
+  virtual char * mmap_filename (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void mmap_filename (const char * mmap_filename,
-                              CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ())
+  virtual void mmap_filename (const char * mmap_filename
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * mmap_lockname (CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ())
+  virtual char * mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void mmap_lockname (const char * mmap_lockname,
-                              CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ())
+  virtual void mmap_lockname (const char * mmap_lockname
+                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 5519c6003d8..5fc01232ee9 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -31,20 +31,20 @@ TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void)
 }
 
 void
-TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
+                                    TAO_ENV_ARG_DECL)
 {
   this->orb_core_ = orb_core;
 
   // Save a reference to the priority mapping manager.
   CORBA::Object_var obj =
-    orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER,
-                                                              ACE_TRY_ENV);
+    orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->mapping_manager_ =
-    TAO_Priority_Mapping_Manager::_narrow (obj.in (),
-                                           ACE_TRY_ENV);
+    TAO_Priority_Mapping_Manager::_narrow (obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -105,8 +105,8 @@ TAO_RT_Protocols_Hooks::set_server_protocols_hook (Server_Protocols_Hook hook)
 void
 TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub,
                                             TAO_Service_Context &service_context,
-                                            CORBA::Boolean restart,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Boolean restart
+                                            TAO_ENV_ARG_DECL)
 {
   // If the restart flag is true, then this call for a
   // reinvocation. We need not prepare the Service Context List once
@@ -116,26 +116,26 @@ TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub,
       TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
                                                stub);
       CORBA::Policy *priority_model_policy =
-        rt_stub->exposed_priority_model (ACE_TRY_ENV);
+        rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (priority_model_policy)
         {
 
           CORBA::Policy *priority_model_policy =
-            rt_stub->exposed_priority_model (ACE_TRY_ENV);
+            rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA::Short client_priority;
-          int status = this->get_thread_CORBA_priority (client_priority,
-                                                        ACE_TRY_ENV);
+          int status = this->get_thread_CORBA_priority (client_priority
+                                                        TAO_ENV_ARG_PARAMETER);
           if (status == -1)
             ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 
 
           this->add_rt_service_context_hook (service_context,
                                              priority_model_policy,
-                                             client_priority,
-                                             ACE_TRY_ENV);
+                                             client_priority
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -149,13 +149,13 @@ TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub,
 void
 TAO_RT_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &service_context,
                                                      CORBA::Policy *model_policy,
-                                                     CORBA::Short &client_priority,
-                                                     CORBA::Environment &ACE_TRY_ENV)
+                                                     CORBA::Short &client_priority
+                                                     TAO_ENV_ARG_DECL)
 {
 
   RTCORBA::PriorityModelPolicy_var model_policy_ptr =
-    RTCORBA::PriorityModelPolicy::_narrow (model_policy,
-                                           ACE_TRY_ENV);
+    RTCORBA::PriorityModelPolicy::_narrow (model_policy
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PriorityModelPolicy *priority_model =
@@ -232,14 +232,14 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook (
 }
 
 int
-TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority
+                                                   TAO_ENV_ARG_DECL)
 {
   CORBA::Short native_priority = 0;
   int result =
     this->get_thread_CORBA_and_native_priority (priority,
-                                                native_priority,
-                                                ACE_TRY_ENV);
+                                                native_priority
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == -1)
@@ -249,8 +249,8 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority,
 }
 
 int
-TAO_RT_Protocols_Hooks::get_thread_native_priority (CORBA::Short &native_priority,
-                                                    CORBA::Environment &)
+TAO_RT_Protocols_Hooks::get_thread_native_priority (CORBA::Short &native_priority
+                                                    TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -273,12 +273,12 @@ TAO_RT_Protocols_Hooks::get_thread_native_priority (CORBA::Short &native_priorit
 
 int
 TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &priority,
-                                                              CORBA::Short &native_priority,
-                                                              CORBA::Environment &ACE_TRY_ENV)
+                                                              CORBA::Short &native_priority
+                                                              TAO_ENV_ARG_DECL)
 {
   int result =
-    this->get_thread_native_priority (native_priority,
-                                      ACE_TRY_ENV);
+    this->get_thread_native_priority (native_priority
+                                      TAO_ENV_ARG_PARAMETER);
   if (result == -1)
     return result;
 
@@ -298,8 +298,8 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &prio
 }
 
 int
-TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority
+                                                   TAO_ENV_ARG_DECL)
 {
   TAO_Priority_Mapping *priority_mapping =
     this->mapping_manager_.in ()->mapping ();
@@ -308,13 +308,13 @@ TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority,
   if (priority_mapping->to_native (priority, native_priority) == 0)
     return -1;
 
-  return this->set_thread_native_priority (native_priority,
-                                           ACE_TRY_ENV);
+  return this->set_thread_native_priority (native_priority
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 int
-TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority,
-                                                    CORBA::Environment &)
+TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority
+                                                    TAO_ENV_ARG_DECL_NOT_USED)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -326,7 +326,7 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority
 }
 
 int
-TAO_RT_Protocols_Hooks::set_default_policies (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Set RTCORBA policy defaults.
   // Set RTCORBA::ServerProtocolPolicy and
@@ -367,8 +367,8 @@ TAO_RT_Protocols_Hooks::set_default_policies (CORBA::Environment &ACE_TRY_ENV)
   RTCORBA::ServerProtocolPolicy_var safe_server_protocol_policy =
     server_protocol_policy;
 
-  this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy,
-                                                 ACE_TRY_ENV);
+  this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Set ClientProtocolPolicy.
@@ -384,16 +384,16 @@ TAO_RT_Protocols_Hooks::set_default_policies (CORBA::Environment &ACE_TRY_ENV)
   RTCORBA::ClientProtocolPolicy_var safe_client_protocol_policy =
     client_protocol_policy;
 
-  this->orb_core_->get_default_policies ()->set_policy (client_protocol_policy,
-                                                 ACE_TRY_ENV);
+  this->orb_core_->get_default_policies ()->set_policy (client_protocol_policy
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
-                                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
+                                                            TAO_ENV_ARG_DECL)
 {
   RTCORBA::ProtocolList protocols;
 
@@ -437,8 +437,8 @@ TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registr
   RTCORBA::ServerProtocolPolicy_var safe_server_protocol_policy =
     server_protocol_policy;
 
-  this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy,
-                                                        ACE_TRY_ENV);
+  this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index 7eb98ddb5ad..b4a585f9ec5 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -35,8 +35,8 @@ public:
   virtual ~TAO_RT_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
-  virtual void init_hooks (TAO_ORB_Core *orb_core,
-                           CORBA::Environment &ACE_TRY_ENV);
+  virtual void init_hooks (TAO_ORB_Core *orb_core
+                           TAO_ENV_ARG_DECL);
 
   /// Invoke the client_protocols hook if present.
   /**
@@ -91,13 +91,13 @@ public:
 
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
-                                   CORBA::Boolean restart,
-                                   CORBA::Environment &ACE_TRY_ENV);
+                                   CORBA::Boolean restart
+                                   TAO_ENV_ARG_DECL);
 
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
-                                            CORBA::Short &client_priority,
-                                            CORBA::Environment &ACE_TRY_ENV);
+                                            CORBA::Short &client_priority
+                                            TAO_ENV_ARG_DECL);
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
@@ -117,30 +117,30 @@ public:
    * some critical components.
    */
   //@{
-  virtual int get_thread_CORBA_priority (CORBA::Short &,
-                                         CORBA::Environment &);
+  virtual int get_thread_CORBA_priority (CORBA::Short &
+                                         TAO_ENV_ARG_DECL_NOT_USED);
 
-  virtual int get_thread_native_priority (CORBA::Short &,
-                                          CORBA::Environment &);
+  virtual int get_thread_native_priority (CORBA::Short &
+                                          TAO_ENV_ARG_DECL_NOT_USED);
 
   virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
-                                                    CORBA::Short &,
-                                                    CORBA::Environment &);
+                                                    CORBA::Short &
+                                                    TAO_ENV_ARG_DECL_NOT_USED);
 
-  virtual int set_thread_CORBA_priority (CORBA::Short,
-                                         CORBA::Environment &);
+  virtual int set_thread_CORBA_priority (CORBA::Short
+                                         TAO_ENV_ARG_DECL_NOT_USED);
 
-  virtual int set_thread_native_priority (CORBA::Short,
-                                          CORBA::Environment &);
+  virtual int set_thread_native_priority (CORBA::Short
+                                          TAO_ENV_ARG_DECL_NOT_USED);
 
   //@}
 
   /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
   /// default RTCORBA policies: ClientProtocolPolicy.
-  virtual int set_default_policies (CORBA::Environment &ACE_TRY_ENV);
+  virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL);
 
-  int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry,
-                                          CORBA::Environment &ACE_TRY_ENV);
+  int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
+                                          TAO_ENV_ARG_DECL);
 
 protected:
   TAO_ORB_Core *orb_core_;
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 4f27fe30690..283edf28bd9 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -32,10 +32,10 @@ TAO_RT_Stub::~TAO_RT_Stub (void)
 }
 
 void
-TAO_RT_Stub::parse_policies (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::parse_policies (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::PolicyList_var policy_list
-    = this->base_profiles_.policy_list (ACE_TRY_ENV);
+    = this->base_profiles_.policy_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = policy_list->length ();
@@ -60,11 +60,11 @@ TAO_RT_Stub::parse_policies (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_model (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::exposed_priority_model (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (ACE_TRY_ENV);
+      this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -78,11 +78,11 @@ TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (ACE_TRY_ENV);
+      this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -97,11 +97,11 @@ TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_client_protocol (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::exposed_client_protocol (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (ACE_TRY_ENV);
+      this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -119,45 +119,45 @@ TAO_RT_Stub::exposed_client_protocol (CORBA::Policy_ptr policy)
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-TAO_RT_Stub::get_policy (CORBA::PolicyType type,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::get_policy (CORBA::PolicyType type
+                         TAO_ENV_ARG_DECL)
 {
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return this->exposed_priority_model (ACE_TRY_ENV);
+    return this->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return this->effective_priority_banded_connection (ACE_TRY_ENV);
+    return this->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return this->effective_client_protocol (ACE_TRY_ENV);
+    return this->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
 
-  return this->TAO_Stub::get_policy (type, ACE_TRY_ENV);
+  return this->TAO_Stub::get_policy (type TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr
-TAO_RT_Stub::get_client_policy (CORBA::PolicyType type,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::get_client_policy (CORBA::PolicyType type
+                                TAO_ENV_ARG_DECL)
 {
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return this->exposed_priority_model (ACE_TRY_ENV);
+    return this->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return this->effective_priority_banded_connection (ACE_TRY_ENV);
+    return this->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return this->effective_client_protocol (ACE_TRY_ENV);
+    return this->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
 
-  return this->TAO_Stub::get_client_policy (type, ACE_TRY_ENV);
+  return this->TAO_Stub::get_client_policy (type TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Stub *
 TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
-                                   CORBA::SetOverrideType set_add,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::SetOverrideType set_add
+                                   TAO_ENV_ARG_DECL)
 {
   // Validity check.  Make sure requested policies are allowed to be
   // set at this scope.
@@ -167,7 +167,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
       if (CORBA::is_nil (policy))
         continue;
 
-      CORBA::PolicyType type = policy->policy_type (ACE_TRY_ENV);
+      CORBA::PolicyType type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
@@ -179,7 +179,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 
   // We are not required to check for consistency of <policies> with
   // overrides at other levels or with policies exported in the IOR.
-  return this->TAO_Stub::set_policy_overrides(policies, set_add, ACE_TRY_ENV);
+  return this->TAO_Stub::set_policy_overrides(policies, set_add TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
@@ -291,7 +291,7 @@ TAO_RT_Stub::priority_banded_connection (void)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -299,7 +299,7 @@ TAO_RT_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_E
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
-    this->exposed_priority_banded_connection (ACE_TRY_ENV);
+    this->exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   // Reconcile client-exposed and locally set values.
@@ -310,8 +310,8 @@ TAO_RT_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_E
     return exposed._retn ();
 
   RTCORBA::PriorityBandedConnectionPolicy_var override_policy_var =
-    RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in (),
-                                                      ACE_TRY_ENV);
+    RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_PriorityBandedConnectionPolicy *override_policy =
@@ -319,8 +319,8 @@ TAO_RT_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_E
                      override_policy_var.in ());
 
   RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_var =
-    RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in (),
-                                                      ACE_TRY_ENV);
+    RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_PriorityBandedConnectionPolicy *exposed_policy =
@@ -342,7 +342,7 @@ TAO_RT_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_E
 }
 
 CORBA::Policy *
-TAO_RT_Stub::effective_client_protocol (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -350,7 +350,7 @@ TAO_RT_Stub::effective_client_protocol (CORBA::Environment &ACE_TRY_ENV)
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
-    this->exposed_client_protocol (ACE_TRY_ENV);
+    this->exposed_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   // Reconcile client-exposed and locally set values.
@@ -361,8 +361,8 @@ TAO_RT_Stub::effective_client_protocol (CORBA::Environment &ACE_TRY_ENV)
     return exposed._retn ();
 
   RTCORBA::ClientProtocolPolicy_var override_policy_var =
-    RTCORBA::ClientProtocolPolicy::_narrow (override.in (),
-                                            ACE_TRY_ENV);
+    RTCORBA::ClientProtocolPolicy::_narrow (override.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_ClientProtocolPolicy *override_policy =
@@ -370,8 +370,8 @@ TAO_RT_Stub::effective_client_protocol (CORBA::Environment &ACE_TRY_ENV)
                      override_policy_var.in ());
 
   RTCORBA::ClientProtocolPolicy_var exposed_policy_var =
-    RTCORBA::ClientProtocolPolicy::_narrow (exposed.in (),
-                                            ACE_TRY_ENV);
+    RTCORBA::ClientProtocolPolicy::_narrow (exposed.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_ClientProtocolPolicy *exposed_policy =
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index f2bd0adacc8..96403604062 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -56,21 +56,18 @@ public:
    * policy type.  Returns the effective override for all other policy
    * types.
    */
-  CORBA::Policy_ptr get_policy (CORBA::PolicyType type,
-                                CORBA::Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()
-    );
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType type
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
-  CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type,
-                                       CORBA::Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ()
-    );
+
+  CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
-                                             CORBA::SetOverrideType set_add,
-                                             CORBA::Environment &ACE_TRY_ENV =
-                                             TAO_default_environment ());
+                                             CORBA::SetOverrideType set_add
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
@@ -79,17 +76,17 @@ public:
   /// Returns the CORBA::Policy (which will be narrowed to be
   /// used as RTCORBA::PriorityModelPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_model (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Policy_ptr exposed_priority_model (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::PriorityBandedConnectionPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Policy_ptr exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::ClientProtocolPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_client_protocol (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Policy_ptr exposed_client_protocol (TAO_ENV_SINGLE_ARG_DECL);
 
 
   CORBA::Policy *private_connection (void);
@@ -106,19 +103,16 @@ public:
   //   the policy value exported in the Object's IOR.
 
   CORBA::Policy *
-  effective_priority_banded_connection (CORBA::Environment
-                                        &ACE_TRY_ENV =
-                                        TAO_default_environment ());
+  effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   CORBA::Policy *
-  effective_client_protocol (CORBA::Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
+  effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
 
 private:
 
   /// Helper method used to parse the policies.
-  void parse_policies (CORBA::Environment &ACE_TRY_ENV);
+  void parse_policies (TAO_ENV_SINGLE_ARG_DECL);
 
   void exposed_priority_model (CORBA::Policy_ptr policy);
 
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index 3db3978f9ed..3eb67cc1b34 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -12,8 +12,8 @@ TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
 TAO_Stub *
 TAO_RT_Stub_Factory::create_stub (const char *repository_id,
                                   const TAO_MProfile &profiles,
-                                  TAO_ORB_Core *orb_core,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  TAO_ORB_Core *orb_core
+                                  TAO_ENV_ARG_DECL)
 {
   // @@ TODO: As soon as the RT_STUB is done change this to
   // create an RT_STUB
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
index e0480ad908e..7f5cf343c28 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -45,8 +45,8 @@ public:
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core,
-                                 CORBA::Environment &ACE_TRY_ENV);
+                                 TAO_ORB_Core *orb_core
+                                 TAO_ENV_ARG_DECL);
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Stub_Factory)
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 0c0b75c99cd..249471330ae 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -39,11 +39,11 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi
 }
 
 int
-TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (TAO_ENV_SINGLE_ARG_DECL)
 {
   int result =
-    this->default_lane_resources_->open_acceptor_registry (0,
-                                                           ACE_TRY_ENV);
+    this->default_lane_resources_->open_acceptor_registry (0
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index aba3f630f2d..032de681bf3 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -101,7 +101,7 @@ TAO_Thread_Pool_Threads::svc (void)
   ACE_TRY_NEW_ENV
     {
       // Run the ORB.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -134,8 +134,8 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
                                   CORBA::ULong id,
                                   CORBA::Short lane_priority,
                                   CORBA::ULong static_threads,
-                                  CORBA::ULong dynamic_threads,
-                                  CORBA::Environment &)
+                                  CORBA::ULong dynamic_threads
+                                  TAO_ENV_ARG_DECL_NOT_USED)
   : pool_ (pool),
     id_ (id),
     lane_priority_ (lane_priority),
@@ -151,7 +151,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
 }
 
 void
-TAO_Thread_Lane::validate_and_map_priority (CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Lane::validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Check that the priority is in bounds.
   if (this->lane_priority_ < RTCORBA::minPriority ||
@@ -163,13 +163,13 @@ TAO_Thread_Lane::validate_and_map_priority (CORBA::Environment &ACE_TRY_ENV)
 
   // Get the priority mapping manager.
   CORBA::Object_var obj =
-    orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER,
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Priority_Mapping_Manager_var mapping_manager =
-    TAO_Priority_Mapping_Manager::_narrow (obj.in (),
-                                           ACE_TRY_ENV);
+    TAO_Priority_Mapping_Manager::_narrow (obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::PriorityMapping *pm =
@@ -192,17 +192,17 @@ TAO_Thread_Lane::validate_and_map_priority (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_Thread_Lane::open (CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Lane::open (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Validate and map priority.
-  this->validate_and_map_priority (ACE_TRY_ENV);
+  this->validate_and_map_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Open the acceptor registry.
   int result = 0;
   result =
-    this->resources_.open_acceptor_registry (1,
-                                             ACE_TRY_ENV);
+    this->resources_.open_acceptor_registry (1
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == -1)
@@ -376,8 +376,8 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::Short default_priority,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::ULong max_request_buffer_size
+                                  TAO_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
     stack_size_ (stack_size),
@@ -400,8 +400,8 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                          0,
                          default_priority,
                          static_threads,
-                         dynamic_threads,
-                         ACE_TRY_ENV);
+                         dynamic_threads
+                         TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -411,8 +411,8 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::Boolean allow_borrowing,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::ULong max_request_buffer_size
+                                  TAO_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
     stack_size_ (stack_size),
@@ -439,19 +439,19 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                            i,
                            lanes[i].lane_priority,
                            lanes[i].static_threads,
-                           lanes[i].dynamic_threads,
-                           ACE_TRY_ENV);
+                           lanes[i].dynamic_threads
+                           TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Thread_Pool::open (CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Pool::open (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Open all the lanes.
   for (CORBA::ULong i = 0;
        i != this->number_of_lanes_;
        ++i)
     {
-      this->lanes_[i]->open (ACE_TRY_ENV);
+      this->lanes_[i]->open (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -677,8 +677,8 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                             RTCORBA::Priority default_priority,
                                             CORBA::Boolean allow_request_buffering,
                                             CORBA::ULong max_buffered_requests,
-                                            CORBA::ULong max_request_buffer_size,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::ULong max_request_buffer_size
+                                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
@@ -690,8 +690,8 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                     default_priority,
                                     allow_request_buffering,
                                     max_buffered_requests,
-                                    max_request_buffer_size,
-                                    ACE_TRY_ENV);
+                                    max_request_buffer_size
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -700,8 +700,8 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                        CORBA::Boolean allow_borrowing,
                                                        CORBA::Boolean allow_request_buffering,
                                                        CORBA::ULong max_buffered_requests,
-                                                       CORBA::ULong max_request_buffer_size,
-                                                       CORBA::Environment &ACE_TRY_ENV)
+                                                       CORBA::ULong max_request_buffer_size
+                                                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
@@ -712,21 +712,21 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                allow_borrowing,
                                                allow_request_buffering,
                                                max_buffered_requests,
-                                               max_request_buffer_size,
-                                               ACE_TRY_ENV);
+                                               max_request_buffer_size
+                                               TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool,
-                                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
+                                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
   ACE_CHECK;
 
-  this->destroy_threadpool_i (threadpool,
-                              ACE_TRY_ENV);
+  this->destroy_threadpool_i (threadpool
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -736,8 +736,8 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                               RTCORBA::Priority default_priority,
                                               CORBA::Boolean allow_request_buffering,
                                               CORBA::ULong max_buffered_requests,
-                                              CORBA::ULong max_request_buffer_size,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              CORBA::ULong max_request_buffer_size
+                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
@@ -752,13 +752,13 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                      default_priority,
                                      allow_request_buffering,
                                      max_buffered_requests,
-                                     max_request_buffer_size,
-                                     ACE_TRY_ENV),
+                                     max_request_buffer_size
+                                     TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  return this->create_threadpool_helper (thread_pool,
-                                         ACE_TRY_ENV);
+  return this->create_threadpool_helper (thread_pool
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -767,8 +767,8 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                                          CORBA::Boolean allow_borrowing,
                                                          CORBA::Boolean allow_request_buffering,
                                                          CORBA::ULong max_buffered_requests,
-                                                         CORBA::ULong max_request_buffer_size,
-                                                         CORBA::Environment &ACE_TRY_ENV)
+                                                         CORBA::ULong max_request_buffer_size
+                                                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
@@ -782,25 +782,25 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                      allow_borrowing,
                                      allow_request_buffering,
                                      max_buffered_requests,
-                                     max_request_buffer_size,
-                                     ACE_TRY_ENV),
+                                     max_request_buffer_size
+                                     TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  return this->create_threadpool_helper (thread_pool,
-                                         ACE_TRY_ENV);
+  return this->create_threadpool_helper (thread_pool
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
-TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
+                                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure of safe deletion in case of errors.
   auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
 
   // Open the pool.
-  thread_pool->open (ACE_TRY_ENV);
+  thread_pool->open (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Create the static threads.
@@ -834,8 +834,8 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool,
 }
 
 void
-TAO_Thread_Pool_Manager::destroy_threadpool_i (RTCORBA::ThreadpoolId thread_pool_id,
-                                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Pool_Manager::destroy_threadpool_i (RTCORBA::ThreadpoolId thread_pool_id
+                                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 3f8bdeb4f80..e231b22a34b 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -105,14 +105,14 @@ public:
                    CORBA::ULong id,
                    CORBA::Short lane_priority,
                    CORBA::ULong static_threads,
-                   CORBA::ULong dynamic_threads,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::ULong dynamic_threads
+                   TAO_ENV_ARG_DECL);
 
   /// Destructor.
   ~TAO_Thread_Lane (void);
 
   /// Open the lane.
-  void open (CORBA::Environment &ACE_TRY_ENV);
+  void open (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Finalize the resources.
   void finalize (void);
@@ -157,7 +157,7 @@ public:
 private:
 
   /// Validate lane's priority and map it to a native value.
-  void validate_and_map_priority (CORBA::Environment &ACE_TRY_ENV);
+  void validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL);
 
   TAO_Thread_Pool &pool_;
   CORBA::ULong id_;
@@ -203,8 +203,8 @@ public:
                    CORBA::Short default_priority,
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::ULong max_request_buffer_size
+                   TAO_ENV_ARG_DECL);
 
   /// Constructor (for pools with lanes).
   TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -214,14 +214,14 @@ public:
                    CORBA::Boolean allow_borrowing,
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::ULong max_request_buffer_size
+                   TAO_ENV_ARG_DECL);
 
   /// Destructor.
   ~TAO_Thread_Pool (void);
 
   /// Open the pool.
-  void open (CORBA::Environment &ACE_TRY_ENV);
+  void open (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Finalize the resources.
   void finalize (void);
@@ -314,8 +314,8 @@ public:
                      RTCORBA::Priority default_priority,
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
-                     CORBA::ULong max_request_buffer_size,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::ULong max_request_buffer_size
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a threadpool with lanes.
@@ -325,13 +325,13 @@ public:
                                 CORBA::Boolean allow_borrowing,
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
-                                CORBA::ULong max_request_buffer_size,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::ULong max_request_buffer_size
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy a threadpool.
-  void destroy_threadpool (RTCORBA::ThreadpoolId threadpool,
-                           CORBA::Environment &ACE_TRY_ENV)
+  void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
@@ -361,8 +361,8 @@ private:
                        RTCORBA::Priority default_priority,
                        CORBA::Boolean allow_request_buffering,
                        CORBA::ULong max_buffered_requests,
-                       CORBA::ULong max_request_buffer_size,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::ULong max_request_buffer_size
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::ThreadpoolId
@@ -371,18 +371,18 @@ private:
                                   CORBA::Boolean allow_borrowing,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::ULong max_request_buffer_size
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy_threadpool_i (RTCORBA::ThreadpoolId threadpool,
-                             CORBA::Environment &ACE_TRY_ENV)
+  void destroy_threadpool_i (RTCORBA::ThreadpoolId threadpool
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
   RTCORBA::ThreadpoolId
-  create_threadpool_helper (TAO_Thread_Pool *thread_pool,
-                            CORBA::Environment &ACE_TRY_ENV)
+  create_threadpool_helper (TAO_Thread_Pool *thread_pool
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @}
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index f4e54d1bc59..c4069c6cb16 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -79,7 +79,7 @@ RTPortableServer::POA_var::operator const ::RTPortableServer::POA_ptr &() const
   return this->ptr_;
 }
 
-RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast 
+RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -139,11 +139,11 @@ RTPortableServer::POA_var::tao_nil (void)
 
 ::RTPortableServer::POA_ptr
 RTPortableServer::POA_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::RTPortableServer::POA::_narrow (p, ACE_TRY_ENV);
+  return ::RTPortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -224,16 +224,16 @@ RTPortableServer::POA::~POA (void)
 {}
 
 RTPortableServer::POA_ptr RTPortableServer::POA::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return POA::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return POA::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 RTPortableServer::POA_ptr RTPortableServer::POA::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -283,7 +283,7 @@ void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index b4ef0ad232e..8b5a9cc1b75 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -98,7 +98,7 @@ TAO_NAMESPACE  RTPortableServer
     static POA_ptr tao_duplicate (POA_ptr);
     static void tao_release (POA_ptr);
     static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static POA_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -152,15 +152,13 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     // the static operations
     static POA_ptr _duplicate (POA_ptr obj);
     static POA_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static POA_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static POA_ptr _nil (void)
       {
         return (POA_ptr)0;
@@ -168,10 +166,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
 
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
-        RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::Priority priority
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongPolicy
@@ -180,10 +177,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     virtual CORBA::Object_ptr create_reference_with_id_and_priority (
         const PortableServer::ObjectId & oid,
         const char * intf,
-        RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::Priority priority
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::WrongPolicy
@@ -191,10 +187,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
 
     virtual PortableServer::ObjectId * activate_object_with_priority (
         PortableServer::Servant p_servant,
-        RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::Priority priority
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ServantAlreadyActive,
@@ -204,10 +199,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     virtual void activate_object_with_id_and_priority (
         const PortableServer::ObjectId & oid,
         PortableServer::Servant p_servant,
-        RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        RTCORBA::Priority priority
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableServer::POA::ServantAlreadyActive,
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i
index 675f6f14a80..1272b5b0b97 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.i
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.i
@@ -49,11 +49,11 @@ tao_RTPortableServer_POA_nil (
 
 ACE_INLINE RTPortableServer::POA_ptr
 tao_RTPortableServer_POA_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return RTPortableServer::POA::_narrow (p, ACE_TRY_ENV);
+  return RTPortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 4f3552e9f9f..31c3f6c82f6 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -16,8 +16,8 @@ ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$")
 #endif /* ! __ACE_INLINE__ */
 
 CORBA::Boolean
-TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object,
-                                            CORBA::Environment &ACE_TRY_ENV) const
+TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
+                                            TAO_ENV_ARG_DECL) const
 {
   // Make sure that the servant is in the same ORB that created this
   // object.
@@ -32,8 +32,8 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object,
   // until <servant_upcall> dies.
   TAO_Object_Adapter::Servant_Upcall servant_upcall (orb_core);
   TAO_POA *poa =
-    servant_upcall.lookup_POA (object->_object_key (),
-                               ACE_TRY_ENV);
+    servant_upcall.lookup_POA (object->_object_key ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the thread pool associated with this POA.
@@ -95,8 +95,8 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object,
   poa->locate_servant_i ("operation not used",
                          servant_upcall.system_id_,
                          servant_upcall,
-                         servant_upcall.current_context_,
-                         ACE_TRY_ENV);
+                         servant_upcall.current_context_
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the priority that the servant will run at.
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
index 059160e17ec..6439b5a7aaa 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
@@ -37,8 +37,8 @@ class TAO_RTPortableServer_Export TAO_RT_Collocation_Resolver :
 public:
 
   /// Is <object> collocated?
-  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object,
-                                        CORBA::Environment &ACE_TRY_ENV) const;
+  virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
+                                        TAO_ENV_ARG_DECL) const;
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 96314d1e143..816edeb04ec 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -35,8 +35,8 @@ TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name,
                         ACE_Lock &lock,
                         TAO_SYNCH_MUTEX &thread_lock,
                         TAO_ORB_Core &orb_core,
-                        TAO_Object_Adapter *object_adapter,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        TAO_Object_Adapter *object_adapter
+                        TAO_ENV_ARG_DECL)
   : TAO_POA (name,
              poa_manager,
              policies,
@@ -44,15 +44,15 @@ TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name,
              lock,
              thread_lock,
              orb_core,
-             object_adapter,
-             ACE_TRY_ENV),
+             object_adapter
+             TAO_ENV_ARG_PARAMETER),
   thread_pool_ (0)
 {
   ACE_CHECK;
 
   // Parse the RT policies and update our policy cache.
-  this->parse_rt_policies (this->policies (),
-                           ACE_TRY_ENV);
+  this->parse_rt_policies (this->policies ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -68,8 +68,8 @@ TAO_RT_POA::new_POA (const String &name,
                      ACE_Lock &lock,
                      TAO_SYNCH_MUTEX &thread_lock,
                      TAO_ORB_Core &orb_core,
-                     TAO_Object_Adapter *object_adapter,
-                     CORBA_Environment &ACE_TRY_ENV)
+                     TAO_Object_Adapter *object_adapter
+                     TAO_ENV_ARG_DECL)
 {
   TAO_RT_POA *poa;
 
@@ -81,8 +81,8 @@ TAO_RT_POA::new_POA (const String &name,
                                 lock,
                                 thread_lock,
                                 orb_core,
-                                object_adapter,
-                                ACE_TRY_ENV),
+                                object_adapter
+                                TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -90,29 +90,29 @@ TAO_RT_POA::new_POA (const String &name,
 }
 
 void
-TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
+                               TAO_ENV_ARG_DECL)
 {
   {
     CORBA::Policy_var policy =
       policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
     RTCORBA::PriorityModelPolicy_var priority_model =
-      RTCORBA::PriorityModelPolicy::_narrow (policy.in (),
-                                             ACE_TRY_ENV);
+      RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
+                                             TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (!CORBA::is_nil (priority_model.in ()))
       {
         RTCORBA::PriorityModel rt_priority_model =
-          priority_model->priority_model (ACE_TRY_ENV);
+          priority_model->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
         this->cached_policies ().priority_model (
           TAO_POA_Cached_Policies::PriorityModel (rt_priority_model));
 
         RTCORBA::Priority priority =
-          priority_model->server_priority (ACE_TRY_ENV);
+          priority_model->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
         this->cached_policies ().server_priority (priority);
@@ -121,14 +121,14 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies,
 
   this->thread_pool_ =
     TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
-                                                      policies.policies (),
-                                                      ACE_TRY_ENV);
+                                                      policies.policies ()
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_RT_POA::validate_priority (RTCORBA::Priority priority,
-                               CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::validate_priority (RTCORBA::Priority priority
+                               TAO_ENV_ARG_DECL)
 {
   if (priority < RTCORBA::minPriority ||
       priority > RTCORBA::maxPriority)
@@ -163,8 +163,8 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority,
         this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
 
       RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-        = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in (),
-                                                            ACE_TRY_ENV);
+        = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       TAO_PriorityBandedConnectionPolicy *priority_bands_i =
@@ -193,7 +193,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority,
 }
 
 void
-TAO_RT_POA::validate_policies (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_POA::validate_policies (TAO_ENV_SINGLE_ARG_DECL)
 {
   // For each of the above operations, if the POA supports the
   // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then
@@ -225,13 +225,13 @@ TAO_RT_POA::validate_policies (CORBA::Environment &ACE_TRY_ENV)
 TAO_Stub *
 TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                            const char *type_id,
-                           CORBA::Short priority,
-                           CORBA_Environment &ACE_TRY_ENV)
+                           CORBA::Short priority
+                           TAO_ENV_ARG_DECL)
 {
   // Client exposed policies.
   CORBA::PolicyList_var client_exposed_policies =
-    this->client_exposed_policies (priority,
-                                   ACE_TRY_ENV);
+    this->client_exposed_policies (priority
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Server protocol policy.
@@ -239,8 +239,8 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
     this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in (),
-                                            ACE_TRY_ENV);
+    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_ServerProtocolPolicy *server_protocol =
@@ -265,8 +265,8 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                                            type_id,
                                            client_exposed_policies._retn (),
                                            &filter,
-                                           *acceptor_registry,
-                                           ACE_TRY_ENV);
+                                           *acceptor_registry
+                                           TAO_ENV_ARG_PARAMETER);
     }
 
   // If this POA has the SERVER_DECLARED policy, create the IOR with
@@ -287,8 +287,8 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                                                       type_id,
                                                       client_exposed_policies._retn (),
                                                       &filter,
-                                                      lanes[i]->resources ().acceptor_registry (),
-                                                      ACE_TRY_ENV);
+                                                      lanes[i]->resources ().acceptor_registry ()
+                                                      TAO_ENV_ARG_PARAMETER);
         }
 
       ACE_ASSERT (0);
@@ -301,8 +301,8 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
     this->policies ().get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in (),
-                                                        ACE_TRY_ENV);
+    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_PriorityBandedConnectionPolicy *priority_bands_i =
@@ -313,8 +313,8 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                                    type_id,
                                    client_exposed_policies._retn (),
                                    &filter,
-                                   priority_bands_i,
-                                   ACE_TRY_ENV);
+                                   priority_bands_i
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 TAO_Stub *
@@ -322,8 +322,8 @@ TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
-                                TAO_PriorityBandedConnectionPolicy *priority_bands,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                TAO_PriorityBandedConnectionPolicy *priority_bands
+                                TAO_ENV_ARG_DECL)
 {
   int error = 0;
 
@@ -397,8 +397,8 @@ TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key,
   return
     this->orb_core_.create_stub_object (mprofile,
                                         type_id,
-                                        policy_list,
-                                        ACE_TRY_ENV);
+                                        policy_list
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 size_t
@@ -441,8 +441,8 @@ TAO_RT_POA::lane_required (TAO_Thread_Lane *lane,
 }
 
 CORBA::PolicyList *
-TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority,
-                                     CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
+                                     TAO_ENV_ARG_DECL)
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
@@ -452,8 +452,8 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority,
   ACE_CHECK_RETURN (0);
 
   // Add in all of the client exposed policies.
-  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies,
-                                                     ACE_TRY_ENV);
+  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Check if the priority model policy has been set, and if so, let
@@ -497,43 +497,43 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority,
 PortableServer::POA_ptr
 TAO_RT_POA::create_POA (const char *adapter_name,
                         PortableServer::POAManager_ptr poa_manager,
-                        const CORBA::PolicyList &policies,
-                        CORBA_Environment &ACE_TRY_ENV)
+                        const CORBA::PolicyList &policies
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
 {
   PortableServer::POA_ptr poa = this->TAO_POA::create_POA (adapter_name,
                                                            poa_manager,
-                                                           policies,
-                                                           ACE_TRY_ENV);
+                                                           policies
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa);
   return poa;
 }
 
 PortableServer::POA_ptr
 TAO_RT_POA::find_POA (const char *adapter_name,
-                      CORBA::Boolean activate_it,
-                      CORBA_Environment &ACE_TRY_ENV)
+                      CORBA::Boolean activate_it
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
   PortableServer::POA_ptr poa = this->TAO_POA::find_POA (adapter_name,
-                                                         activate_it,
-                                                         ACE_TRY_ENV);
+                                                         activate_it
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa);
   return poa;
 }
 
 void
 TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion,
-                     CORBA_Environment &ACE_TRY_ENV)
+                     CORBA::Boolean wait_for_completion
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_POA::destroy (etherealize_objects,
-                          wait_for_completion,
-                          ACE_TRY_ENV);
+                          wait_for_completion
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -541,13 +541,13 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ThreadPolicy_ptr
-TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                  CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
-    this->TAO_POA::create_thread_policy (value,
-                                         ACE_TRY_ENV);
+    this->TAO_POA::create_thread_policy (value
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -555,38 +555,38 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::LifespanPolicy_ptr
-TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                    CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
+                                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
-    this->TAO_POA::create_lifespan_policy (value,
-                                           ACE_TRY_ENV);
+    this->TAO_POA::create_lifespan_policy (value
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
 
 PortableServer::IdUniquenessPolicy_ptr
-TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                         CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
+                                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
-    this->TAO_POA::create_id_uniqueness_policy (value,
-                                                ACE_TRY_ENV);
+    this->TAO_POA::create_id_uniqueness_policy (value
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
 
 
 PortableServer::IdAssignmentPolicy_ptr
-TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                         CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
+                                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
-    this->TAO_POA::create_id_assignment_policy (value,
-                                                ACE_TRY_ENV);
+    this->TAO_POA::create_id_assignment_policy (value
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -595,38 +595,38 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ImplicitActivationPolicy_ptr
-TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                               CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
+                                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
-    this->TAO_POA::create_implicit_activation_policy (value,
-                                                      ACE_TRY_ENV);
+    this->TAO_POA::create_implicit_activation_policy (value
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
 
 PortableServer::ServantRetentionPolicy_ptr
-TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                             CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
+                                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
-    this->TAO_POA::create_servant_retention_policy (value,
-                                                    ACE_TRY_ENV);
+    this->TAO_POA::create_servant_retention_policy (value
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
 
 
 PortableServer::RequestProcessingPolicy_ptr
-TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                              CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
+                                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
-    this->TAO_POA::create_request_processing_policy (value,
-                                                     ACE_TRY_ENV);
+    this->TAO_POA::create_request_processing_policy (value
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -635,41 +635,41 @@ TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingP
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 char *
-TAO_RT_POA::the_name (CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::the_name (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char * name =
-    this->TAO_POA::the_name (ACE_TRY_ENV);
+    this->TAO_POA::the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (name);
   return name;
 }
 
 PortableServer::POA_ptr
-TAO_RT_POA::the_parent (CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_ptr parent =
-    this->TAO_POA::the_parent (ACE_TRY_ENV);
+    this->TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (parent);
   return parent;
 }
 
 PortableServer::POAList *
-TAO_RT_POA::the_children (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_POA::the_children (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList *children =
-    this->TAO_POA::the_children (ACE_TRY_ENV);
+    this->TAO_POA::the_children (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (children);
   return children;
 }
 
 PortableServer::POAManager_ptr
-TAO_RT_POA::the_POAManager (CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAManager_ptr poa_manager =
-    this->TAO_POA::the_POAManager (ACE_TRY_ENV);
+    this->TAO_POA::the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa_manager);
   return poa_manager;
 }
@@ -678,232 +678,232 @@ TAO_RT_POA::the_POAManager (CORBA_Environment &ACE_TRY_ENV)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::AdapterActivator_ptr
-TAO_RT_POA::the_activator (CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::AdapterActivator_ptr activator =
-    this->TAO_POA::the_activator (ACE_TRY_ENV);
+    this->TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (activator);
   return activator;
 }
 
 void
-TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                           CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_POA::the_activator (adapter_activator,
-                                ACE_TRY_ENV);
+  this->TAO_POA::the_activator (adapter_activator
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::ServantManager_ptr
-TAO_RT_POA::get_servant_manager (CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ServantManager_ptr servant_manager =
-    this->TAO_POA::get_servant_manager (ACE_TRY_ENV);
+    this->TAO_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant_manager);
   return servant_manager;
 }
 
 void
-TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                                 CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
+                                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_POA::set_servant_manager (imgr,
-                                      ACE_TRY_ENV);
+  this->TAO_POA::set_servant_manager (imgr
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::Servant
-TAO_RT_POA::get_servant (CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_POA::get_servant (ACE_TRY_ENV);
+    this->TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
 }
 
 void
-TAO_RT_POA::set_servant (PortableServer::Servant servant,
-                         CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::set_servant (PortableServer::Servant servant
+                         TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_POA::set_servant (servant,
-                              ACE_TRY_ENV);
+  this->TAO_POA::set_servant (servant
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 PortableServer::ObjectId *
-TAO_RT_POA::activate_object (PortableServer::Servant p_servant,
-                             CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::activate_object (PortableServer::Servant p_servant
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_POA::activate_object (p_servant,
-                                    ACE_TRY_ENV);
+    this->TAO_POA::activate_object (p_servant
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
 }
 
 void
 TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                     PortableServer::Servant p_servant,
-                                     CORBA_Environment &ACE_TRY_ENV)
+                                     PortableServer::Servant p_servant
+                                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_POA::activate_object_with_id (id,
-                                          p_servant,
-                                          ACE_TRY_ENV);
+                                          p_servant
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid,
-                               CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_POA::deactivate_object (oid,
-                                    ACE_TRY_ENV);
+  this->TAO_POA::deactivate_object (oid
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Object_ptr
-TAO_RT_POA::create_reference (const char *intf,
-                              CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::create_reference (const char *intf
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_POA::create_reference (intf,
-                                     ACE_TRY_ENV);
+    this->TAO_POA::create_reference (intf
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
-                                      const char *intf,
-                                      CORBA_Environment &ACE_TRY_ENV)
+                                      const char *intf
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_POA::create_reference_with_id (oid,
-                                             intf,
-                                             ACE_TRY_ENV);
+                                             intf
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
 
 PortableServer::ObjectId *
-TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant,
-                           CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_POA::servant_to_id (p_servant,
-                                  ACE_TRY_ENV);
+    this->TAO_POA::servant_to_id (p_servant
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
 }
 
 CORBA::Object_ptr
-TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant,
-                                  CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_POA::servant_to_reference (p_servant,
-                                         ACE_TRY_ENV);
+    this->TAO_POA::servant_to_reference (p_servant
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
 
 
 PortableServer::Servant
-TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference,
-                                  CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
+                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_POA::reference_to_servant (reference,
-                                         ACE_TRY_ENV);
+    this->TAO_POA::reference_to_servant (reference
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
 }
 
 PortableServer::ObjectId *
-TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference,
-                             CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_POA::reference_to_id (reference,
-                                    ACE_TRY_ENV);
+    this->TAO_POA::reference_to_id (reference
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
 }
 
 PortableServer::Servant
-TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid,
-                           CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_POA::id_to_servant (oid,
-                                  ACE_TRY_ENV);
+    this->TAO_POA::id_to_servant (oid
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
 }
 
 CORBA::Object_ptr
-TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid,
-                             CORBA_Environment &ACE_TRY_ENV)
+TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_POA::id_to_reference (oid,
-                                    ACE_TRY_ENV);
+    this->TAO_POA::id_to_reference (oid
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
 
 CORBA::OctetSeq *
-TAO_RT_POA::id (CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_POA::id (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->TAO_POA::id (ACE_TRY_ENV);
+  return this->TAO_POA::id (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index ab523dd99e9..e77404726e1 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -53,29 +53,29 @@ public:
 
   // RTCORBA specific methods
   CORBA::Object_ptr create_reference_with_priority (const char * intf,
-                                                    RTCORBA::Priority priority,
-                                                    CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                                    RTCORBA::Priority priority
+                                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                            const char * intf,
-                                                           RTCORBA::Priority priority,
-                                                           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                                           RTCORBA::Priority priority
+                                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant,
-                                                            RTCORBA::Priority priority,
-                                                            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                                            RTCORBA::Priority priority
+                                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                              PortableServer::Servant p_servant,
-                                             RTCORBA::Priority priority,
-                                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                             RTCORBA::Priority priority
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
@@ -85,176 +85,176 @@ public:
   // Standard POA interface methods
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                      const CORBA::PolicyList &policies
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it,
-                                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                    CORBA::Boolean activate_it
+                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion,
-                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                CORBA::Boolean wait_for_completion
+                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
+                                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
+                                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
+                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
+                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                                  CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
+                                                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
+                                                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
+                                                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAList *the_children (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
+                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                            CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
-  void set_servant (PortableServer::Servant servant,
-                    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void set_servant (PortableServer::Servant servant
+                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant,
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant,
-                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                PortableServer::Servant p_servant
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
-  void deactivate_object (const PortableServer::ObjectId &oid,
-                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  void deactivate_object (const PortableServer::ObjectId &oid
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr create_reference (const char *intf,
-                                      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::Object_ptr create_reference (const char *intf
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf,
-                                              CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+                                              const char *intf
+                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant,
-                                           CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
+                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,
-                                          CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,
-                                                CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
+                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference,
-                                             CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
+                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,
-                                         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,
-                                     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::OctetSeq *id (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+  CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // End standard POA interface methods.
 
-  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority,
-                                                      CORBA_Environment &ACE_TRY_ENV);
+  virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority
+                                                      TAO_ENV_ARG_DECL);
 
   TAO_RT_POA (const String &name,
               TAO_POA_Manager &poa_manager,
@@ -263,8 +263,8 @@ public:
               ACE_Lock &lock,
               TAO_SYNCH_MUTEX &thread_lock,
               TAO_ORB_Core &orb_core,
-              TAO_Object_Adapter *object_adapter,
-              CORBA_Environment &ACE_TRY_ENV);
+              TAO_Object_Adapter *object_adapter
+              TAO_ENV_ARG_DECL);
 
   virtual ~TAO_RT_POA (void);
 
@@ -280,23 +280,23 @@ protected:
                             ACE_Lock &lock,
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
-                            TAO_Object_Adapter *object_adapter,
-                            CORBA_Environment &ACE_TRY_ENV);
+                            TAO_Object_Adapter *object_adapter
+                            TAO_ENV_ARG_DECL);
 
   virtual TAO_Stub *key_to_stub_i (const TAO_ObjectKey &key,
                                    const char *type_id,
-                                   CORBA::Short priority,
-                                   CORBA_Environment &ACE_TRY_ENV);
+                                   CORBA::Short priority
+                                   TAO_ENV_ARG_DECL);
 
-  void validate_priority (RTCORBA::Priority priority,
-                          CORBA_Environment &ACE_TRY_ENV);
+  void validate_priority (RTCORBA::Priority priority
+                          TAO_ENV_ARG_DECL);
 
-  void validate_policies (CORBA::Environment &ACE_TRY_ENV);
+  void validate_policies (TAO_ENV_SINGLE_ARG_DECL);
 
   // Parse the policy list for RT policies and update our
   // cached policy instance.
-  void parse_rt_policies (TAO_POA_Policy_Set &policies,
-                          CORBA::Environment &ACE_TRY_ENV);
+  void parse_rt_policies (TAO_POA_Policy_Set &policies
+                          TAO_ENV_ARG_DECL);
 
   size_t endpoint_count (void);
 
@@ -304,8 +304,8 @@ protected:
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
-                                TAO_PriorityBandedConnectionPolicy *priority_bands,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                TAO_PriorityBandedConnectionPolicy *priority_bands
+                                TAO_ENV_ARG_DECL);
 
   int lane_required (TAO_Thread_Lane *lane,
                      TAO_PriorityBandedConnectionPolicy *priority_bands);
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i
index 71c05db66dc..258f91f2cf2 100644
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ b/TAO/tao/RTPortableServer/RT_POA.i
@@ -6,39 +6,39 @@
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_priority (const char * intf,
-                                            RTCORBA::Priority priority,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            RTCORBA::Priority priority
+                                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_TRY_ENV);
+  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  this->validate_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
   return this->create_reference_i (intf,
-                                   priority,
-                                   ACE_TRY_ENV);
+                                   priority
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                    const char * intf,
-                                                   RTCORBA::Priority priority,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+                                                   RTCORBA::Priority priority
+                                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_TRY_ENV);
+  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  this->validate_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Lock access for the duration of this transaction.
@@ -46,48 +46,48 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI
 
   return this->create_reference_with_id_i (oid,
                                            intf,
-                                           priority,
-                                           ACE_TRY_ENV);
+                                           priority
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
-                                           RTCORBA::Priority priority,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           RTCORBA::Priority priority
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_TRY_ENV);
+  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  this->validate_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
   return this->activate_object_i (servant,
-                                  priority,
-                                  ACE_TRY_ENV);
+                                  priority
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                   PortableServer::Servant servant,
-                                                  RTCORBA::Priority priority,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+                                                  RTCORBA::Priority priority
+                                                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (ACE_TRY_ENV);
+  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_priority (priority, ACE_TRY_ENV);
+  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Lock access for the duration of this transaction.
@@ -95,8 +95,8 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
 
   this->activate_object_with_id_i (oid,
                                    servant,
-                                   priority,
-                                   ACE_TRY_ENV);
+                                   priority
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void *
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index 23115845489..35fa3ddef8e 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -37,19 +37,19 @@ TAO_POA_RT_Policy_Validator::acceptor_registry (void)
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies
+                                            TAO_ENV_ARG_DECL)
 {
-  this->validate_thread_pool (policies, ACE_TRY_ENV);
+  this->validate_thread_pool (policies TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_lifespan (policies, ACE_TRY_ENV);
+  this->validate_lifespan (policies TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_server_protocol (policies, ACE_TRY_ENV);
+  this->validate_server_protocol (policies TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_priorities (policies, ACE_TRY_ENV);
+  this->validate_priorities (policies TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -64,8 +64,8 @@ TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies,
-                                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
+                                                       TAO_ENV_ARG_DECL)
 {
   // Make sure we have an endpoint for at least one of the protocols
   // specified in the RTCORBA::ServerProtocolPolicy.  This ensure we
@@ -74,8 +74,8 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies,
     policies.get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in (),
-                                            ACE_TRY_ENV);
+    RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_ServerProtocolPolicy *server_protocol =
@@ -110,8 +110,8 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies,
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
+                                                  TAO_ENV_ARG_DECL)
 {
   // Initialize to the default priority/priority model.
   CORBA::Short priority =
@@ -123,18 +123,18 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
     policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL);
 
   RTCORBA::PriorityModelPolicy_var priority_model =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in (),
-                                           ACE_TRY_ENV);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (priority_model.in ()))
     {
-      priority = priority_model->server_priority (ACE_TRY_ENV);
+      priority = priority_model->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       rt_priority_model =
         TAO_POA_Cached_Policies::PriorityModel (
-          priority_model->priority_model (ACE_TRY_ENV));
+          priority_model->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
 
       // Check that the priority is in bounds.
@@ -155,8 +155,8 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
     policies.get_cached_policy (TAO_CACHED_POLICY_RT_PRIORITY_BANDED_CONNECTION);
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
-    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in (),
-                                                        ACE_TRY_ENV);
+    = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PriorityBandedConnectionPolicy *bands_policy =
@@ -299,19 +299,19 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies,
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies
+                                                   TAO_ENV_ARG_DECL)
 {
   this->thread_pool_ =
     TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
-                                                      policies,
-                                                      ACE_TRY_ENV);
+                                                      policies
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies,
-                                                CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies
+                                                TAO_ENV_ARG_DECL)
 {
   // If this POA is using a RTCORBA thread pool, make sure the
   // lifespan policy is not persistent since we cannot support it
@@ -321,12 +321,12 @@ TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies,
       CORBA::Policy_var policy =
         policies.get_cached_policy (TAO_CACHED_POLICY_LIFESPAN);
       PortableServer::LifespanPolicy_var lifespan_policy =
-        PortableServer::LifespanPolicy::_narrow (policy.in (),
-                                                 ACE_TRY_ENV);
+        PortableServer::LifespanPolicy::_narrow (policy.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       PortableServer::LifespanPolicyValue lifespan =
-        lifespan_policy->value (ACE_TRY_ENV);
+        lifespan_policy->value (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (lifespan == PortableServer::PERSISTENT)
@@ -337,8 +337,8 @@ TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies,
 }
 
 void
-TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
+                                                  TAO_ENV_ARG_DECL)
 {
   // Check if the user has specified the priority model policy.
   CORBA::Policy_var priority_model =
@@ -353,7 +353,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies,
       if (!CORBA::is_nil (priority_model.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (priority_model.in (), ACE_TRY_ENV);
+          policies.set_policy (priority_model.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -371,7 +371,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies,
       if (!CORBA::is_nil (server_protocol.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (server_protocol.in (), ACE_TRY_ENV);
+          policies.set_policy (server_protocol.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -389,7 +389,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies,
       if (!CORBA::is_nil (thread_pool.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (thread_pool.in (), ACE_TRY_ENV);
+          policies.set_policy (thread_pool.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -398,32 +398,32 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies,
 /* static */
 TAO_Thread_Pool *
 TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
-                                                  TAO_Policy_Set &policies,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+                                                  TAO_Policy_Set &policies
+                                                  TAO_ENV_ARG_DECL)
 {
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
 
   RTCORBA::ThreadpoolPolicy_var thread_pool_policy =
-    RTCORBA::ThreadpoolPolicy::_narrow (policy.in (),
-                                        ACE_TRY_ENV);
+    RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (thread_pool_policy.in ()))
     return 0;
 
   RTCORBA::ThreadpoolId thread_pool_id =
-    thread_pool_policy->threadpool (ACE_TRY_ENV);
+    thread_pool_policy->threadpool (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the RTORB.
   CORBA::Object_var object =
-    orb_core.resolve_rt_orb (ACE_TRY_ENV);
+    orb_core.resolve_rt_orb (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   RTCORBA::RTORB_var rt_orb =
-    RTCORBA::RTORB::_narrow (object.in (),
-                             ACE_TRY_ENV);
+    RTCORBA::RTORB::_narrow (object.in ()
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_RT_ORB *tao_rt_orb =
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index 1c6b6148b66..1f2540c572c 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -39,8 +39,8 @@ public:
   ~TAO_POA_RT_Policy_Validator (void);
 
   static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core,
-                                               TAO_Policy_Set &policies,
-                                               CORBA::Environment &ACE_TRY_ENV);
+                                               TAO_Policy_Set &policies
+                                               TAO_ENV_ARG_DECL);
 
   static TAO_Acceptor_Registry *extract_acceptor_registry (TAO_ORB_Core &orb_core,
                                                            TAO_Thread_Pool *thread_pool);
@@ -52,12 +52,12 @@ protected:
    * are consistent and legal.  Throw an appropriate exception
    * if that is not the case.
    */
-  void validate_impl (TAO_Policy_Set &policies,
-                      CORBA::Environment &ACE_TRY_ENV);
+  void validate_impl (TAO_Policy_Set &policies
+                      TAO_ENV_ARG_DECL);
 
   /// Add/merge policies.
-  void merge_policies_impl (TAO_Policy_Set &policies,
-                            CORBA::Environment &ACE_TRY_ENV);
+  void merge_policies_impl (TAO_Policy_Set &policies
+                            TAO_ENV_ARG_DECL);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -68,17 +68,17 @@ protected:
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
 
 private:
-  void validate_server_protocol (TAO_Policy_Set &policies,
-                                 CORBA::Environment &ACE_TRY_ENV);
+  void validate_server_protocol (TAO_Policy_Set &policies
+                                 TAO_ENV_ARG_DECL);
 
-  void validate_priorities (TAO_Policy_Set &policies,
-                            CORBA::Environment &ACE_TRY_ENV);
+  void validate_priorities (TAO_Policy_Set &policies
+                            TAO_ENV_ARG_DECL);
 
-  void validate_thread_pool (TAO_Policy_Set &policies,
-                             CORBA::Environment &ACE_TRY_ENV);
+  void validate_thread_pool (TAO_Policy_Set &policies
+                             TAO_ENV_ARG_DECL);
 
-  void validate_lifespan (TAO_Policy_Set &policies,
-                          CORBA::Environment &ACE_TRY_ENV);
+  void validate_lifespan (TAO_Policy_Set &policies
+                          TAO_ENV_ARG_DECL);
 
   TAO_Acceptor_Registry *acceptor_registry (void);
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 362d6b1be03..27106dc1cec 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -24,11 +24,11 @@ RT_Priority_Model_Processing::~RT_Priority_Model_Processing (void)
 {
   if (this->state_ == PRIORITY_RESET_REQUIRED)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       ACE_TRY
         {
-          this->post_invoke (ACE_TRY_ENV);
+          this->post_invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -44,8 +44,8 @@ RT_Priority_Model_Processing::~RT_Priority_Model_Processing (void)
 void
 RT_Priority_Model_Processing::pre_invoke (
    TAO_Service_Context &request_service_context,
-   TAO_Service_Context &reply_service_context,
-   CORBA::Environment &ACE_TRY_ENV)
+   TAO_Service_Context &reply_service_context
+   TAO_ENV_ARG_DECL)
 {
   TAO_Thread_Pool *thread_pool =
     (TAO_Thread_Pool *) this->poa_.thread_pool ();
@@ -84,12 +84,12 @@ RT_Priority_Model_Processing::pre_invoke (
 
   // Remember current thread's priority.
   TAO_Protocols_Hooks *tph =
-    this->poa_.orb_core ().get_protocols_hooks (ACE_TRY_ENV);
+    this->poa_.orb_core ().get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (tph->get_thread_CORBA_and_native_priority (this->original_CORBA_priority_,
-                                                 this->original_native_priority_,
-                                                 ACE_TRY_ENV)
+                                                 this->original_native_priority_
+                                                 TAO_ENV_ARG_PARAMETER)
       == -1)
     ACE_THROW (CORBA::DATA_CONVERSION (1,
                                        CORBA::COMPLETED_NO));
@@ -170,8 +170,8 @@ RT_Priority_Model_Processing::pre_invoke (
   if (target_priority != TAO_INVALID_PRIORITY &&
       target_priority != this->original_CORBA_priority_)
     {
-      if (tph->set_thread_CORBA_priority (target_priority,
-                                          ACE_TRY_ENV)
+      if (tph->set_thread_CORBA_priority (target_priority
+                                          TAO_ENV_ARG_PARAMETER)
           == -1)
         ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 
@@ -180,8 +180,8 @@ RT_Priority_Model_Processing::pre_invoke (
       if (TAO_debug_level > 0)
         {
           CORBA::Short native_priority;
-          tph->get_thread_native_priority (native_priority,
-                                           ACE_TRY_ENV);
+          tph->get_thread_native_priority (native_priority
+                                           TAO_ENV_ARG_PARAMETER);
 
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("%s processing using %s ")
@@ -230,7 +230,7 @@ RT_Priority_Model_Processing::pre_invoke (
 
 void
 RT_Priority_Model_Processing::post_invoke (
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->state_ == PRIORITY_RESET_REQUIRED)
     {
@@ -239,11 +239,11 @@ RT_Priority_Model_Processing::post_invoke (
       // Reset the priority of the current thread back to its original
       // value.
       TAO_Protocols_Hooks *tph =
-        this->poa_.orb_core ().get_protocols_hooks (ACE_TRY_ENV);
+        this->poa_.orb_core ().get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (tph->set_thread_native_priority (this->original_native_priority_,
-                                           ACE_TRY_ENV)
+      if (tph->set_thread_native_priority (this->original_native_priority_
+                                           TAO_ENV_ARG_PARAMETER)
           == -1)
         ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
     }
@@ -257,8 +257,8 @@ TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
 
 void
 TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                                     TAO_ServerRequest &req,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     TAO_ServerRequest &req
+                                     TAO_ENV_ARG_DECL)
 {
   // RTCORBA PriorityModelPolicy processing (may need to be
   // moved/adjusted when POA threadpools are added).  This is the
@@ -269,20 +269,20 @@ TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant
 
   // Set thread's priority.
   priority_processing.pre_invoke (req.request_service_context (),
-                                  req.reply_service_context (),
-                                  ACE_TRY_ENV);
+                                  req.reply_service_context ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Servant dispatch.
   servant_upcall.servant ()->_dispatch (req,
-                                        &servant_upcall,
-                                        ACE_TRY_ENV);
+                                        &servant_upcall
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Reset thread's priority to its original value.  If this method
   // isn't reached, i.e., because of an exception, the reset takes
   // place in Priority_Model_Processing destructor.
-  priority_processing.post_invoke (ACE_TRY_ENV);
+  priority_processing.post_invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -294,8 +294,8 @@ TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name,
                                        ACE_Lock &lock,
                                        TAO_SYNCH_MUTEX &thread_lock,
                                        TAO_ORB_Core &orb_core,
-                                       TAO_Object_Adapter *object_adapter,
-                                       CORBA_Environment &ACE_TRY_ENV)
+                                       TAO_Object_Adapter *object_adapter
+                                       TAO_ENV_ARG_DECL)
 {
   TAO_RT_POA *poa;
 
@@ -307,8 +307,8 @@ TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name,
                                 lock,
                                 thread_lock,
                                 orb_core,
-                                object_adapter,
-                                ACE_TRY_ENV),
+                                object_adapter
+                                TAO_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index 9d8c758122a..d0f0c5edb1e 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -44,8 +44,8 @@ public:
 
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                         TAO_ServerRequest &req,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         TAO_ServerRequest &req
+                         TAO_ENV_ARG_DECL);
 
    /// Factory method for creating new POA's.
   virtual TAO_POA *create_POA (const ACE_CString &name,
@@ -55,8 +55,8 @@ public:
                                ACE_Lock &lock,
                                TAO_SYNCH_MUTEX &thread_lock,
                                TAO_ORB_Core &orb_core,
-                               TAO_Object_Adapter *object_adapter,
-                               CORBA_Environment &ACE_TRY_ENV);
+                               TAO_Object_Adapter *object_adapter
+                               TAO_ENV_ARG_DECL);
 };
 
 /**
@@ -93,12 +93,12 @@ public:
   // current thread, and sets the thread to the client-propagated
   // priority.
   void pre_invoke (TAO_Service_Context &request_service_context,
-                   TAO_Service_Context &reply_service_context,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   TAO_Service_Context &reply_service_context
+                   TAO_ENV_ARG_DECL);
 
   // Resets the priority of the current thread back to its original
   // value, if necessary.
-  void post_invoke (CORBA::Environment &ACE_TRY_ENV);
+  void post_invoke (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index 0bbc18bf46b..e5897583de0 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -29,14 +29,14 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
   int result = 0;
 
   // @@ Should we pass this down?  Can we?
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_ORB_Core *orb_core = transport->orb_core ();
 
       while (!msg->all_data_sent () && result >= 0)
         {
-          result = orb_core->run (max_wait_time, 1, ACE_TRY_ENV);
+          result = orb_core->run (max_wait_time, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -53,14 +53,14 @@ int
 TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
 {
   // @@ Should we pass this down?  Can we?
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_ORB_Core *orb_core = transport->orb_core ();
 
       while (!transport->queue_is_empty ())
         {
-          int result = orb_core->run (0, 1, ACE_TRY_ENV);
+          int result = orb_core->run (0, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result == -1)
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index af9997ad750..b4ba0c82dd3 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -22,8 +22,8 @@ TAO_Remote_Object_Proxy_Broker::~TAO_Remote_Object_Proxy_Broker (void)
 }
 
 TAO_Object_Proxy_Impl &
-TAO_Remote_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr,
-                                              CORBA::Environment &)
+TAO_Remote_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr
+                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
   return this->remote_proxy_impl_;
 }
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index 3141570c538..de68214b209 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -36,8 +36,8 @@ public:
   TAO_Remote_Object_Proxy_Broker (void);
   ~TAO_Remote_Object_Proxy_Broker (void);
 
-  virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object,
-                                               CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object
+                                               TAO_ENV_ARG_DECL);
 
 private:
   TAO_Remote_Object_Proxy_Impl remote_proxy_impl_;
diff --git a/TAO/tao/Remote_Object_Proxy_Impl.cpp b/TAO/tao/Remote_Object_Proxy_Impl.cpp
index 9953a9b6210..91804983854 100644
--- a/TAO/tao/Remote_Object_Proxy_Impl.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Impl.cpp
@@ -24,8 +24,8 @@ TAO_Remote_Object_Proxy_Impl::~TAO_Remote_Object_Proxy_Impl (void)
 
 CORBA::Boolean
 TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
-                                     const CORBA::Char *logical_type_id,
-                                     CORBA_Environment &ACE_TRY_ENV)
+                                     const CORBA::Char *logical_type_id
+                                     TAO_ENV_ARG_DECL)
 {
   // Here we go remote to answer the question.
   CORBA::Boolean _tao_retval = 0;
@@ -50,13 +50,13 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
   //  ACE_TRY_ENV.clear ();
   for (;;)
     {
-      _tao_call.start (ACE_TRY_ENV);
+      _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
 
       CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
-      _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
-                                ACE_TRY_ENV);
+      _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
 
       TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
@@ -66,7 +66,7 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
         ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
 
       int _invoke_status =
-        _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -93,9 +93,9 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-CORBA::Boolean 
-TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
-                                             CORBA_Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
+                                             TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
@@ -122,17 +122,17 @@ TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
       // ACE_TRY_ENV.clear ();
       for (;;)
         {
-          _tao_call.start (ACE_TRY_ENV);
+          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
-          _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag),
-                                    ACE_TRY_ENV);
+          _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           int _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -165,8 +165,8 @@ TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target,
 }
 
 CORBA_InterfaceDef_ptr
-TAO_Remote_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target,
-                                              CORBA_Environment &ACE_TRY_ENV)
+TAO_Remote_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
+                                              TAO_ENV_ARG_DECL)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -179,8 +179,8 @@ TAO_Remote_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target,
                         0);
     }
 
-  return adapter->get_interface_remote (target,
-                                        ACE_TRY_ENV);
+  return adapter->get_interface_remote (target
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/Remote_Object_Proxy_Impl.h b/TAO/tao/Remote_Object_Proxy_Impl.h
index 94dddb2c76c..b43bee455e1 100644
--- a/TAO/tao/Remote_Object_Proxy_Impl.h
+++ b/TAO/tao/Remote_Object_Proxy_Impl.h
@@ -38,17 +38,17 @@ public:
   virtual ~TAO_Remote_Object_Proxy_Impl (void);
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
-                                const CORBA::Char *logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV);
+                                const CORBA::Char *logical_type_id
+                                TAO_ENV_ARG_DECL);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target,
-                                        CORBA_Environment &ACE_TRY_ENV);
+  virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
+                                        TAO_ENV_ARG_DECL);
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      const CORBA::Object_ptr target,
-      CORBA_Environment &ACE_TRY_ENV
+      const CORBA::Object_ptr target
+      TAO_ENV_ARG_DECL
     );
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp
index 29a87b625bb..cf4a53ef73c 100644
--- a/TAO/tao/RequestInfo_Util.cpp
+++ b/TAO/tao/RequestInfo_Util.cpp
@@ -9,7 +9,7 @@
 ACE_RCSID (tao, RequestInfo_Util, "$Id$")
 
 Dynamic::ParameterList *
-TAO_RequestInfo_Util::make_parameter_list (CORBA::Environment &ACE_TRY_ENV)
+TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::ParameterList *parameter_list = 0;
   ACE_NEW_THROW_EX (parameter_list,
@@ -26,7 +26,7 @@ TAO_RequestInfo_Util::make_parameter_list (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::ExceptionList *
-TAO_RequestInfo_Util::make_exception_list (CORBA::Environment &ACE_TRY_ENV)
+TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::ExceptionList *exception_list = 0;
   ACE_NEW_THROW_EX (exception_list,
@@ -43,7 +43,7 @@ TAO_RequestInfo_Util::make_exception_list (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::ContextList *
-TAO_RequestInfo_Util::make_context_list (CORBA::Environment &ACE_TRY_ENV)
+TAO_RequestInfo_Util::make_context_list (TAO_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::ContextList *context_list = 0;
   ACE_NEW_THROW_EX (context_list,
@@ -60,7 +60,7 @@ TAO_RequestInfo_Util::make_context_list (CORBA::Environment &ACE_TRY_ENV)
 }
 
 Dynamic::RequestContext *
-TAO_RequestInfo_Util::make_request_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_RequestInfo_Util::make_request_context (TAO_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::RequestContext *request_context = 0;
   ACE_NEW_THROW_EX (request_context,
@@ -77,8 +77,8 @@ TAO_RequestInfo_Util::make_request_context (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Any *
-TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
+                                TAO_ENV_ARG_DECL)
 {
   CORBA::Any *any = 0;
 
diff --git a/TAO/tao/RequestInfo_Util.h b/TAO/tao/RequestInfo_Util.h
index 040ec004c47..c757ec4025e 100644
--- a/TAO/tao/RequestInfo_Util.h
+++ b/TAO/tao/RequestInfo_Util.h
@@ -44,19 +44,19 @@ public:
    */
   //@{
   static Dynamic::ParameterList * make_parameter_list (
-    CORBA::Environment &ACE_TRY_ENV);
+    TAO_ENV_SINGLE_ARG_DECL);
 
   static Dynamic::ExceptionList * make_exception_list (
-    CORBA::Environment &ACE_TRY_ENV);
+    TAO_ENV_SINGLE_ARG_DECL);
 
   static Dynamic::ContextList * make_context_list (
-    CORBA::Environment &ACE_TRY_ENV);
+    TAO_ENV_SINGLE_ARG_DECL);
 
   static Dynamic::RequestContext * make_request_context (
-    CORBA::Environment &ACE_TRY_ENV);
+    TAO_ENV_SINGLE_ARG_DECL);
 
-  static CORBA::Any * make_any (CORBA::Boolean tk_void_any,
-                                CORBA::Environment &ACE_TRY_ENV);
+  static CORBA::Any * make_any (CORBA::Boolean tk_void_any
+                                TAO_ENV_ARG_DECL);
   //@}
 
 };
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 5e6f6e98a10..fc63264d7c5 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -23,8 +23,8 @@ void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
 
 void
 TAO_Base_Sequence::_downcast (void*,
-                              CORBA_Object*,
-                              CORBA_Environment &)
+                              CORBA_Object*
+                              TAO_ENV_ARG_DECL_NOT_USED)
 {
   // default is no op.
   // @@ TODO Maybe throw an exception?
@@ -197,7 +197,7 @@ TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
         {
           result = allocbuf (this->length_);
           this->buffer_ = result;
-	        this->release_ = 1;
+                this->release_ = 1;
         }
       else
         {
@@ -432,7 +432,7 @@ TAO_Unbounded_WString_Sequence::get_buffer (CORBA::Boolean orphan)
         {
           result = allocbuf (this->length_);
           this->buffer_ = result;
-	        this->release_ = 1;
+                this->release_ = 1;
         }
       else
         {
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 625381fd345..1e93f297116 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -72,9 +72,8 @@ public:
   /// Used for sequences of objects to downcast a recently demarshalled
   /// object reference into the right type.
   virtual void _downcast (void *target,
-                          CORBA_Object *src,
-                          CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+                          CORBA_Object *src
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Used for sequences of object to convert from the derived type
   /// into the Object class.
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 6b8f55d3a0f..56db6fafa38 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -542,12 +542,12 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
 
 template <class T, class T_var> void
 TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
-                                                   CORBA_Object* src,
-                                                   CORBA_Environment &ACE_TRY_ENV)
+                                                   CORBA_Object* src
+                                                   TAO_ENV_ARG_DECL)
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T_var::tao_narrow (src, ACE_TRY_ENV);
+  *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
@@ -711,12 +711,12 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
 
 template <class T, class T_var, size_t MAX> void
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
-                                                      CORBA_Object* src,
-                                                      CORBA_Environment &ACE_TRY_ENV)
+                                                      CORBA_Object* src
+                                                      TAO_ENV_ARG_DECL)
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T_var::tao_narrow (src, ACE_TRY_ENV);
+  *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
@@ -1057,8 +1057,8 @@ TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (CORBA::ULong nelems)
 {
   T *buf = 0;
 
-  ACE_NEW_RETURN (buf, 
-                  T[nelems], 
+  ACE_NEW_RETURN (buf,
+                  T[nelems],
                   0);
 
   return buf;
@@ -1223,8 +1223,8 @@ TAO_Bounded_Array_Sequence<T, T_var, MAX>::allocbuf (CORBA::ULong)
 {
   T *buf = 0;
 
-  ACE_NEW_RETURN (buf, 
-                  T[MAX], 
+  ACE_NEW_RETURN (buf,
+                  T[MAX],
                   0);
 
   return buf;
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 2fefbe2ec3a..49363f410e2 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -554,9 +554,8 @@ public:
   virtual void _shrink_buffer (CORBA::ULong new_length,
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
-                          CORBA_Object* src,
-                          CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+                          CORBA_Object* src
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
@@ -616,9 +615,8 @@ public:
   virtual void _shrink_buffer (CORBA::ULong new_length,
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
-                          CORBA_Object* src,
-                          CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+                          CORBA_Object* src
+                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index ca75c4aef24..b649fdf7a38 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -46,8 +46,8 @@ TAO_Service_Callbacks::reset_profile_flags (void)
 void
 TAO_Service_Callbacks::service_context_list (TAO_Stub *& /*stub*/ ,
                                              IOP::ServiceContextList & /*service_list*/,
-                                             CORBA::Boolean ,
-                                             CORBA::Environment & /*ACE_TRY_ENV*/)
+                                             CORBA::Boolean
+                                             TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   return;
 }
@@ -55,8 +55,8 @@ TAO_Service_Callbacks::service_context_list (TAO_Stub *& /*stub*/ ,
 int
 TAO_Service_Callbacks::raise_comm_failure (
     TAO_GIOP_Invocation * /*invoke*/,
-    TAO_Profile * /*profile*/,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_Profile * /*profile*/
+    TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::COMM_FAILURE (
       CORBA_SystemException::_tao_minor_code (
@@ -69,8 +69,8 @@ TAO_Service_Callbacks::raise_comm_failure (
 int
 TAO_Service_Callbacks::raise_transient_failure (
     TAO_GIOP_Invocation * /*invoke*/,
-    TAO_Profile * /*profile*/,
-    CORBA::Environment &ACE_TRY_ENV)
+    TAO_Profile * /*profile*/
+    TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::TRANSIENT (
       CORBA_SystemException::_tao_minor_code (
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index d3947fbd3b4..ec15ab0b0f4 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -69,20 +69,20 @@ public:
   /// information.
   virtual void service_context_list (TAO_Stub *&stub,
                                      IOP::ServiceContextList &service_list,
-                                     CORBA::Boolean restart,
-                                     CORBA::Environment &ACE_TRY_ENV);
+                                     CORBA::Boolean restart
+                                     TAO_ENV_ARG_DECL);
 
   /// Allow the service layer to decide whether the COMM_FAILURE
   /// exception should be thrown or a reinvocation is needed
   virtual int raise_comm_failure (TAO_GIOP_Invocation *invoke,
-                                  TAO_Profile *profile,
-                                  CORBA::Environment &ACE_TRY_ENV);
+                                  TAO_Profile *profile
+                                  TAO_ENV_ARG_DECL);
 
   /// Allow the service layer to decide whether the TRANSIENT
   /// exception should be thrown or a reinvocation is needed
   virtual int raise_transient_failure (TAO_GIOP_Invocation *invoke,
-                                       TAO_Profile *profile,
-                                       CORBA::Environment &ACE_TRY_ENV);
+                                       TAO_Profile *profile
+                                       TAO_ENV_ARG_DECL);
 
 
   /**
diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp
index 4b5e1019c78..9aa4a1e5aa1 100644
--- a/TAO/tao/Services.cpp
+++ b/TAO/tao/Services.cpp
@@ -286,7 +286,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceDetail, ACE_TRY_ENV)) return 0; // not equal
+    if (!type->equal (CORBA::_tc_ServiceDetail TAO_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
@@ -355,7 +355,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformatio
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceInformation, ACE_TRY_ENV)) return 0; // not equal
+    if (!type->equal (CORBA::_tc_ServiceInformation TAO_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 71e3774d97d..25c13db8ed0 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -94,8 +94,8 @@ TAO_DIOP_Connector::close (void)
 
 int
 TAO_DIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
-                             TAO_Transport_Descriptor_Interface *desc,
-                             CORBA::Environment &)
+                             TAO_Transport_Descriptor_Interface *desc
+                             TAO_ENV_ARG_DECL_NOT_USED)
 {
   TAO_Transport *&transport = invocation->transport ();
   // ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
@@ -190,7 +190,7 @@ TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_DIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV)
+TAO_DIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index a1e4166294e..7a946bbe269 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -53,8 +53,8 @@ public:
   int open (TAO_ORB_Core *orb_core);
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
-               TAO_Transport_Descriptor_Interface *desc,
-               CORBA::Environment &ACE_TRY_ENV);
+               TAO_Transport_Descriptor_Interface *desc
+               TAO_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -66,7 +66,7 @@ protected:
 
   /// = More TAO_Connector methods, please check the documentation on
   ///   Pluggable.h
-  virtual TAO_Profile * make_profile (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Obtain tcp properties that must be used by this connector, i.e.,
   /// initialize <tcp_properties_>.
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index f13a7205458..bdee9bc33a6 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -162,8 +162,8 @@ TAO_DIOP_Profile::decode (TAO_InputCDR& cdr)
 }
 
 void
-TAO_DIOP_Profile::parse_string (const char *string,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_DIOP_Profile::parse_string (const char *string
+                                TAO_ENV_ARG_DECL)
 {
   if (!string || !*string)
     {
@@ -372,8 +372,8 @@ TAO_DIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_DIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
+TAO_DIOP_Profile::hash (CORBA::ULong max
+                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -418,7 +418,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp)
 }
 
 char *
-TAO_DIOP_Profile::to_string (CORBA::Environment &)
+TAO_DIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index 4dc557db187..7891c0bbdde 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -79,8 +79,8 @@ public:
 
   /// Initialize this object using the given input string.
   /// Url-style string contain only one endpoint.
-  virtual void parse_string (const char *string,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void parse_string (const char *string
+                             TAO_ENV_ARG_DECL);
 
   /**
    * Return a string representation for this profile.
@@ -88,7 +88,7 @@ public:
    * This is used to create url-style reference.  Only one
    * endpoint is included into the string.
    */
-  virtual char * to_string (CORBA::Environment &ACE_TRY_ENV);
+  virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr);
@@ -144,8 +144,8 @@ public:
   virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::ULong hash (CORBA::ULong max
+                             TAO_ENV_ARG_DECL);
 
   /// Please refer to Profile.h for the documentation of this
   /// function.
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index d94e35fcbc7..74f4b4bcef4 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -117,8 +117,8 @@ TAO_SHMIOP_Connector::close (void)
 
 int
 TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
-                               TAO_Transport_Descriptor_Interface *desc,
-                               CORBA::Environment &)
+                               TAO_Transport_Descriptor_Interface *desc
+                               TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -427,7 +427,7 @@ TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SHMIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV)
+TAO_SHMIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@port/object_key
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index 0c0403b3983..608b4dce9f4 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -59,8 +59,8 @@ public:
   int open (TAO_ORB_Core *orb_core);
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
-               TAO_Transport_Descriptor_Interface *desc,
-               CORBA::Environment &ACE_TRY_ENV);
+               TAO_Transport_Descriptor_Interface *desc
+               TAO_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -72,7 +72,7 @@ protected:
 
   // = More TAO_Connector methods, please check the documentation on
   //   Pluggable.h
-  virtual TAO_Profile *make_profile (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL);
 
 public:
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 622d97a5de2..ff808afa49f 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -175,8 +175,8 @@ TAO_SHMIOP_Profile::decode (TAO_InputCDR& cdr)
 }
 
 void
-TAO_SHMIOP_Profile::parse_string (const char *string,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_SHMIOP_Profile::parse_string (const char *string
+                                  TAO_ENV_ARG_DECL)
 {
   if (!string || !*string)
     {
@@ -355,8 +355,8 @@ TAO_SHMIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_SHMIOP_Profile::hash (CORBA::ULong max,
-                          CORBA::Environment &)
+TAO_SHMIOP_Profile::hash (CORBA::ULong max
+                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -389,7 +389,7 @@ TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp)
 }
 
 char *
-TAO_SHMIOP_Profile::to_string (CORBA::Environment &)
+TAO_SHMIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 3e4a8ee8761..2e5565d84b9 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -77,12 +77,12 @@ public:
   ~TAO_SHMIOP_Profile (void);
 
   /// Initialize this object using the given input string.
-  virtual void parse_string (const char *string,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void parse_string (const char *string
+                             TAO_ENV_ARG_DECL);
 
   /// Return a string representation for this profile.
   /// client must deallocate memory.
-  char * to_string (CORBA::Environment &ACE_TRY_ENV);
+  char * to_string (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   int decode (TAO_InputCDR& cdr);
@@ -138,8 +138,8 @@ public:
   CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
 
   /// Return a hash value for this object.
-  CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong hash (CORBA::ULong max
+                     TAO_ENV_ARG_DECL);
 
   /// Please refer to Profile.h for the documentation of this method
   IOP::TaggedProfile &create_tagged_profile (void);
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 176d1d0e721..fd5615d9f11 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -118,8 +118,8 @@ TAO_UIOP_Connector::close (void)
 
 int
 TAO_UIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
-                             TAO_Transport_Descriptor_Interface *desc,
-                             CORBA::Environment &)
+                             TAO_Transport_Descriptor_Interface *desc
+                             TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -396,7 +396,7 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIOP_Connector::make_profile (CORBA::Environment &ACE_TRY_ENV)
+TAO_UIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_Profile *profile = 0;
   ACE_NEW_THROW_EX (profile,
@@ -462,13 +462,13 @@ TAO_UIOP_Connector::init_uiop_properties (void)
   // lookup and caching are not done based on protocol
   // properties.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   int send_buffer_size = this->orb_core ()->orb_params ()->sock_sndbuf_size ();
   int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
   int no_delay = 0;
 
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index 7915e3b2a84..96817b8545f 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -63,8 +63,8 @@ public:
   int open (TAO_ORB_Core *orb_core);
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
-               TAO_Transport_Descriptor_Interface *desc,
-               CORBA::Environment &ACE_TRY_ENV);
+               TAO_Transport_Descriptor_Interface *desc
+               TAO_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -81,7 +81,7 @@ protected:
    * Please check the documentation in Pluggable.h.
    */
   //@{
-  virtual TAO_Profile *make_profile (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Obtains uiop properties that must be used by this connector, i.e.,
   /// initializes <uiop_properties_>.
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index fbe302c795c..4db5801dca5 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -97,8 +97,8 @@ TAO_UIOP_Profile::endpoint_count (void)
 }
 
 void
-TAO_UIOP_Profile::parse_string (const char *string,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_UIOP_Profile::parse_string (const char *string
+                                TAO_ENV_ARG_DECL)
 {
   if (!string || !*string)
     {
@@ -205,8 +205,8 @@ TAO_UIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 }
 
 CORBA::ULong
-TAO_UIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
+TAO_UIOP_Profile::hash (CORBA::ULong max
+                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -240,7 +240,7 @@ TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp)
 
 
 char *
-TAO_UIOP_Profile::to_string (CORBA::Environment &)
+TAO_UIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index b8c1f47f800..e88a037339a 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -76,12 +76,12 @@ public:
   ~TAO_UIOP_Profile (void);
 
   /// Initialize this object using the given input string.
-  virtual void parse_string (const char *string,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual void parse_string (const char *string
+                             TAO_ENV_ARG_DECL);
 
   /// Return a string representation for this profile.
   /// client must deallocate memory.
-  virtual char * to_string (CORBA::Environment &ACE_TRY_ENV);
+  virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr);
@@ -137,8 +137,8 @@ public:
   virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
 
   /// Return a hash value for this object.
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::ULong hash (CORBA::ULong max
+                             TAO_ENV_ARG_DECL);
 
   /// Please see the Profile.h for the documentation of this method
   virtual IOP::TaggedProfile &create_tagged_profile (void);
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index ed09fcc3145..1f8cc76c277 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -210,7 +210,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_StringSeq, ACE_TRY_ENV);
+      type->equivalent (CORBA::_tc_StringSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -303,7 +303,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_WStringSeq, ACE_TRY_ENV);
+      type->equivalent (CORBA::_tc_WStringSeq TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index beacffdf72e..ecba7604301 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -162,8 +162,8 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
 
 int
 TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
-                           CORBA::ULong &index,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::ULong &index
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We are creating the IOR info. Let us not be disturbed. So grab a
@@ -180,8 +180,8 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
       if (this->forwarded_ior_info_ == 0)
         {
           this->get_profile_ior_info (*this->forward_profiles_,
-                                      tmp_info,
-                                      ACE_TRY_ENV);
+                                      tmp_info
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           this->forwarded_ior_info_ = tmp_info;
@@ -207,8 +207,8 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
   if (this->ior_info_ == 0)
     {
       this->get_profile_ior_info (this->base_profiles_,
-                                  tmp_info,
-                                  ACE_TRY_ENV);
+                                  tmp_info
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       this->ior_info_ = tmp_info;
@@ -235,8 +235,8 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
 
 int
 TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
-                                IOP::IOR *&ior_info,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                IOP::IOR *&ior_info
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -273,11 +273,11 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
 // NOTE that this must NOT go across the network!
 
 CORBA::ULong
-TAO_Stub::hash (CORBA::ULong max,
-                CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::hash (CORBA::ULong max
+                TAO_ENV_ARG_DECL)
 {
   // we rely on the profile objects that its address info
-  return this->base_profiles_.hash (max, ACE_TRY_ENV);
+  return this->base_profiles_.hash (max TAO_ENV_ARG_PARAMETER);
 }
 
 // Expensive comparison of objref data, to see if two objrefs
@@ -398,8 +398,8 @@ private:
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
 CORBA::Policy_ptr
-TAO_Stub::get_policy (CORBA::PolicyType type,
-                      CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::get_policy (CORBA::PolicyType type
+                      TAO_ENV_ARG_DECL)
 {
 
   if (this->policies_ == 0)
@@ -420,13 +420,13 @@ TAO_Stub::get_policy (CORBA::PolicyType type,
   // implementations, and will involve modifying PolicyC* and friends,
   // e.g., to add methods for policy specific reconciliation, etc.
 
-  return this->get_client_policy (type,
-                                  ACE_TRY_ENV);
+  return this->get_client_policy (type
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr
-TAO_Stub::get_client_policy (CORBA::PolicyType type,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::get_client_policy (CORBA::PolicyType type
+                             TAO_ENV_ARG_DECL)
 {
   // No need to lock, the stub only changes its policies at
   // construction time...
@@ -435,16 +435,16 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type,
   CORBA::Policy_var result;
   if (this->policies_ != 0)
     {
-      result = this->policies_->get_policy (type,
-                                            ACE_TRY_ENV);
+      result = this->policies_->get_policy (type
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
   if (CORBA::is_nil (result.in ()))
     {
       TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
-      result = policy_current.get_policy (type,
-                                          ACE_TRY_ENV);
+      result = policy_current.get_policy (type
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -457,8 +457,8 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type,
         this->orb_core_->policy_manager ();
       if (policy_manager != 0)
         {
-          result = policy_manager->get_policy (type,
-                                               ACE_TRY_ENV);
+          result = policy_manager->get_policy (type
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Policy::_nil ());
         }
     }
@@ -466,8 +466,8 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type,
   if (CORBA::is_nil (result.in ()))
     {
       result = this->orb_core_->
-              get_default_policies ()->get_policy (type,
-                                                   ACE_TRY_ENV);
+              get_default_policies ()->get_policy (type
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -476,8 +476,8 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type,
 
 TAO_Stub *
 TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
-                                CORBA::SetOverrideType set_add,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::SetOverrideType set_add
+                                TAO_ENV_ARG_DECL)
 {
   // Notice the use of an explicit constructor....
   auto_ptr<TAO_Policy_Set> policy_manager (
@@ -486,32 +486,32 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
   if (set_add == CORBA::SET_OVERRIDE)
     {
       policy_manager->set_policy_overrides (policies,
-                                            set_add,
-                                            ACE_TRY_ENV);
+                                            set_add
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else if (this->policies_ == 0)
     {
       policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
     {
-      policy_manager->copy_from (this->policies_,
-                                 ACE_TRY_ENV);
+      policy_manager->copy_from (this->policies_
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       policy_manager->set_policy_overrides (policies,
-                                            set_add,
-                                            ACE_TRY_ENV);
+                                            set_add
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (),
-                                                 this->base_profiles_,
-                                                 ACE_TRY_ENV);
+                                                 this->base_profiles_
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   stub->policies_ = policy_manager.release ();
@@ -523,26 +523,26 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 }
 
 CORBA::PolicyList *
-TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
+                                TAO_ENV_ARG_DECL)
 {
   if (this->policies_ == 0)
     return 0;
 
-  return this->policies_->get_policy_overrides (types,
-                                                ACE_TRY_ENV);
+  return this->policies_->get_policy_overrides (types
+                                                 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies
+                               TAO_ENV_ARG_DECL)
 {
   // Use Locate Request to establish connection/make sure the object
   // is there ...
   TAO_GIOP_Locate_Request_Invocation locate_request (this,
                                                      this->orb_core_.get ());
 
-  locate_request.init_inconsistent_policies (ACE_TRY_ENV);
+  locate_request.init_inconsistent_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // @@ For some combinations of RTCORBA policies, location forwarding
@@ -553,10 +553,10 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies,
     {
       for (;;)
         {
-          locate_request.start (ACE_TRY_ENV);
+          locate_request.start (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          int status = locate_request.invoke (ACE_TRY_ENV);
+          int status = locate_request.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // We'll get this only if the object was, in fact, forwarded.
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 18d13267445..919deec2dae 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -106,27 +106,22 @@ public:
    * policy type.  Returns the effective override for all other policy
    * types.
    */
-  virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type,
-                                        CORBA::Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()
-                                        );
-
-  virtual CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type,
-                                               CORBA::Environment &ACE_TRY_ENV =
-                                               TAO_default_environment ()
-                                               );
+  virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
+
+  virtual CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type
+                                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
-                                          CORBA::SetOverrideType set_add,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ());
+                                          CORBA::SetOverrideType set_add
+                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  virtual CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types,
-                                                    CORBA::Environment &ACE_TRY_ENV =
-                                                    TAO_default_environment ());
+  virtual CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types
+                                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::Boolean validate_connection (CORBA::PolicyList_out inconsistent_policies,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ());
+  CORBA::Boolean validate_connection (CORBA::PolicyList_out inconsistent_policies
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -165,8 +160,8 @@ public:
    * that refers/points to the same remote object (i.e. are
    * equivalent).
    */
-  CORBA::ULong hash (CORBA::ULong maximum,
-                     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  CORBA::ULong hash (CORBA::ULong maximum
+                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Implement the is_equivalent() method for the CORBA::Object
   CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj);
@@ -293,8 +288,8 @@ public:
    * Get the index of the profile we are using to make the invocation.
    */
   int create_ior_info (IOP::IOR *&ior_info,
-                       CORBA::ULong &index,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::ULong &index
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -323,8 +318,8 @@ private:
 
   /// THREAD-SAFE Create the IOR info
   int get_profile_ior_info (TAO_MProfile &profile,
-                            IOP::IOR *&ior_info,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            IOP::IOR *&ior_info
+                            TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h
index b2f350e1655..abe076c36df 100644
--- a/TAO/tao/Stub_Factory.h
+++ b/TAO/tao/Stub_Factory.h
@@ -48,8 +48,8 @@ public:
   /// Creates a Stub Object.
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
-                                 TAO_ORB_Core *orb_core,
-                                 CORBA::Environment &ACE_TRY_ENV) = 0;
+                                 TAO_ORB_Core *orb_core
+                                 TAO_ENV_ARG_DECL) = 0;
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index e54cd81b81d..b8f946f8763 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -299,11 +299,11 @@ TAO::BufferingConstraintPolicy_var::tao_nil (void)
 
 ::TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::TAO::BufferingConstraintPolicy::_narrow (p, ACE_TRY_ENV);
+  return ::TAO::BufferingConstraintPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -383,16 +383,16 @@ TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
 TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return BufferingConstraintPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return BufferingConstraintPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -551,7 +551,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::BufferingCons
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (TAO::_tc_BufferingConstraint, ACE_TRY_ENV);
+      type->equivalent (TAO::_tc_BufferingConstraint TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 9815ef2a80f..a7b10c3ff0c 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -176,7 +176,7 @@ TAO_NAMESPACE  TAO
     static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr);
     static void tao_release (BufferingConstraintPolicy_ptr);
     static BufferingConstraintPolicy_ptr tao_nil (void);
-    static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+    static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -230,24 +230,21 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
     // the static operations
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
     static BufferingConstraintPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        CORBA::Object_ptr obj
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
     static BufferingConstraintPolicy_ptr _nil (void)
       {
         return (BufferingConstraintPolicy_ptr)0;
       }
 
     virtual TAO::BufferingConstraint buffering_constraint (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index a4d391b11dc..72d73691ccf 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -199,11 +199,11 @@ tao_TAO_BufferingConstraintPolicy_nil (
 
 ACE_INLINE TAO::BufferingConstraintPolicy_ptr
 tao_TAO_BufferingConstraintPolicy_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return TAO::BufferingConstraintPolicy::_narrow (p, ACE_TRY_ENV);
+  return TAO::BufferingConstraintPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index eaf5a081533..c0be2f8005f 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -96,8 +96,8 @@ TAO_Thread_Lane_Resources::leader_follower (void)
 }
 
 int
-TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address,
-                                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address
+                                                   TAO_ENV_ARG_DECL)
 {
   /// Access the acceptor registry.
   TAO_Acceptor_Registry &ar =
@@ -107,8 +107,8 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address,
   int result =
     ar.open (&this->orb_core_,
              this->leader_follower ().reactor (),
-             ignore_address,
-             ACE_TRY_ENV);
+             ignore_address
+              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index 9635b8d0293..7bf51b5e16f 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -49,8 +49,8 @@ public:
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Open the acceptor registry.
-  int open_acceptor_registry (int ignore_address,
-                              CORBA::Environment &ACE_TRY_ENV);
+  int open_acceptor_registry (int ignore_address
+                              TAO_ENV_ARG_DECL);
 
   /// Finalize resources.
   void finalize (void);
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index 5dd4986fe9a..d9067f95c14 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -40,16 +40,16 @@ static const CORBA::Long _oc_TimeBase_TimeT[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   31,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f54696d), 
-  ACE_NTOHL (0x65543a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f54696d),
+  ACE_NTOHL (0x65543a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
   6,
-  ACE_NTOHL (0x54696d65), 
+  ACE_NTOHL (0x54696d65),
   ACE_NTOHL (0x54000000),  // name = TimeT
   CORBA::tk_ulonglong,
 
@@ -72,34 +72,34 @@ static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f496e61), 
-  ACE_NTOHL (0x63637572), 
-  ACE_NTOHL (0x61637954), 
-  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f496e61),
+  ACE_NTOHL (0x63637572),
+  ACE_NTOHL (0x61637954),
+  ACE_NTOHL (0x3a312e30),
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
   12,
-  ACE_NTOHL (0x496e6163), 
-  ACE_NTOHL (0x63757261), 
+  ACE_NTOHL (0x496e6163),
+  ACE_NTOHL (0x63757261),
   ACE_NTOHL (0x63795400),  // name = InaccuracyT
   CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54696d65),
     ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
@@ -123,16 +123,16 @@ static const CORBA::Long _oc_TimeBase_TdfT[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f546466), 
-  ACE_NTOHL (0x543a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f546466),
+  ACE_NTOHL (0x543a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
   5,
-  ACE_NTOHL (0x54646654), 
+  ACE_NTOHL (0x54646654),
   ACE_NTOHL (0x0),  // name = TdfT
   CORBA::tk_short,
 
@@ -155,46 +155,46 @@ static const CORBA::Long _oc_TimeBase_UtcT[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f557463), 
-  ACE_NTOHL (0x543a312e), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f557463),
+  ACE_NTOHL (0x543a312e),
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
   5,
-  ACE_NTOHL (0x55746354), 
+  ACE_NTOHL (0x55746354),
   ACE_NTOHL (0x0),  // name = UtcT
   4, // member count
   5,
-  ACE_NTOHL (0x74696d65), 
+  ACE_NTOHL (0x74696d65),
   ACE_NTOHL (0x0),  // name = time
   CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54696d65),
     ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
 
   8,
-  ACE_NTOHL (0x696e6163), 
+  ACE_NTOHL (0x696e6163),
   ACE_NTOHL (0x636c6f00),  // name = inacclo
   CORBA::tk_ulong,
 
   8,
-  ACE_NTOHL (0x696e6163), 
+  ACE_NTOHL (0x696e6163),
   ACE_NTOHL (0x63686900),  // name = inacchi
   CORBA::tk_ushort,
 
@@ -204,16 +204,16 @@ static const CORBA::Long _oc_TimeBase_UtcT[] =
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f546466), 
-    ACE_NTOHL (0x543a312e), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f546466),
+    ACE_NTOHL (0x543a312e),
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
     5,
-    ACE_NTOHL (0x54646654), 
+    ACE_NTOHL (0x54646654),
     ACE_NTOHL (0x0),  // name = TdfT
     CORBA::tk_short,
 
@@ -243,60 +243,60 @@ static const CORBA::Long _oc_TimeBase_IntervalT[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x54696d65), 
-  ACE_NTOHL (0x42617365), 
-  ACE_NTOHL (0x2f496e74), 
-  ACE_NTOHL (0x65727661), 
-  ACE_NTOHL (0x6c543a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x54696d65),
+  ACE_NTOHL (0x42617365),
+  ACE_NTOHL (0x2f496e74),
+  ACE_NTOHL (0x65727661),
+  ACE_NTOHL (0x6c543a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
   10,
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x7276616c), 
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x7276616c),
   ACE_NTOHL (0x54000000),  // name = IntervalT
   2, // member count
   12,
-  ACE_NTOHL (0x6c6f7765), 
-  ACE_NTOHL (0x725f626f), 
+  ACE_NTOHL (0x6c6f7765),
+  ACE_NTOHL (0x725f626f),
   ACE_NTOHL (0x756e6400),  // name = lower_bound
   CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54696d65),
     ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
 
   12,
-  ACE_NTOHL (0x75707065), 
-  ACE_NTOHL (0x725f626f), 
+  ACE_NTOHL (0x75707065),
+  ACE_NTOHL (0x725f626f),
   ACE_NTOHL (0x756e6400),  // name = upper_bound
   CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x54696d65), 
-    ACE_NTOHL (0x42617365), 
-    ACE_NTOHL (0x2f54696d), 
-    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x54696d65),
+    ACE_NTOHL (0x42617365),
+    ACE_NTOHL (0x2f54696d),
+    ACE_NTOHL (0x65543a31),
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
     6,
-    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54696d65),
     ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
@@ -358,13 +358,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::UtcT *&_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -441,13 +441,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::Interval
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT, ACE_TRY_ENV);
+
+    CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index 1bdd5372083..36ced983c1f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -80,7 +80,7 @@ CORBA_TypeCodeFactory_var::operator const ::CORBA_TypeCodeFactory_ptr &() const
   return this->ptr_;
 }
 
-CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast 
+CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -140,11 +140,11 @@ CORBA_TypeCodeFactory_var::tao_nil (void)
 
 ::CORBA_TypeCodeFactory_ptr
 CORBA_TypeCodeFactory_var::tao_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return ::CORBA_TypeCodeFactory::_narrow (p, ACE_TRY_ENV);
+  return ::CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -225,16 +225,16 @@ CORBA_TypeCodeFactory::~CORBA_TypeCodeFactory (void)
 {}
 
 CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_TypeCodeFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_TypeCodeFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
+    CORBA::Object_ptr obj
+    TAO_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -272,7 +272,7 @@ void *CORBA_TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 982a78ac367..219e40e20e4 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -75,29 +75,29 @@ class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory_var : public TAO_Base_var
 {
 public:
   CORBA_TypeCodeFactory_var (void); // default constructor
-  CORBA_TypeCodeFactory_var (CORBA_TypeCodeFactory_ptr p) : ptr_ (p) {} 
+  CORBA_TypeCodeFactory_var (CORBA_TypeCodeFactory_ptr p) : ptr_ (p) {}
   CORBA_TypeCodeFactory_var (const CORBA_TypeCodeFactory_var &); // copy constructor
   ~CORBA_TypeCodeFactory_var (void); // destructor
-  
+
   CORBA_TypeCodeFactory_var &operator= (CORBA_TypeCodeFactory_ptr);
   CORBA_TypeCodeFactory_var &operator= (const CORBA_TypeCodeFactory_var &);
   CORBA_TypeCodeFactory_ptr operator-> (void) const;
-  
+
   operator const CORBA_TypeCodeFactory_ptr &() const;
   operator CORBA_TypeCodeFactory_ptr &();
-  // in, inout, out, _retn 
+  // in, inout, out, _retn
   CORBA_TypeCodeFactory_ptr in (void) const;
   CORBA_TypeCodeFactory_ptr &inout (void);
   CORBA_TypeCodeFactory_ptr &out (void);
   CORBA_TypeCodeFactory_ptr _retn (void);
   CORBA_TypeCodeFactory_ptr ptr (void) const;
-  
+
   // Hooks used by template sequence and object manager classes
   // for non-defined forward declared interfaces.
   static CORBA_TypeCodeFactory_ptr tao_duplicate (CORBA_TypeCodeFactory_ptr);
   static void tao_release (CORBA_TypeCodeFactory_ptr);
   static CORBA_TypeCodeFactory_ptr tao_nil (void);
-  static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -151,15 +151,13 @@ public:
   // the static operations
   static CORBA_TypeCodeFactory_ptr _duplicate (CORBA_TypeCodeFactory_ptr obj);
   static CORBA_TypeCodeFactory_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_TypeCodeFactory_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   static CORBA_TypeCodeFactory_ptr _nil (void)
     {
       return (CORBA_TypeCodeFactory_ptr)0;
@@ -168,10 +166,9 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char * id,
       const char * name,
-      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;
@@ -180,10 +177,9 @@ public:
       const char * id,
       const char * name,
       CORBA::TypeCode_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;
@@ -191,10 +187,9 @@ public:
   virtual CORBA::TypeCode_ptr create_enum_tc (
       const char * id,
       const char * name,
-      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;
@@ -202,10 +197,9 @@ public:
   virtual CORBA::TypeCode_ptr create_alias_tc (
       const char * id,
       const char * name,
-      CORBA::TypeCode_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
@@ -213,68 +207,61 @@ public:
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char * id,
       const char * name,
-      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;
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       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
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      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;
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
-      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;
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
@@ -284,10 +271,9 @@ public:
       const char * name,
       CORBA::Short type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA_ValueMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
@@ -295,80 +281,73 @@ public:
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char * id,
       const char * name,
-      CORBA::TypeCode_ptr boxed_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr boxed_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       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
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      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;
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       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
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       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
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       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
     )) = 0;
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       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
     )) = 0;
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-  
+
   virtual const char* _interface_repository_id (void) const;
 
 protected:
   CORBA_TypeCodeFactory ();
-  
+
   virtual ~CORBA_TypeCodeFactory (void);
 private:
   CORBA_TypeCodeFactory (const CORBA_TypeCodeFactory &);
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
index b9575962bd6..bb6a7fe62f0 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
@@ -49,11 +49,11 @@ tao_CORBA_TypeCodeFactory_nil (
 
 ACE_INLINE CORBA_TypeCodeFactory_ptr
 tao_CORBA_TypeCodeFactory_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Object *p
+    TAO_ENV_ARG_DECL
   )
 {
-  return CORBA_TypeCodeFactory::_narrow (p, ACE_TRY_ENV);
+  return CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 65b0d235047..2461a250150 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -14,8 +14,8 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
     const char * id,
     const char * name,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -23,8 +23,8 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
 
   return tcf.create_struct_tc (id,
                                name,
-                               members,
-                               ACE_TRY_ENV);
+                               members
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -32,8 +32,8 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_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))
 {
@@ -42,16 +42,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
   return tcf.create_union_tc (id,
                               name,
                               discriminator_type,
-                              members,
-                              ACE_TRY_ENV);
+                              members
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
     const char * id,
     const char * name,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -59,16 +59,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
 
   return tcf.create_enum_tc (id,
                              name,
-                             members,
-                             ACE_TRY_ENV);
+                             members
+                             TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
     const char * id,
     const char * name,
-    CORBA::TypeCode_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -76,16 +76,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
 
   return tcf.create_alias_tc (id,
                               name,
-                              original_type,
-                              ACE_TRY_ENV);
+                              original_type
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
     const char * id,
     const char * name,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -93,94 +93,94 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
 
   return tcf.create_exception_tc (id,
                                   name,
-                                  members,
-                                  ACE_TRY_ENV);
+                                  members
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc (
     const char * id,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_interface_tc (id,
-                                  name,
-                                  ACE_TRY_ENV);
+                                  name
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_string_tc (bound,
-                               ACE_TRY_ENV);
+  return tcf.create_string_tc (bound
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_wstring_tc (bound,
-                                ACE_TRY_ENV);
+  return tcf.create_wstring_tc (bound
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc (
     CORBA::UShort digits,
-    CORBA::UShort scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::UShort scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_fixed_tc (digits,
-                              scale,
-                              ACE_TRY_ENV);
+                              scale
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc (
     CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_sequence_tc (bound,
-                                 element_type,
-                                 ACE_TRY_ENV);
+                                 element_type
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_array_tc (
     CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_array_tc (length,
-                              element_type,
-                              ACE_TRY_ENV);
+                              element_type
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -189,8 +189,8 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
     const char * name,
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
-    const CORBA_ValueMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -200,16 +200,16 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
                               name,
                               type_modifier,
                               concrete_base,
-                              members,
-                              ACE_TRY_ENV);
+                              members
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
     const char * id,
     const char * name,
-    CORBA::TypeCode_ptr boxed_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr boxed_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -217,66 +217,66 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
 
   return tcf.create_value_box_tc (id,
                                   name,
-                                  boxed_type,
-                                  ACE_TRY_ENV);
+                                  boxed_type
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
     const char * id,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_native_tc (id,
-                               name,
-                               ACE_TRY_ENV);
+                               name
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
-  return tcf.create_recursive_tc (id,
-                                  ACE_TRY_ENV);
+  return tcf.create_recursive_tc (id
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc (
     const char * id,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_abstract_interface_tc (id,
-                                           name,
-                                           ACE_TRY_ENV);
+                                           name
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc (
     const char * id,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_local_interface_tc (id,
-                                        name,
-                                        ACE_TRY_ENV);
+                                        name
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 // *********************************************************************
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index c83bb32af7c..45764d9a832 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -33,7 +33,7 @@
  * to use the TypeCodeFactory. This is the derived class
  * that contains the actual implementations.
  */
-class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Adapter_Impl 
+class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_Adapter_Impl
   : public TAO_TypeCodeFactory_Adapter
 {
 public:
@@ -42,93 +42,82 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_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::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_interface_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      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 create_wstring_tc (
-      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 create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::UShort scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_tc (
@@ -136,50 +125,44 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA_ValueMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      const CORBA_ValueMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr boxed_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      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::TypeCode_ptr create_abstract_interface_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       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));
 
   /// Used to force the initialization of the ORB code.
@@ -194,13 +177,13 @@ ACE_FACTORY_DECLARE (TAO_TypeCodeFactory, TAO_TypeCodeFactory_Adapter_Impl)
 typedef int (*TAO_Module_Initializer) (void);
 
 static TAO_Module_Initializer
-TAO_Requires_TypeCodeFactory_Initializer = 
+TAO_Requires_TypeCodeFactory_Initializer =
   &TAO_TypeCodeFactory_Adapter_Impl::Initializer;
 
 #else
 
 static int
-TAO_Requires_TypeCodeFactory_Initializer = 
+TAO_Requires_TypeCodeFactory_Initializer =
   TAO_TypeCodeFactory_Adapter_Impl::Initializer ();
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index 9d6fb8c3313..f3af1fe9ae1 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -26,8 +26,8 @@ TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
 CORBA::Object_ptr
 TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr,
                                            int,
-                                           char * [],
-                                           CORBA::Environment &)
+                                           char * []
+                                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 0addfac4159..7a02e826e44 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -38,8 +38,8 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv [],
-                                           CORBA::Environment &)
+                                           char *argv []
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Overload the base class method to create a new instance
   // of a TypeCodeFactory object.
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index ff0a021efa0..182ba3b48d2 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -16,8 +16,8 @@ TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void)
 }
 
 TAO_TypeCodeFactory_i *
-TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj,
-                                CORBA::Environment &)
+TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj
+                                TAO_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -54,25 +54,25 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_struct_tc (
     const char *id,
     const char *name,
-    const CORBA_StructMemberSeq &members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq &members
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
                                         members,
-                                        CORBA::tk_struct,
-                                        ACE_TRY_ENV);
+                                        CORBA::tk_struct
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_union_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_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))
 {
@@ -90,9 +90,9 @@ TAO_TypeCodeFactory_i::create_union_tc (
                         CORBA::TypeCode::_nil ());
     }
 
-  CORBA::Boolean good_disc_type = 
-    this->valid_disc_type (discriminator_type,
-                           ACE_TRY_ENV);
+  CORBA::Boolean good_disc_type =
+    this->valid_disc_type (discriminator_type
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!good_disc_type)
@@ -111,7 +111,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
   CORBA::Boolean valid_member = 1;
   const char *member_name = 0;
   ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
-  
+
   // No getting around iterating over the members twice. We have
   // to do it once *before* the overall length is written to the
   // CDR stream, to know by how much, if any, the number of members
@@ -125,13 +125,13 @@ TAO_TypeCodeFactory_i::create_union_tc (
         {
           // Is this a duplicate case label? If so, we have to adjust
           // the 'length' we encode - a member gets encoded only once.
-          if (ACE_OS::strcmp (member_name, 
-                              members[i - 1].name) 
+          if (ACE_OS::strcmp (member_name,
+                              members[i - 1].name)
                == 0)
             {
               CORBA::Boolean equiv =
-                members[i].type.in ()->equivalent (members[i - 1].type.in (),
-                                                   ACE_TRY_ENV);
+                members[i].type.in ()->equivalent (members[i - 1].type.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
               // If adjacent names are the same and their types are equivalent,
@@ -178,8 +178,8 @@ TAO_TypeCodeFactory_i::create_union_tc (
       tc_holder = members[i].type.in ();
 
       // Valid member type?
-      valid_member = this->valid_content_type (tc_holder,
-                                               ACE_TRY_ENV);
+      valid_member = this->valid_content_type (tc_holder
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       if (!valid_member)
@@ -207,8 +207,8 @@ TAO_TypeCodeFactory_i::create_union_tc (
           CORBA::TypeCode_var tmp = members[i].label.type ();
 
           CORBA::Boolean equiv =
-            discriminator_type->equivalent (tmp.in (),
-                                            ACE_TRY_ENV);
+            discriminator_type->equivalent (tmp.in ()
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           if (!equiv)
@@ -223,8 +223,8 @@ TAO_TypeCodeFactory_i::create_union_tc (
   CORBA::Boolean unique_labels =
     this->unique_label_values (members,
                                discriminator_type,
-                               raw_default_index,
-                               ACE_TRY_ENV);
+                               raw_default_index
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!unique_labels)
@@ -254,8 +254,8 @@ TAO_TypeCodeFactory_i::create_union_tc (
         {
           // Is this a duplicate case label? If so, skip it - a member
           // goes into the typecode only once.
-          if (ACE_OS::strcmp (members[index].name, 
-                              members[index - 1].name) 
+          if (ACE_OS::strcmp (members[index].name,
+                              members[index - 1].name)
                == 0)
             {
               continue;
@@ -265,7 +265,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
       if (index == raw_default_index)
         {
           // This is the default label - we have to find a legal value.
-          CORBA::TCKind kind = discriminator_type->kind (ACE_TRY_ENV);
+          CORBA::TCKind kind = discriminator_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           this->compute_default_label (kind,
@@ -283,8 +283,8 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
           (void) TAO_Marshal_Object::perform_append (tc.in (),
                                                      &in,
-                                                     &cdr,
-                                                     ACE_TRY_ENV);
+                                                     &cdr
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
         }
 
@@ -295,10 +295,10 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr union_typecode = 
+  CORBA::TypeCode_ptr union_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (union_typecode,
@@ -317,8 +317,8 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_enum_tc (
     const char *id,
     const char *name,
-    const CORBA_EnumMemberSeq &members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq &members
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -355,7 +355,7 @@ TAO_TypeCodeFactory_i::create_enum_tc (
   cdr << len;
 
   ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> map;
-  
+
   for (CORBA::ULong index = 0; index < len; ++index)
     {
       ACE_CString ext_id (members[index]);
@@ -377,10 +377,10 @@ TAO_TypeCodeFactory_i::create_enum_tc (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr enum_typecode = 
+  CORBA::TypeCode_ptr enum_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (enum_typecode,
@@ -399,8 +399,8 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_alias_tc (
     const char *id,
     const char *name,
-    CORBA::TypeCode_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr original_type
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -419,8 +419,8 @@ TAO_TypeCodeFactory_i::create_alias_tc (
     }
 
   CORBA::Boolean valid_content =
-    this->valid_content_type (original_type,
-                              ACE_TRY_ENV);
+    this->valid_content_type (original_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_content)
@@ -448,10 +448,10 @@ TAO_TypeCodeFactory_i::create_alias_tc (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr alias_typecode = 
+  CORBA::TypeCode_ptr alias_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (alias_typecode,
@@ -470,36 +470,36 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_exception_tc (
     const char *id,
     const char *name,
-    const CORBA_StructMemberSeq &members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq &members
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->struct_except_tc_common (id,
                                         name,
                                         members,
-                                        CORBA::tk_except,
-                                        ACE_TRY_ENV);
+                                        CORBA::tk_except
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_interface_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_objref,
-                                 ACE_TRY_ENV); 
+                                 CORBA::tk_objref
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_string_tc (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -509,7 +509,7 @@ TAO_TypeCodeFactory_i::create_string_tc (
 
   cdr << bound;
 
-  CORBA::TypeCode_ptr string_typecode = 
+  CORBA::TypeCode_ptr string_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (string_typecode,
@@ -524,10 +524,10 @@ TAO_TypeCodeFactory_i::create_string_tc (
   return string_typecode;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_wstring_tc (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -537,7 +537,7 @@ TAO_TypeCodeFactory_i::create_wstring_tc (
 
   cdr << bound;
 
-  CORBA::TypeCode_ptr wstring_typecode = 
+  CORBA::TypeCode_ptr wstring_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (wstring_typecode,
@@ -552,29 +552,29 @@ TAO_TypeCodeFactory_i::create_wstring_tc (
   return wstring_typecode;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_fixed_tc (
     CORBA::UShort /* digits */,
-    CORBA::UShort /* scale */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    CORBA::UShort /* scale */
+    TAO_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
-  return 0; 
+  return 0;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_sequence_tc (
     CORBA::ULong bound,
-    CORBA::TypeCode_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr element_type
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean valid_element =
-    this->valid_content_type (element_type,
-                              ACE_TRY_ENV);
+    this->valid_content_type (element_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_element)
@@ -594,10 +594,10 @@ TAO_TypeCodeFactory_i::create_sequence_tc (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr sequence_typecode = 
+  CORBA::TypeCode_ptr sequence_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (sequence_typecode,
@@ -612,17 +612,17 @@ TAO_TypeCodeFactory_i::create_sequence_tc (
   return sequence_typecode;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_array_tc (
     CORBA::ULong length,
-    CORBA::TypeCode_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr element_type
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean valid_element =
-    this->valid_content_type (element_type,
-                              ACE_TRY_ENV);
+    this->valid_content_type (element_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_element)
@@ -642,10 +642,10 @@ TAO_TypeCodeFactory_i::create_array_tc (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr array_typecode = 
+  CORBA::TypeCode_ptr array_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (array_typecode,
@@ -660,27 +660,27 @@ TAO_TypeCodeFactory_i::create_array_tc (
   return array_typecode;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_value_tc (
     const char * /* id */,
     const char * /* name */,
     CORBA::ValueModifier /* type_modifier */,
     CORBA::TypeCode_ptr /* concrete_base */,
-    const CORBA_ValueMemberSeq & /* members */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ValueMemberSeq & /* members */
+    TAO_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
-  return 0; 
+  return 0;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_value_box_tc (
     const char *id,
     const char *name,
-    CORBA::TypeCode_ptr boxed_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr boxed_type
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -700,8 +700,8 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
     }
 
   CORBA::Boolean valid_content =
-    this->valid_content_type (boxed_type,
-                              ACE_TRY_ENV);
+    this->valid_content_type (boxed_type
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_content)
@@ -723,10 +723,10 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr value_box_typecode = 
+  CORBA::TypeCode_ptr value_box_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (value_box_typecode,
@@ -741,85 +741,85 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
   return value_box_typecode;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_native_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_native,
-                                 ACE_TRY_ENV); 
+                                 CORBA::tk_native
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_recursive_tc (
-    const char * /* id */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const char * /* id */
+    TAO_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
-  return 0; 
+  return 0;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_abstract_interface_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_abstract_interface,
-                                 ACE_TRY_ENV); 
+                                 CORBA::tk_abstract_interface
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_local_interface_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_local_interface,
-                                 ACE_TRY_ENV); 
+                                 CORBA::tk_local_interface
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_component_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_component,
-                                 ACE_TRY_ENV); 
+                                 CORBA::tk_component
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_home_tc (
     const char *id,
-    const char *name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char *name
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
-                                 CORBA::tk_home,
-                                 ACE_TRY_ENV); 
+                                 CORBA::tk_home
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1003,12 +1003,12 @@ TAO_TypeCodeFactory_i::compute_default_label (
   }
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_tc_common (
     const char *id,
     const char *name,
-    CORBA::TCKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TCKind kind
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1037,10 +1037,10 @@ TAO_TypeCodeFactory_i::create_tc_common (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr result = 
+  CORBA::TypeCode_ptr result =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (result,
@@ -1055,13 +1055,13 @@ TAO_TypeCodeFactory_i::create_tc_common (
   return result;
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::struct_except_tc_common (
     const char *id,
     const char *name,
     const CORBA_StructMemberSeq &members,
-    CORBA::TCKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TCKind kind
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1110,8 +1110,8 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
       // Valid member type?
       tc_holder = members[index].type.in ();
 
-      valid_member = this->valid_content_type (tc_holder,
-                                               ACE_TRY_ENV);
+      valid_member = this->valid_content_type (tc_holder
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       if (!valid_member)
@@ -1151,10 +1151,10 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
   ACE_Message_Block consolidated_block;
 
-  ACE_CDR::consolidate (&consolidated_block, 
+  ACE_CDR::consolidate (&consolidated_block,
                         cdr.begin ());
 
-  CORBA::TypeCode_ptr new_typecode = 
+  CORBA::TypeCode_ptr new_typecode =
     CORBA::TypeCode::_nil ();
 
   ACE_NEW_THROW_EX (new_typecode,
@@ -1169,7 +1169,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
   return new_typecode;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_TypeCodeFactory_i::valid_name (const char *name)
 {
   if (!isalpha (*name))
@@ -1194,7 +1194,7 @@ TAO_TypeCodeFactory_i::valid_name (const char *name)
   return 1;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_TypeCodeFactory_i::valid_id (const char *id)
 {
   ACE_CString safety (id);
@@ -1208,9 +1208,9 @@ TAO_TypeCodeFactory_i::valid_id (const char *id)
 
   ACE_CString format (safety.substr (0, pos));
 
-  if (format == "IDL" 
-      || format == "RMI" 
-      || format == "DCE" 
+  if (format == "IDL"
+      || format == "RMI"
+      || format == "DCE"
       || format == "LOCAL")
     {
       return 1;
@@ -1219,11 +1219,11 @@ TAO_TypeCodeFactory_i::valid_id (const char *id)
   return 0;
 }
 
-CORBA::Boolean 
-TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc,
-                                           CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc
+                                           TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (kind == CORBA::tk_null
@@ -1236,13 +1236,13 @@ TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc,
   return 1;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members,
                                             CORBA::TypeCode_ptr disc_tc,
-                                            CORBA::ULong default_index_slot,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::ULong default_index_slot
+                                            TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind disc_kind = disc_tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind disc_kind = disc_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = members.length ();
@@ -1390,11 +1390,11 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members,
   return 1;
 }
 
-CORBA::Boolean 
-TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc,
-                                        CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
+                                        TAO_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (kind == CORBA::tk_enum
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index d102f4f571a..ad58d903275 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -49,102 +49,90 @@ public:
 
   /// = LocalObject methods
   static TAO_TypeCodeFactory_i *_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      CORBA::Object_ptr obj
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_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::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_interface_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      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 create_wstring_tc (
-      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 create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::UShort scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_tc (
@@ -152,66 +140,58 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA_ValueMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const CORBA_ValueMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr boxed_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      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::TypeCode_ptr create_abstract_interface_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       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));
 
 private:
@@ -225,10 +205,9 @@ private:
   CORBA::TypeCode_ptr create_tc_common (
       const char *id,
       const char *name,
-      CORBA::TCKind kind,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TCKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Code for structs and unions is identical except for TCKind.
@@ -236,24 +215,23 @@ private:
       const char *id,
       const char *name,
       const CORBA_StructMemberSeq &members,
-      CORBA::TCKind kind,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TCKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If any of these fail, we raise a spec-defined minor code
   /// of BAD_PARAM or BAD_TYPECODE.
   CORBA::Boolean valid_name (const char *name);
   CORBA::Boolean valid_id (const char *id);
-  CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc,
-                                     CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc
+                                     TAO_ENV_ARG_DECL);
   CORBA::Boolean unique_label_values (const CORBA_UnionMemberSeq &members,
                                       CORBA::TypeCode_ptr disc_tc,
-                                      CORBA::ULong default_index_slot,
-                                      CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc,
-                                  CORBA::Environment &ACE_TRY_ENV);
+                                      CORBA::ULong default_index_slot
+                                      TAO_ENV_ARG_DECL);
+  CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc
+                                  TAO_ENV_ARG_DECL);
 
   /// A string in a TAO typecode contains padding to give it a
   /// total size which is a multiple of 4 bytes.
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
index b6620145094..16c3ba57982 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ b/TAO/tao/TypeCodeFactory_Adapter.cpp
@@ -12,195 +12,195 @@ TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void)
 
 // Methods to be overridden.
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_struct_tc (
     const char * /* id */,
     const char * /* name */,
-    const CORBA_StructMemberSeq & /* members */,
-    CORBA::Environment &
-  )  
+    const CORBA_StructMemberSeq & /* members */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_union_tc (
     const char * /* id */,
     const char * /* name */,
     CORBA::TypeCode_ptr /* discriminator_type */,
-    const CORBA_UnionMemberSeq & /* members */,
-    CORBA::Environment &
-  )  
+    const CORBA_UnionMemberSeq & /* members */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_enum_tc (
     const char * /* id */,
     const char * /* name */,
-    const CORBA_EnumMemberSeq & /* members */,
-    CORBA::Environment &
-  )  
+    const CORBA_EnumMemberSeq & /* members */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_alias_tc (
     const char * /* id */,
     const char * /* name */,
-    CORBA::TypeCode_ptr /* original_type */,
-    CORBA::Environment &
-  )  
+    CORBA::TypeCode_ptr /* original_type */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_exception_tc (
     const char * /* id */,
     const char * /* name */,
-    const CORBA_StructMemberSeq & /* members */,
-    CORBA::Environment &
-  )  
+    const CORBA_StructMemberSeq & /* members */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_interface_tc (
     const char * /* id */,
-    const char * /* name */,
-    CORBA::Environment &
-  )  
+    const char * /* name */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_string_tc (
-    CORBA::ULong /* bound */,
-    CORBA::Environment &
-  )  
+    CORBA::ULong /* bound */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_wstring_tc (
-    CORBA::ULong /* bound */,
-    CORBA::Environment &
-  )  
+    CORBA::ULong /* bound */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_fixed_tc (
     CORBA::UShort /* digits */,
-    CORBA::UShort /* scale */,
-    CORBA::Environment &
-  )  
+    CORBA::UShort /* scale */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_sequence_tc (
     CORBA::ULong /* bound */,
-    CORBA::TypeCode_ptr /* element_type */,
-    CORBA::Environment &
-  )  
+    CORBA::TypeCode_ptr /* element_type */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_array_tc (
     CORBA::ULong /* length */,
-    CORBA::TypeCode_ptr /* element_type */,
-    CORBA::Environment &
+    CORBA::TypeCode_ptr /* element_type */
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
-{  
+{
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_value_tc (
     const char * /* id */,
     const char * /* name */,
     CORBA::ValueModifier /* type_modifier */,
     CORBA::TypeCode_ptr /* concrete_base */,
-    const CORBA_ValueMemberSeq & /* members */,
-    CORBA::Environment &
-  )  
+    const CORBA_ValueMemberSeq & /* members */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_value_box_tc (
     const char * /* id */,
     const char * /* name */,
-    CORBA::TypeCode_ptr  /* boxed_type */,
-    CORBA::Environment &
-  )  
+    CORBA::TypeCode_ptr  /* boxed_type */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_native_tc (
     const char * /* id */,
-    const char * /* name */,
-    CORBA::Environment &
-  )  
+    const char * /* name */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_recursive_tc (
-    const char * /* id */,
-    CORBA::Environment &
-  )  
+    const char * /* id */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_abstract_interface_tc (
     const char * /* id */,
-    const char * /* name */,
-    CORBA::Environment &
-  )  
+    const char * /* name */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
 }
 
-CORBA::TypeCode_ptr 
+CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_local_interface_tc (
     const char * /* id */,
-    const char * /* name */,
-    CORBA::Environment &
-  )  
+    const char * /* name */
+    TAO_ENV_ARG_DECL_NOT_USED
+  )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::TypeCode::_nil ();
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index dc28f00b5b1..995b566f073 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -29,7 +29,7 @@
  * @brief TAO_TypeCodeFactory_Adapter.
  *
  * Class that adapts the CORBA::ORB create_*_tc functions
- * to use the TypeCodeFactory. This is a base class for 
+ * to use the TypeCodeFactory. This is a base class for
  * the actual implementation in the TypeCodeFactory_DLL library.
  */
 class TAO_Export TAO_TypeCodeFactory_Adapter : public ACE_Service_Object
@@ -40,93 +40,82 @@ public:
   virtual CORBA::TypeCode_ptr create_struct_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_union_tc (
       const char *id,
       const char *name,
       CORBA::TypeCode_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::TypeCode_ptr create_enum_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_alias_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_exception_tc (
       const char *id,
       const char *name,
-      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::TypeCode_ptr create_interface_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
-      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 create_wstring_tc (
-      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 create_fixed_tc (
       CORBA::UShort digits,
-      CORBA::UShort scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::UShort scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
-      CORBA::TypeCode_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_tc (
@@ -134,50 +123,44 @@ public:
       const char *name,
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
-      const CORBA_ValueMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      const CORBA_ValueMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_value_box_tc (
       const char *id,
       const char *name,
-      CORBA::TypeCode_ptr boxed_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )  
+      CORBA::TypeCode_ptr boxed_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
-      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::TypeCode_ptr create_abstract_interface_tc (
       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));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       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));
 };
 
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 5ebf7492cdf..471b73b195d 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -41,8 +41,8 @@ void CORBA_TypeCode::Bounds::_raise (void)
 }
 
 void CORBA_TypeCode::Bounds::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << this->_id ())
@@ -50,8 +50,8 @@ void CORBA_TypeCode::Bounds::_tao_encode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void CORBA_TypeCode::Bounds::_tao_decode (TAO_InputCDR &,
-                                          CORBA::Environment &)
+void CORBA_TypeCode::Bounds::_tao_decode (TAO_InputCDR &
+                                          TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -83,8 +83,8 @@ void CORBA_TypeCode::BadKind::_raise (void)
 }
 
 void CORBA_TypeCode::BadKind::_tao_encode (
-    TAO_OutputCDR &cdr,
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_OutputCDR &cdr
+    TAO_ENV_ARG_DECL
   ) const
 {
   if (cdr << this->_id ())
@@ -92,8 +92,8 @@ void CORBA_TypeCode::BadKind::_tao_encode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void CORBA_TypeCode::BadKind::_tao_decode (TAO_InputCDR &,
-                                           CORBA::Environment &)
+void CORBA_TypeCode::BadKind::_tao_decode (TAO_InputCDR &
+                                           TAO_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -260,8 +260,8 @@ CORBA_TypeCode::~CORBA_TypeCode (void)
 // Applicable only to struct, union, and except
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::member_type (CORBA::ULong slot,
-                             CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::member_type (CORBA::ULong slot
+                             TAO_ENV_ARG_DECL) const
 {
   CORBA::TypeCode_ptr typecode = 0;
 
@@ -278,8 +278,8 @@ CORBA_TypeCode::member_type (CORBA::ULong slot,
   else
     {
       typecode = CORBA::TypeCode::_duplicate (
-                     this->private_member_type (slot,
-                                                ACE_TRY_ENV)
+                     this->private_member_type (slot
+                                                 TAO_ENV_ARG_PARAMETER)
                    );
     }
 
@@ -289,8 +289,8 @@ CORBA_TypeCode::member_type (CORBA::ULong slot,
 // Applicable only to struct, union, and except
 
 const char *
-CORBA_TypeCode::member_name (CORBA::ULong slot,
-                             CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::member_name (CORBA::ULong slot
+                             TAO_ENV_ARG_DECL) const
 {
   if (this->private_state_->tc_member_count_known_
       && this->private_state_->tc_member_name_list_known_)
@@ -301,21 +301,21 @@ CORBA_TypeCode::member_name (CORBA::ULong slot,
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
                             0);
         }
     }
   else
     {
-      return this->private_member_name (slot, 
-                                        ACE_TRY_ENV);
+      return this->private_member_name (slot
+                                         TAO_ENV_ARG_PARAMETER);
     }
 }
 
 // Return the label of the i-th member.  Applicable only to CORBA::tk_union
 CORBA::Any_ptr
-CORBA_TypeCode::member_label (CORBA::ULong slot,
-                              CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::member_label (CORBA::ULong slot
+                              TAO_ENV_ARG_DECL) const
 {
   CORBA::Any_ptr retval = 0;
 
@@ -332,14 +332,14 @@ CORBA_TypeCode::member_label (CORBA::ULong slot,
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 
+          ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
                             0);
         }
     }
   else
     {
-      CORBA::Any_ptr label = this->private_member_label (slot, 
-                                                         ACE_TRY_ENV);
+      CORBA::Any_ptr label = this->private_member_label (slot
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_NEW_RETURN (retval,
@@ -352,7 +352,7 @@ CORBA_TypeCode::member_label (CORBA::ULong slot,
 
 // only applicable to CORBA::tk_unions
 CORBA::TypeCode_ptr
-CORBA_TypeCode::discriminator_type (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) const
 {
   if (this->kind_ != CORBA::tk_union)
     ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::TypeCode_ptr)0);
@@ -363,7 +363,7 @@ CORBA_TypeCode::discriminator_type (CORBA::Environment &ACE_TRY_ENV) const
              );
 
   CORBA::TypeCode_ptr type =
-    this->private_discriminator_type (ACE_TRY_ENV);
+    this->private_discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return CORBA_TypeCode::_duplicate (type);
@@ -371,7 +371,7 @@ CORBA_TypeCode::discriminator_type (CORBA::Environment &ACE_TRY_ENV) const
 
 // only applicable to CORBA::tk_unions
 CORBA::Long
-CORBA_TypeCode::default_index (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::default_index (TAO_ENV_SINGLE_ARG_DECL) const
 {
   if (this->kind_ != CORBA::tk_union)
     ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
@@ -379,12 +379,12 @@ CORBA_TypeCode::default_index (CORBA::Environment &ACE_TRY_ENV) const
   if (this->private_state_->tc_default_index_used_known_)
     return this->private_state_->tc_default_index_used_;
   else
-    return this->private_default_index (ACE_TRY_ENV);
+    return this->private_default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // returns the length. Applicable only to string, sequence, and arrays
 CORBA::ULong
-CORBA_TypeCode::length (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::length (TAO_ENV_SINGLE_ARG_DECL) const
 {
   // a switch stmt, unfortunately, doesn't get inlined
   if (this->kind_ == CORBA::tk_sequence
@@ -395,7 +395,7 @@ CORBA_TypeCode::length (CORBA::Environment &ACE_TRY_ENV) const
       if (this->private_state_->tc_length_known_)
         return this->private_state_->tc_length_;
       else
-        return this->private_length (ACE_TRY_ENV);
+        return this->private_length (TAO_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
@@ -403,7 +403,7 @@ CORBA_TypeCode::length (CORBA::Environment &ACE_TRY_ENV) const
 
 // returns the typecode. Applicable only to string, sequence, and arrays
 CORBA::TypeCode_ptr
-CORBA_TypeCode::content_type (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::content_type (TAO_ENV_SINGLE_ARG_DECL) const
 {
   if (this->kind_ == CORBA::tk_sequence
       || this->kind_ == CORBA::tk_array
@@ -416,7 +416,7 @@ CORBA_TypeCode::content_type (CORBA::Environment &ACE_TRY_ENV) const
       else
         {
           CORBA::TypeCode_ptr tmp =
-            this->private_content_type (ACE_TRY_ENV);
+            this->private_content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           return CORBA_TypeCode::_duplicate (tmp);
@@ -640,8 +640,8 @@ TC_Private_State::~TC_Private_State (void)
 // Point of recursion for equal() and equivalent().
 CORBA::Boolean
 CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
-                            CORBA::Boolean equiv_only,
-                            CORBA::Environment &ACE_TRY_ENV) const
+                            CORBA::Boolean equiv_only
+                            TAO_ENV_ARG_DECL) const
 {
   // This will catch applications that haven't initialized an ORB.
   if (CORBA::is_nil (tc))
@@ -665,14 +665,14 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
       while (status)
         {
-          rcvr = rcvr->content_type (ACE_TRY_ENV);
+          rcvr = rcvr->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          status = (rcvr->kind (ACE_TRY_ENV) == CORBA::tk_alias);
+          status = (rcvr->kind (TAO_ENV_SINGLE_ARG_PARAMETER) == CORBA::tk_alias);
           ACE_CHECK_RETURN (0);
         }
 
-      CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+      CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       status = (kind == CORBA::tk_alias);
 
@@ -684,17 +684,17 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
       while (status)
         {
-          tcvar = tcvar->content_type (ACE_TRY_ENV);
+          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          kind = tcvar->kind (ACE_TRY_ENV);
+          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
           status = (kind == CORBA::tk_alias);
         }
 
-      kind = rcvr->kind (ACE_TRY_ENV);
+      kind = rcvr->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      CORBA::TCKind other_kind = tcvar->kind (ACE_TRY_ENV);
+      CORBA::TCKind other_kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (kind != other_kind)
@@ -703,11 +703,11 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
       // typecode kinds are same
       return rcvr->private_equal (tcvar.in (),
-                                  equiv_only,
-                                  ACE_TRY_ENV);
+                                  equiv_only
+                                   TAO_ENV_ARG_PARAMETER);
     }
 
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (this->kind_ != kind)
     // simple case
@@ -715,8 +715,8 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
   // typecode kinds are same
   return this->private_equal (tc,
-                              equiv_only,
-                              ACE_TRY_ENV);
+                              equiv_only
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 // check if typecodes are equal. Equality is based on a mix of structural
@@ -724,8 +724,8 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 // equivalence, else resort simply to structural equivalence.
 CORBA::Boolean
 CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
-                               CORBA::Boolean equiv_only,
-                               CORBA::Environment &ACE_TRY_ENV) const
+                               CORBA::Boolean equiv_only
+                               TAO_ENV_ARG_DECL) const
 {
   // We come in here only if the typecode kinds of both are same
   // Handle each complex typecode separately.
@@ -754,44 +754,44 @@ CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
       return 1;
     case CORBA::tk_objref:
       return this->private_equal_objref (tc,
-                                         equiv_only,
-                                         ACE_TRY_ENV);
+                                         equiv_only
+                                          TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_struct:
       return this->private_equal_struct (tc,
-                                         equiv_only,
-                                         ACE_TRY_ENV);
+                                         equiv_only
+                                          TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_union:
       return this->private_equal_union (tc,
-                                        equiv_only,
-                                        ACE_TRY_ENV);
+                                        equiv_only
+                                         TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_enum:
       return this->private_equal_enum (tc,
-                                       equiv_only,
-                                       ACE_TRY_ENV);
+                                       equiv_only
+                                        TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_string:
       return this->private_equal_string (tc,
-                                         equiv_only,
-                                         ACE_TRY_ENV);
+                                         equiv_only
+                                          TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_wstring:
       return this->private_equal_wstring (tc,
-                                          equiv_only,
-                                          ACE_TRY_ENV);
+                                          equiv_only
+                                           TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_sequence:
       return this->private_equal_sequence (tc,
-                                           equiv_only,
-                                           ACE_TRY_ENV);
+                                           equiv_only
+                                            TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_array:
       return this->private_equal_array (tc,
-                                        equiv_only,
-                                        ACE_TRY_ENV);
+                                        equiv_only
+                                         TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_alias:
       return this->private_equal_alias (tc,
-                                        equiv_only,
-                                        ACE_TRY_ENV);
+                                        equiv_only
+                                         TAO_ENV_ARG_PARAMETER);
     case CORBA::tk_except:
       return this->private_equal_except (tc,
-                                         equiv_only,
-                                         ACE_TRY_ENV);
+                                         equiv_only
+                                          TAO_ENV_ARG_PARAMETER);
     case ~0u: // indirection
       {
         // indirection offset must be same
@@ -806,16 +806,16 @@ CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
 CORBA::Boolean
 CORBA_TypeCode::private_equal_objref (
     CORBA::TypeCode_ptr tc,
-    CORBA::Boolean equiv_only,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean equiv_only
+    TAO_ENV_ARG_DECL
   ) const
 {
   // compare the repoID and name, of which the name is optional as per GIOP
   // spec. However, the repoID is mandatory.
-  const char *my_id = this->id (ACE_TRY_ENV);
+  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
+  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!ACE_OS::strcmp (my_id, tc_id))
@@ -829,10 +829,10 @@ CORBA_TypeCode::private_equal_objref (
       else
         {
           // same repository IDs. Now check their names
-          const char *myname = this->name (ACE_TRY_ENV);
+          const char *myname = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tcname = tc->name (ACE_TRY_ENV);
+          const char *tcname = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if ((ACE_OS::strlen (myname) > 1) &&
@@ -853,16 +853,16 @@ CORBA_TypeCode::private_equal_objref (
 CORBA::Boolean
 CORBA_TypeCode::private_equal_struct (
     CORBA::TypeCode_ptr tc,
-    CORBA::Boolean equiv_only,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean equiv_only
+    TAO_ENV_ARG_DECL
   ) const
 {
   // For structs the repoID and names are optional. However, if provided,
   // we must compare them
-  const char *my_id = this->id (ACE_TRY_ENV);
+  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
+  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -883,10 +883,10 @@ CORBA_TypeCode::private_equal_struct (
   // Skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (ACE_TRY_ENV);
+      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (ACE_TRY_ENV);
+      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -897,10 +897,10 @@ CORBA_TypeCode::private_equal_struct (
     }
 
   // Check if the member count is same.
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
+  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -932,11 +932,11 @@ CORBA_TypeCode::private_equal_struct (
       if (!equiv_only)
         {
           const char *my_member_name =
-            this->member_name (i, ACE_TRY_ENV);
+            this->member_name (i TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           const char *tc_member_name =
-            tc->member_name (i, ACE_TRY_ENV);
+            tc->member_name (i TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -947,12 +947,12 @@ CORBA_TypeCode::private_equal_struct (
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = this->member_type (i,
-                                                            ACE_TRY_ENV);
+      CORBA::TypeCode_var my_member_tc = this->member_type (i
+                                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = tc->member_type (i,
-                                                          ACE_TRY_ENV);
+      CORBA::TypeCode_var tc_member_tc = tc->member_type (i
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // One of our members may be recursive, but not through us.
@@ -964,8 +964,8 @@ CORBA_TypeCode::private_equal_struct (
 
       CORBA::Boolean flag =
         my_member_tc->equ_common (tc_member_tc.in (),
-                                  equiv_only,
-                                  ACE_TRY_ENV);
+                                  equiv_only
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!flag)
@@ -977,15 +977,15 @@ CORBA_TypeCode::private_equal_struct (
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
-                                     CORBA::Boolean equiv_only,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Boolean equiv_only
+                                     TAO_ENV_ARG_DECL) const
 {
   // For unions the repoID and names are optional. However, if provided, we
   // must compare them
-  const char *my_id = this->id (ACE_TRY_ENV);
+  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
+  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -1006,10 +1006,10 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
   // Skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (ACE_TRY_ENV);
+      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (ACE_TRY_ENV);
+      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -1022,36 +1022,36 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
 
   // check if the discriminant type is same
   CORBA::TypeCode_var my_discrim =
-    this->discriminator_type (ACE_TRY_ENV);
+    this->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::TypeCode_var tc_discrim =
-    tc->discriminator_type (ACE_TRY_ENV);
+    tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean status = my_discrim->equ_common (tc_discrim.in (),
-                                                  equiv_only,
-                                                  ACE_TRY_ENV);
+                                                  equiv_only
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!status)
     return 0;
 
   // check the default used
-  CORBA::Long my_default = this->default_index (ACE_TRY_ENV);
+  CORBA::Long my_default = this->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Long tc_default = tc->default_index (ACE_TRY_ENV);
+  CORBA::Long tc_default = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_default != tc_default)
     return 0;
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
+  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -1084,12 +1084,12 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = this->member_name (i,
-                                                          ACE_TRY_ENV);
+          const char *my_member_name = this->member_name (i
+                                                           TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = tc->member_name (i,
-                                                        ACE_TRY_ENV);
+          const char *tc_member_name = tc->member_name (i
+                                                         TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -1100,12 +1100,12 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = this->member_type (i,
-                                                            ACE_TRY_ENV);
+      CORBA::TypeCode_var my_member_tc = this->member_type (i
+                                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = tc->member_type (i,
-                                                          ACE_TRY_ENV);
+      CORBA::TypeCode_var tc_member_tc = tc->member_type (i
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // One of our members may be recursive, but not through us.
@@ -1116,8 +1116,8 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
         continue;
 
       CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
-                                                      equiv_only,
-                                                      ACE_TRY_ENV);
+                                                      equiv_only
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!flag)
@@ -1129,15 +1129,15 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
-                                    CORBA::Boolean equiv_only,
-                                    CORBA::Environment &ACE_TRY_ENV) const
+                                    CORBA::Boolean equiv_only
+                                    TAO_ENV_ARG_DECL) const
 {
   // For enums the repoID and names are optional. However, if provided, we
   // must compare them
-  const char *my_id = this->id (ACE_TRY_ENV);
+  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
+  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -1158,10 +1158,10 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
   // Skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (ACE_TRY_ENV);
+      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (ACE_TRY_ENV);
+      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -1173,10 +1173,10 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
     }
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
+  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -1187,12 +1187,12 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = this->member_name (i,
-                                                          ACE_TRY_ENV);
+          const char *my_member_name = this->member_name (i
+                                                           TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = tc->member_name (i,
-                                                        ACE_TRY_ENV);
+          const char *tc_member_name = tc->member_name (i
+                                                         TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -1209,15 +1209,15 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
 CORBA::Boolean
 CORBA_TypeCode::private_equal_string (
     CORBA::TypeCode_ptr tc,
-    CORBA::Boolean /* equiv_only */,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean /* equiv_only */
+    TAO_ENV_ARG_DECL
   ) const
 {
   // compare the lengths
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
+  CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
+  CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return (my_len == tc_len);
@@ -1226,15 +1226,15 @@ CORBA_TypeCode::private_equal_string (
 CORBA::Boolean
 CORBA_TypeCode::private_equal_wstring (
     CORBA::TypeCode_ptr tc,
-    CORBA::Boolean /* equiv_only */,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean /* equiv_only */
+    TAO_ENV_ARG_DECL
   ) const
 {
   // compare the lengths
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
+  CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
+  CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return (my_len == tc_len);
@@ -1243,31 +1243,31 @@ CORBA_TypeCode::private_equal_wstring (
 CORBA::Boolean
 CORBA_TypeCode::private_equal_sequence (
     CORBA::TypeCode_ptr tc,
-    CORBA::Boolean equiv_only,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean equiv_only
+    TAO_ENV_ARG_DECL
   ) const
 {
   // this involves comparing the typecodes of the element type as well
   // as the bounds
-  CORBA::TypeCode_var my_elem = this->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var my_elem = this->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::TypeCode_var tc_elem = tc->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc_elem = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean status = my_elem->equ_common (tc_elem.in (),
-                                               equiv_only,
-                                               ACE_TRY_ENV);
+                                               equiv_only
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!status)
     return 0;
 
   // now check if bounds are same
-  CORBA::ULong my_len = this->length (ACE_TRY_ENV);
+  CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_len = tc->length (ACE_TRY_ENV);
+  CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return (my_len == tc_len);
@@ -1275,32 +1275,32 @@ CORBA_TypeCode::private_equal_sequence (
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_array (CORBA::TypeCode_ptr tc,
-                                     CORBA::Boolean equiv_only,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Boolean equiv_only
+                                     TAO_ENV_ARG_DECL) const
 {
   // exactly like sequence
   return this->private_equal_sequence (tc,
-                                       equiv_only,
-                                       ACE_TRY_ENV);
+                                       equiv_only
+                                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
-                                     CORBA::Boolean equiv_only,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+                                     CORBA::Boolean equiv_only
+                                     TAO_ENV_ARG_DECL) const
 {
   // for structs the repoID and names are optional. However, if provided,
   // we must compare them
-  const char *my_id = this->id (ACE_TRY_ENV);
+  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
+  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *my_name = this->name (ACE_TRY_ENV);
+  const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_name = tc->name (ACE_TRY_ENV);
+  const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -1314,28 +1314,28 @@ CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
       return 0;
 
   // now compare element typecodes
-  CORBA::TypeCode_var my_elem = this->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var my_elem = this->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::TypeCode_var tc_elem = tc->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc_elem = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return my_elem->equ_common (tc_elem.in (),
-                              equiv_only,
-                              ACE_TRY_ENV);
+                              equiv_only
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
-                                      CORBA::Boolean equiv_only,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+                                      CORBA::Boolean equiv_only
+                                      TAO_ENV_ARG_DECL) const
 {
   // exactly similar to structs, except that the repository ID is mandatory
 
-  const char *my_id = this->id (ACE_TRY_ENV);
+  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (ACE_TRY_ENV);
+  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (ACE_OS::strcmp (my_id, tc_id))
@@ -1352,10 +1352,10 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
   // Now compare names. They may be optional - skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (ACE_TRY_ENV);
+      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (ACE_TRY_ENV);
+      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -1367,10 +1367,10 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
     }
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (ACE_TRY_ENV);
+  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (ACE_TRY_ENV);
+  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -1381,12 +1381,12 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = this->member_name (i,
-                                                          ACE_TRY_ENV);
+          const char *my_member_name = this->member_name (i
+                                                           TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = tc->member_name (i,
-                                                        ACE_TRY_ENV);
+          const char *tc_member_name = tc->member_name (i
+                                                         TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -1397,15 +1397,15 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = this->member_type (i, ACE_TRY_ENV);
+      CORBA::TypeCode_var my_member_tc = this->member_type (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
+      CORBA::TypeCode_var tc_member_tc = tc->member_type (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
-                                                      equiv_only,
-                                                      ACE_TRY_ENV);
+                                                      equiv_only
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!flag)
@@ -1422,7 +1422,7 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
 // Valid only for objref, struct, union, enum, alias, and except. Raises
 // BadKind exception for the rest of the cases.
 const char *
-CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_id (TAO_ENV_SINGLE_ARG_DECL) const
 {
   switch (this->kind_)
     {
@@ -1461,7 +1461,7 @@ CORBA_TypeCode::private_id (CORBA::Environment &ACE_TRY_ENV) const
 
 // return the name. The string is owned by the typecode
 const char *
-CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_name (TAO_ENV_SINGLE_ARG_DECL) const
 {
   switch (this->kind_)
     {
@@ -1514,7 +1514,7 @@ CORBA_TypeCode::private_name (CORBA::Environment &ACE_TRY_ENV) const
 // For the rest of the cases, raises the BadKind exception.
 
 CORBA::ULong
-CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_member_count (TAO_ENV_SINGLE_ARG_DECL) const
 {
   switch (kind_)
     {
@@ -1584,8 +1584,8 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &ACE_TRY_ENV) const
 //
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::private_member_type (CORBA::ULong slot,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_member_type (CORBA::ULong slot
+                                     TAO_ENV_ARG_DECL) const
 {
   CORBA::ULong temp, mcount;
 
@@ -1600,7 +1600,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
     {
     case CORBA::tk_except:
     case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
+      mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
 
       {
@@ -1640,8 +1640,8 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
               this->private_state_->tc_member_type_list_[i];
             CORBA_TypeCode::_tao_decode (this,
                                          stream,
-                                         member_type,
-                                         ACE_TRY_ENV);
+                                         member_type
+                                          TAO_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (0);
           }
 
@@ -1656,7 +1656,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
       ACE_NOTREACHED (break;)
 
     case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (ACE_TRY_ENV);
+      mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
 
       {
@@ -1687,7 +1687,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
 
         // get the typecode for the discriminator
         CORBA::TypeCode_ptr disc_tc =
-          this->private_discriminator_type_i (ACE_TRY_ENV);
+          this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
         // compute the typecodes for all the members and return the
         // required one
         ACE_CHECK_RETURN (0);
@@ -1698,8 +1698,8 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
             // skip member label
             CORBA::TypeCode::traverse_status status =
               TAO_Marshal_Object::perform_skip (disc_tc,
-                                                &stream,
-                                                ACE_TRY_ENV);
+                                                &stream
+                                                 TAO_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (0);
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
@@ -1710,8 +1710,8 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
               this->private_state_->tc_member_type_list_[i];
             CORBA_TypeCode::_tao_decode (this,
                                          stream,
-                                         member_type,
-                                         ACE_TRY_ENV);
+                                         member_type
+                                          TAO_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (0);
           }
         this->private_state_->tc_member_type_list_known_ = 1;
@@ -1734,8 +1734,8 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot,
 // Applicable only to CORBA::tk_struct, CORBA::tk_union, CORBA::tk_enum, and
 // CORBA::tk_except
 const char *
-CORBA_TypeCode::private_member_name (CORBA::ULong slot,
-                                     CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_member_name (CORBA::ULong slot
+                                     TAO_ENV_ARG_DECL) const
 {
   CORBA::ULong temp, mcount;
 
@@ -1746,7 +1746,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
                        this->byte_order_);
   CORBA::TypeCode_var tc = 0;
 
-  mcount = this->member_count (ACE_TRY_ENV);
+  mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   // out of bounds
   ACE_CHECK_RETURN ((char *)0);
 
@@ -1844,7 +1844,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
           {
             // get the typecode for the discriminator
             CORBA::TypeCode_ptr disc_tc =
-              this->private_discriminator_type_i (ACE_TRY_ENV);
+              this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
             // compute the name for all the members and return the
             // required one
             ACE_CHECK_RETURN (0);
@@ -1854,8 +1854,8 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
                 // the ith entry will have the name of the ith member
                 CORBA::TypeCode::traverse_status status =
                   TAO_Marshal_Object::perform_skip (disc_tc,
-                                                    &stream,
-                                                    ACE_TRY_ENV);
+                                                    &stream
+                                                     TAO_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (0);
 
                 if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -1889,8 +1889,8 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot,
 
 // Return member labels for CORBA::tk_union typecodes.
 CORBA::Any_ptr
-CORBA_TypeCode::private_member_label (CORBA::ULong n,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_member_label (CORBA::ULong n
+                                      TAO_ENV_ARG_DECL) const
 {
   // this function is only applicable to the CORBA::tk_union TC
   if (this->kind_ != CORBA::tk_union)
@@ -1941,7 +1941,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
 
   // get the discriminant TC
   CORBA::TypeCode_ptr disc_tc =
-    this->private_discriminator_type_i (ACE_TRY_ENV);
+    this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   for (CORBA::ULong i = 0; i < member_count; i++)
@@ -1958,8 +1958,8 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
       char *begin = stream.rd_ptr ();
       int retval =
         TAO_Marshal_Object::perform_skip (disc_tc,
-                                          &temp,
-                                          ACE_TRY_ENV);
+                                          &temp
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -1996,8 +1996,8 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
 
           retval =
             TAO_Marshal_Object::perform_skip (disc_tc,
-                                              &stream,
-                                              ACE_TRY_ENV);
+                                              &stream
+                                               TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2012,8 +2012,8 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
           retval =
             TAO_Marshal_Object::perform_append (label_tc,
                                                 &stream,
-                                                &out,
-                                                ACE_TRY_ENV);
+                                                &out
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2056,19 +2056,19 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::private_discriminator_type (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   ) const
 {
   // Double checked locking...
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
                     this->private_state_->mutex_, 0);
 
-  return this->private_discriminator_type_i (ACE_TRY_ENV);
+  return this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::private_discriminator_type_i (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   ) const
 {
   if (this->private_state_->tc_discriminator_type_known_)
@@ -2085,8 +2085,8 @@ CORBA_TypeCode::private_discriminator_type_i (
 
   CORBA_TypeCode::_tao_decode (this,
                                stream,
-                               this->private_state_->tc_discriminator_type_,
-                               ACE_TRY_ENV);
+                               this->private_state_->tc_discriminator_type_
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   this->private_state_->tc_discriminator_type_known_ = 1;
@@ -2095,19 +2095,19 @@ CORBA_TypeCode::private_discriminator_type_i (
 
 CORBA::Long
 CORBA_TypeCode::private_default_index (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   ) const
 {
   // Double checked locking...
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
                     this->private_state_->mutex_, 0);
 
-  return this->private_default_index_i (ACE_TRY_ENV);
+  return this->private_default_index_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Long
 CORBA_TypeCode::private_default_index_i (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   ) const
 {
   if (this->private_state_->tc_default_index_used_known_)
@@ -2129,7 +2129,7 @@ CORBA_TypeCode::private_default_index_i (
 }
 
 CORBA::Long
-CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_length (TAO_ENV_SINGLE_ARG_DECL) const
 {
   TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
@@ -2182,7 +2182,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &ACE_TRY_ENV) const
 }
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const
 {
   TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
@@ -2200,8 +2200,8 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
         // retrieve the content type
         CORBA_TypeCode::_tao_decode (this,
                                      stream,
-                                     this->private_state_->tc_content_type_,
-                                     ACE_TRY_ENV);
+                                     this->private_state_->tc_content_type_
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         this->private_state_->tc_content_type_known_ = 1;
@@ -2223,8 +2223,8 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
 
         CORBA_TypeCode::_tao_decode (this,
                                      stream,
-                                     this->private_state_->tc_content_type_,
-                                     ACE_TRY_ENV);
+                                     this->private_state_->tc_content_type_
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         this->private_state_->tc_content_type_known_ = 1;
@@ -2243,8 +2243,8 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &ACE_TRY_ENV) const
 void
 CORBA_TypeCode::_tao_decode (const CORBA_TypeCode *parent,
                              TAO_InputCDR &cdr,
-                             CORBA_TypeCode *&x,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA_TypeCode *&x
+                             TAO_ENV_ARG_DECL)
 {
   x = 0;
   CORBA::ULong kind;
@@ -2493,7 +2493,7 @@ CORBA_TypeCode::_tao_decode (const CORBA_TypeCode *parent,
 // provides.
 
 CORBA::ULong
-CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::param_count (TAO_ENV_SINGLE_ARG_DECL) const
 {
   switch (this->kind_)
     {
@@ -2566,8 +2566,8 @@ CORBA_TypeCode::param_count (CORBA::Environment &ACE_TRY_ENV) const
 }
 
 CORBA::Any_ptr
-CORBA_TypeCode::parameter (const CORBA::Long /* slot */,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA_TypeCode::parameter (const CORBA::Long /* slot */
+                           TAO_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO),
@@ -2581,7 +2581,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
 {
   if (x == 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         0);
@@ -2613,7 +2613,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
         ACE_TRY_NEW_ENV
           {
             CORBA::ULong length =
-              x->length (ACE_TRY_ENV);
+              x->length (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (!cdr.write_ulong (length))
@@ -2655,7 +2655,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA_TypeCode::_tao_decode (0, cdr, x, ACE_TRY_ENV);
+      CORBA_TypeCode::_tao_decode (0, cdr, x TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 46d300c39ef..99610b73f20 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -70,10 +70,10 @@ public:
 
     virtual void _raise (void);
 
-    virtual void _tao_encode (TAO_OutputCDR &cdr,
-                              CORBA::Environment &) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr,
-                              CORBA::Environment &);
+    virtual void _tao_encode (TAO_OutputCDR &cdr
+                              TAO_ENV_ARG_DECL_NOT_USED) const;
+    virtual void _tao_decode (TAO_InputCDR &cdr
+                              TAO_ENV_ARG_DECL_NOT_USED);
 
     static Bounds* _downcast (CORBA_Exception *ex);
     virtual int _is_a (const char* interface_id) const;
@@ -86,10 +86,10 @@ public:
 
     virtual void _raise (void);
 
-    virtual void _tao_encode (TAO_OutputCDR &cdr,
-                              CORBA::Environment &) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr,
-                              CORBA::Environment &);
+    virtual void _tao_encode (TAO_OutputCDR &cdr
+                              TAO_ENV_ARG_DECL_NOT_USED) const;
+    virtual void _tao_decode (TAO_InputCDR &cdr
+                              TAO_ENV_ARG_DECL_NOT_USED);
 
     static BadKind* _downcast (CORBA_Exception *ex);
     virtual int _is_a (const char* interface_id) const;
@@ -105,68 +105,54 @@ public:
   static CORBA::TypeCode_ptr _nil (void);
 
   /// Compares two typecodes. Must be identical in every respect.
-  CORBA::Boolean equal (CORBA::TypeCode_ptr,
-                        CORBA_Environment &ACE_TRY_ENV =
-                          TAO_default_environment ()) const;
+  CORBA::Boolean equal (CORBA::TypeCode_ptr
+                        TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Conforms to CORBA 2.3.1 (99-10-07).
-  CORBA::Boolean equivalent (CORBA::TypeCode_ptr,
-                             CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ()) const;
+  CORBA::Boolean equivalent (CORBA::TypeCode_ptr
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For all TypeCode kinds, returns the "kind" of the typecode.
-  CORBA::TCKind kind (CORBA_Environment &ACE_TRY_ENV =
-                        TAO_default_environment ()) const;
+  CORBA::TCKind kind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_{objref,struct,union,enum,alias,except}. Returns the
   /// repository ID, raises BadKind.
-  const char *id (CORBA_Environment &ACE_TRY_ENV =
-                    TAO_default_environment ()) const;
+  const char *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns name (), raises (BadKind).
-  const char *name (CORBA_Environment &ACE_TRY_ENV =
-                      TAO_default_environment ()) const;
+  const char *name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns member_count (), raises (BadKind). Useful for tk_struct,
   /// tk_union, tk_enum, tk_alias, and tk_except.
-  CORBA::ULong member_count (CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ()) const;
+  CORBA::ULong member_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns member_name (...), raises (BadKind, Bounds); Useful for
   /// tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
-  const char *member_name (CORBA::ULong slot,
-                           CORBA_Environment &ACE_TRY_ENV =
-                             TAO_default_environment ()) const;
+  const char *member_name (CORBA::ULong slot
+                           TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns member_type (...), raises (BadKind, Bounds); Useful for
   /// tk_struct, tk_union, and tk_except.
-  CORBA::TypeCode_ptr member_type (CORBA::ULong slot,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ()) const;
+  CORBA::TypeCode_ptr member_type (CORBA::ULong slot
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_union. Returns the label. Raises BadKind, Bounds.
-  CORBA::Any_ptr member_label (CORBA::ULong n,
-                               CORBA_Environment &ACE_TRY_ENV =
-                                 TAO_default_environment ()) const;
+  CORBA::Any_ptr member_label (CORBA::ULong n
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns the discriminator type for tk_union. raises (BadKind).
-  CORBA::TypeCode_ptr discriminator_type (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-    ) const;
+  CORBA::TypeCode_ptr discriminator_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns the default slot for the tk_union. Raises (BadKind).
-  CORBA::Long default_index (CORBA_Environment &ACE_TRY_ENV =
-                               TAO_default_environment ()) const;
+  CORBA::Long default_index (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns length, raises (BadKind). Used for tk_string,
   /// tk_sequence, and tk_array.
-  CORBA::ULong length (CORBA_Environment &ACE_TRY_ENV =
-                         TAO_default_environment ()) const;
+  CORBA::ULong length (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns the content type (element type). Raises (BadKind); Useful
   /// for tk_sequence, tk_array, and tk_alias.
-  CORBA::TypeCode_ptr content_type (CORBA_Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ()) const;
+  CORBA::TypeCode_ptr content_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   // = Creation/refcounting
 
@@ -223,21 +209,19 @@ public:
 
   /// Deprecated in the CORBA 2.2 spec and
   /// missing altogether from 2.3a (98-12-04),
-  CORBA::Any_ptr parameter (const CORBA::Long slot,
-                            CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ());
+  CORBA::Any_ptr parameter (const CORBA::Long slot
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Deprecated, CORBA 1.2, not fully usable. Returns the number of
   /// parameters that the typecode takes.
-  CORBA::ULong param_count (CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ()) const;
+  CORBA::ULong param_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// CDR decoding: the >> operator is not enough because we must also
   /// respect the parent/child relationship among TypeCodes.
   static void _tao_decode (const CORBA_TypeCode *parent,
                            TAO_InputCDR &cdr,
-                           CORBA_TypeCode *&child,
-                           CORBA::Environment &ACE_TRY_ENV);
+                           CORBA_TypeCode *&child
+                           TAO_ENV_ARG_DECL);
 
   // private:
   //
@@ -300,141 +284,121 @@ private:
    * flag, to differentiate the behavior where necessary.
    */
   CORBA::Boolean equ_common (CORBA::TypeCode_ptr tc,
-                             CORBA::Boolean equiv_only,
-                             CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()) const;
+                             CORBA::Boolean equiv_only
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Compares the typecodes.
   CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
-                                CORBA::Boolean equiv_only,
-                                CORBA_Environment &ACE_TRY_ENV =
-                                  TAO_default_environment ()) const;
+                                CORBA::Boolean equiv_only
+                                TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_{objref,struct,union,enum,alias,except}. Returns the
   /// repository ID, raises BadKind.
-  const char *private_id (CORBA_Environment &ACE_TRY_ENV =
-                            TAO_default_environment ()) const;
+  const char *private_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns name (), raises (BadKind)
-  const char *private_name (CORBA_Environment &ACE_TRY_ENV =
-                              TAO_default_environment ()) const;
+  const char *private_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns member_count (), raises (BadKind). Useful for tk_struct,
   /// tk_union, tk_enum, tk_alias, and tk_except.
-  CORBA::ULong private_member_count (CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ()) const;
+  CORBA::ULong private_member_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns member_type (...), raises (BadKind, Bounds); Useful for
   /// tk_struct, tk_union, and tk_except
   CORBA::TypeCode_ptr private_member_type (
-      CORBA::ULong slot,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      CORBA::ULong slot
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   /// returns member_name (...), raises (BadKind, Bounds); Useful for
   /// tk_union, tk_struct, tk_except, and tk_enum
-  const char *private_member_name (CORBA::ULong slot,
-                                   CORBA_Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ()) const;
+  const char *private_member_name (CORBA::ULong slot
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_union. Returns the label. Raises BadKind, Bounds.
-  CORBA::Any_ptr private_member_label (CORBA::ULong n,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
+  CORBA::Any_ptr private_member_label (CORBA::ULong n
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns the discriminator type for tk_union, and acquires the lock
   /// for the wrapped function below. raises (BadKind)
   CORBA::TypeCode_ptr private_discriminator_type (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   /// Acquires no lock so it can be called internally from blocks
   /// which have a lock.
   CORBA::TypeCode_ptr private_discriminator_type_i (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   /// returns the default slot for the tk_union. Raises (BadKind);
-  CORBA::Long private_default_index (CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ()) const;
+  CORBA::Long private_default_index (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Acquires no lock so it can be called internally from blocks
   /// which have a lock.
-  CORBA::Long private_default_index_i (CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
+  CORBA::Long private_default_index_i (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns length, raises (BadKind). Used for tk_string,
   /// tk_sequence, and tk_array
-  CORBA::Long private_length (CORBA_Environment &ACE_TRY_ENV =
-                                TAO_default_environment ()) const;
+  CORBA::Long private_length (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns the content type (element type). Raises (BadKind); Useful
   /// for tk_sequence, tk_array, and tk_alias
   CORBA::TypeCode_ptr private_content_type (
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   // = All the private helpers testing for equality of typecodes
 
   /// test equality for typecodes of objrefs
   CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc,
-                                       CORBA::Boolean equiv_only,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
+                                       CORBA::Boolean equiv_only
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of structs
   CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc,
-                                       CORBA::Boolean equiv_only,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
+                                       CORBA::Boolean equiv_only
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of unions
   CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc,
-                                      CORBA::Boolean equiv_only,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()) const;
+                                      CORBA::Boolean equiv_only
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of enums
   CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc,
-                                     CORBA::Boolean equiv_only,
-                                     CORBA_Environment &ACE_TRY_ENV =
-                                       TAO_default_environment ()) const;
+                                     CORBA::Boolean equiv_only
+                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of strings
   CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc,
-                                       CORBA::Boolean equiv_only,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
+                                       CORBA::Boolean equiv_only
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of wide strings
   CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                        CORBA::Boolean equiv_only,
-                                        CORBA_Environment &ACE_TRY_ENV =
-                                          TAO_default_environment ()) const;
+                                        CORBA::Boolean equiv_only
+                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of sequences
   CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                         CORBA::Boolean equiv_only,
-                                         CORBA_Environment &ACE_TRY_ENV =
-                                           TAO_default_environment ()) const;
+                                         CORBA::Boolean equiv_only
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of array
   CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc,
-                                      CORBA::Boolean equiv_only,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()) const;
+                                      CORBA::Boolean equiv_only
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of typedefs
   CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc,
-                                      CORBA::Boolean equiv_only,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                        TAO_default_environment ()) const;
+                                      CORBA::Boolean equiv_only
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of exceptions
   CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc,
-                                       CORBA::Boolean equiv_only,
-                                       CORBA_Environment &ACE_TRY_ENV =
-                                         TAO_default_environment ()) const;
+                                       CORBA::Boolean equiv_only
+                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// if refcount reaches 0, free this typecode
   CORBA::ULong refcount_;
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index bee69e76c59..ec8b4bd73fb 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -36,51 +36,51 @@ CORBA::TypeCode::_nil (void)
 }
 
 ACE_INLINE CORBA::TCKind
-CORBA_TypeCode::kind (CORBA::Environment &) const
+CORBA_TypeCode::kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) const
 {
   return (CORBA::TCKind) this->kind_;
 }
 
 // Returns true if the two typecodes are equivalent.
 ACE_INLINE CORBA::Boolean
-CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc,
-                            CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc
+                            TAO_ENV_ARG_DECL) const
 {
   return this->equ_common (tc,
-                           1,
-			   ACE_TRY_ENV);
+                           1
+                            TAO_ENV_ARG_PARAMETER);
 }
 
 // Returns true if the two typecodes are identical.
 ACE_INLINE CORBA::Boolean
-CORBA_TypeCode::equal (CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::equal (CORBA::TypeCode_ptr tc
+                       TAO_ENV_ARG_DECL) const
 {
   return this->equ_common (tc,
-                           0,
-			   ACE_TRY_ENV);
+                           0
+                            TAO_ENV_ARG_PARAMETER);
 }
 
 // returns the Repository ID
 ACE_INLINE const char *
-CORBA_TypeCode::id (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::id (TAO_ENV_SINGLE_ARG_DECL) const
 {
   // if already precomputed
   if (this->private_state_->tc_id_known_)
     return this->private_state_->tc_id_;
   else
-    return this->private_id (ACE_TRY_ENV);
+    return this->private_id (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // returns the string name
 ACE_INLINE const char *
-CORBA_TypeCode::name (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::name (TAO_ENV_SINGLE_ARG_DECL) const
 {
   // if already precomputed
   if (this->private_state_->tc_name_known_)
     return this->private_state_->tc_name_;
   else
-    return this->private_name (ACE_TRY_ENV);
+    return this->private_name (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Return the number of members defined by this typecode
@@ -89,13 +89,13 @@ CORBA_TypeCode::name (CORBA::Environment &ACE_TRY_ENV) const
 // For the rest of the cases, raises the BadKind exception.
 
 ACE_INLINE CORBA::ULong
-CORBA_TypeCode::member_count (CORBA::Environment &ACE_TRY_ENV) const
+CORBA_TypeCode::member_count (TAO_ENV_SINGLE_ARG_DECL) const
 {
   // if already precomputed
   if (this->private_state_->tc_member_count_known_)
     return this->private_state_->tc_member_count_;
   else
-    return this->private_member_count (ACE_TRY_ENV);
+    return this->private_member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // ************************************************************
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 1106611d560..e549a201aa8 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -56,16 +56,16 @@ void CORBA_WrongTransaction::_raise (void)
   TAO_RAISE(*this);
 }
 
-void CORBA_WrongTransaction::_tao_encode (TAO_OutputCDR &cdr,
-                                          CORBA::Environment &ACE_TRY_ENV) const
+void CORBA_WrongTransaction::_tao_encode (TAO_OutputCDR &cdr
+                                          TAO_ENV_ARG_DECL) const
 {
   if (cdr << *this)
     return;
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-void CORBA_WrongTransaction::_tao_decode (TAO_InputCDR &cdr,
-                                          CORBA::Environment &ACE_TRY_ENV)
+void CORBA_WrongTransaction::_tao_decode (TAO_InputCDR &cdr
+                                          TAO_ENV_ARG_DECL)
 {
   if (cdr >> *this)
     return;
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index ef6687a60ab..44ee6c588da 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -65,10 +65,9 @@ public:
 
   virtual void _raise (void);
 
-  virtual void _tao_encode (TAO_OutputCDR &cdr,
-                            CORBA::Environment &) const;
-  virtual void _tao_decode (TAO_InputCDR &cdr,
-                            CORBA::Environment &);
+  virtual void _tao_encode (TAO_OutputCDR &cdr
+                            TAO_ENV_ARG_DECL_NOT_USED) const;
+  virtual void _tao_decode (TAO_InputCDR &cdr TAO_ENV_ARG_DECL_NOT_USED);
 
   static CORBA_WrongTransaction *_downcast (CORBA::Exception *);
 
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 22ac70362c3..2df57c58492 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -36,8 +36,8 @@ ACE_RCSID(tao, append, "$Id$")
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
                                TAO_InputCDR *src,
-                               TAO_OutputCDR *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               TAO_OutputCDR *dest
+                               TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
   CORBA::TypeCode::traverse_status retval =
@@ -99,8 +99,8 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
                          TAO_InputCDR *src,
-                         TAO_OutputCDR *dest,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         TAO_OutputCDR *dest
+                         TAO_ENV_ARG_DECL)
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -119,8 +119,8 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
   CORBA::TypeCode::traverse_status retval =
     TAO_Marshal_Object::perform_append (elem_tc.in (),
                                         src,
-                                        dest,
-                                        ACE_TRY_ENV);
+                                        dest
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -140,8 +140,8 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                               TAO_InputCDR *src,
-                              TAO_OutputCDR *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              TAO_OutputCDR *dest
+                              TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
   CORBA::TypeCode::traverse_status retval =
@@ -177,8 +177,8 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                 retval =
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
-                                                      dest,
-                                                      ACE_TRY_ENV);
+                                                      dest
+                                                       TAO_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
               }
             break;
@@ -190,8 +190,8 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                 retval =
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
-                                                      dest,
-                                                      ACE_TRY_ENV);
+                                                      dest
+                                                       TAO_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
               }
             break;
@@ -211,8 +211,8 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                 retval =
                   TAO_Marshal_Object::perform_append (TC_opaque,
                                                       src,
-                                                      dest,
-                                                      ACE_TRY_ENV);
+                                                      dest
+                                                       TAO_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
               }
             } // end of switch
@@ -247,21 +247,21 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
                                TAO_InputCDR *src,
-                               TAO_OutputCDR *dest,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               TAO_OutputCDR *dest
+                               TAO_ENV_ARG_DECL)
 {
   // write the octet sequence representing the Principal
   return TAO_Marshal_Object::perform_append (TC_opaque,
                                              src,
-                                             dest,
-                                             ACE_TRY_ENV);
+                                             dest
+                                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            TAO_OutputCDR *dest
+                            TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -333,15 +333,15 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            TAO_OutputCDR *dest
+                            TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
+  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0;
@@ -349,14 +349,14 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
        i++)
     {
       // get member type
-      param = tc->member_type (i, ACE_TRY_ENV);
+      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval =
         TAO_Marshal_Object::perform_append (param.in (),
                                             src,
-                                            dest,
-                                            ACE_TRY_ENV);
+                                            dest
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
@@ -375,15 +375,15 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
                            TAO_InputCDR *src,
-                           TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           TAO_OutputCDR *dest
+                           TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_TRY_ENV);
+    tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   CORBA::ULong kind =
-    discrim_tc->kind (ACE_TRY_ENV);
+    discrim_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // Save the discriminator value in a temporary variable...
@@ -467,7 +467,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
     }
 
   CORBA::ULong member_count =
-    tc->member_count (ACE_TRY_ENV);
+    tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U);
@@ -479,15 +479,15 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
        i != member_count && current_member == null_member;
        ++i)
     {
-      CORBA::Any_var any = tc->member_label (i, 
-                                             ACE_TRY_ENV);
+      CORBA::Any_var any = tc->member_label (i
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       CORBA::Octet o;
       if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
         {
           CORBA::ULong default_index =
-            tc->default_index (ACE_TRY_ENV);
+            tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
           if (i != default_index)
@@ -584,12 +584,12 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
         {
           // Good, use the default to append...
           CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member, ACE_TRY_ENV);
+            tc->member_type (default_member TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
           return TAO_Marshal_Object::perform_append (member_tc.in (),
                                                      src,
-                                                     dest,
-                                                     ACE_TRY_ENV);
+                                                     dest
+                                                      TAO_ENV_ARG_PARAMETER);
         }
 
       return CORBA::TypeCode::TRAVERSE_STOP;
@@ -597,19 +597,19 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 
   // If we found the member successfully then just use that one...
   CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member, ACE_TRY_ENV);
+    tc->member_type (current_member TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
   return TAO_Marshal_Object::perform_append (member_tc.in (),
                                              src,
-                                             dest,
-                                             ACE_TRY_ENV);
+                                             dest
+                                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_String::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            TAO_OutputCDR *dest
+                            TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -637,8 +637,8 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
                               TAO_InputCDR *src,
-                              TAO_OutputCDR *dest,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              TAO_OutputCDR *dest
+                              TAO_ENV_ARG_DECL)
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -671,13 +671,13 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
     {
       // Get element typecode.
       CORBA::TypeCode_var tc2 =
-        tc->content_type (ACE_TRY_ENV);
+        tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       CORBA::TypeCode::traverse_status retval =
         CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-      CORBA::TCKind kind = tc2->kind (ACE_TRY_ENV);
+      CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       switch (kind)
@@ -831,8 +831,8 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
             {
               retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                            src,
-                                                           dest,
-                                                           ACE_TRY_ENV);
+                                                           dest
+                                                            TAO_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
             }
           break;
@@ -855,19 +855,19 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
-                           TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           TAO_OutputCDR *dest
+                           TAO_ENV_ARG_DECL)
 {
   // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
+  CORBA::ULong bounds = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // get element typecode
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // For CORBA basic types, the copy can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // Return status.
@@ -1024,8 +1024,8 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
         {
           retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                        src,
-                                                       dest,
-                                                       ACE_TRY_ENV);
+                                                       dest
+                                                        TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
         }
       break;
@@ -1046,8 +1046,8 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
-                           TAO_OutputCDR *dest,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           TAO_OutputCDR *dest
+                           TAO_ENV_ARG_DECL)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
@@ -1057,13 +1057,13 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (ACE_TRY_ENV);
+  tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                src,
-                                               dest,
-                                               ACE_TRY_ENV);
+                                               dest
+                                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
@@ -1088,8 +1088,8 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
-                            TAO_OutputCDR *dest,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            TAO_OutputCDR *dest
+                            TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -1100,20 +1100,20 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
   continue_append = dest->append_string (*src);
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
+  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count
          && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
          && continue_append == 1; i++)
     {
-      param = tc->member_type (i, ACE_TRY_ENV);
+      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval = TAO_Marshal_Object::perform_append (param.in (),
                                                    src,
-                                                   dest,
-                                                   ACE_TRY_ENV);
+                                                   dest
+                                                    TAO_ENV_ARG_PARAMETER);
     }
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
@@ -1131,8 +1131,8 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
                              TAO_InputCDR *src,
-                             TAO_OutputCDR *dest,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             TAO_OutputCDR *dest
+                             TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index ded0f274445..8a88e41f5d2 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -225,7 +225,7 @@
 # error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them"
 #endif /* TAO_HAS_EXCEPTIONS */
 
-#if !defined (TAO_HAS_EXCEPTIONS)
+#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_LACKS_SUPPRESS_ENV)
 #define TAO_ENV_ARG_DECL , CORBA::Environment &ACE_TRY_ENV
 #define TAO_ENV_ARG_DECL_WITH_DEFAULTS , CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
 #define TAO_ENV_ARG_DECL_NOT_USED , CORBA::Environment &
@@ -234,7 +234,9 @@
 #define TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
 #define TAO_ENV_SINGLE_ARG_DECL_NOT_USED CORBA::Environment &
 #define TAO_ENV_SINGLE_ARG_PARAMETER ACE_TRY_ENV
-#define TAO_ENV_ARG_DEFN
+#define TAO_ENV_ARG_NOT_USED ACE_UNUSED_ARG (ACE_TRY_ENV)
+#define TAO_ENV_ARG_DEFN /* Please do not use, obsolescent. Instead: */
+#define TAO_ENV_DECLARE_NEW_ENV ACE_DECLARE_NEW_CORBA_ENV
 #else
 #define TAO_ENV_ARG_DECL
 #define TAO_ENV_ARG_DECL_WITH_DEFAULTS
@@ -244,7 +246,15 @@
 #define TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 #define TAO_ENV_SINGLE_ARG_DECL_NOT_USED
 #define TAO_ENV_SINGLE_ARG_PARAMETER
+#define TAO_ENV_ARG_NOT_USED
 #define TAO_ENV_ARG_DEFN CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+#define TAO_ENV_DECLARE_NEW_ENV
+#endif /* TAO_HAS_EXCEPTIONS */
+#if !defined (TAO_HAS_EXCEPTIONS)
+// This thing can be moved into the above when we drop TAO_LACKS_SUPPRESS_ENV.
+#define TAO_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex)
+#else
+#define TAO_ENV_RAISE(ex) (ex)->_raise ()
 #endif /* TAO_HAS_EXCEPTIONS */
 
 // BC++ seems to have a different convention for detecting Win32 than
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index ae08667a404..7790558531e 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -29,8 +29,8 @@ ACE_RCSID(tao, skip, "$Id$")
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
-                             TAO_InputCDR *stream,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             TAO_InputCDR *stream
+                             TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -93,8 +93,8 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
-                       TAO_InputCDR *stream,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       TAO_InputCDR *stream
+                       TAO_ENV_ARG_DECL)
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -104,14 +104,14 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_STOP;
 
   return TAO_Marshal_Object::perform_skip (elem_tc.in (),
-                                           stream,
-                                           ACE_TRY_ENV);
+                                           stream
+                                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *stream,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            TAO_InputCDR *stream
+                            TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -203,8 +203,8 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *stream,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             TAO_InputCDR *stream
+                             TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -234,8 +234,8 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          TAO_InputCDR *stream
+                          TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -297,27 +297,27 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          TAO_InputCDR *stream
+                          TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (ACE_TRY_ENV);
+  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count
          && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
        i++)
     {
-      param = tc->member_type (i, ACE_TRY_ENV);
+      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream,
-                                                 ACE_TRY_ENV);
+                                                 stream
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
@@ -334,15 +334,15 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *src,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         TAO_InputCDR *src
+                         TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_TRY_ENV);
+    tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   CORBA::ULong kind =
-    discrim_tc->kind (ACE_TRY_ENV);
+    discrim_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // Save the discriminator value in a temporary variable...
@@ -418,7 +418,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
     }
 
   CORBA::ULong member_count =
-    tc->member_count (ACE_TRY_ENV);
+    tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U);
@@ -430,14 +430,14 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
        i != member_count && current_member == null_member;
        ++i)
     {
-      CORBA::Any_var any = tc->member_label (i, ACE_TRY_ENV);
+      CORBA::Any_var any = tc->member_label (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       CORBA::Octet o;
       if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
         {
           CORBA::ULong default_index =
-            tc->default_index (ACE_TRY_ENV);
+            tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
           if (i != default_index)
@@ -534,14 +534,14 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
         {
           // Good, use the default to append...
           CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member, ACE_TRY_ENV);
+            tc->member_type (default_member TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
           return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                                   src,
-                                                   ACE_TRY_ENV);
+                                                   src
+                                                   TAO_ENV_ARG_PARAMETER);
         }
 
-      // If we're here, we have an implicit default case, and we 
+      // If we're here, we have an implicit default case, and we
       // should just return without demarshaling anything, since no
       // union member was marshaled in the first place.
       return CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -549,17 +549,17 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 
   // If we found the member successfully then just use that one...
   CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member, ACE_TRY_ENV);
+    tc->member_type (current_member TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
   return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                           src,
-                                           ACE_TRY_ENV);
+                                           src
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          TAO_InputCDR *stream
+                          TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -587,8 +587,8 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *stream,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            TAO_InputCDR *stream
+                            TAO_ENV_ARG_DECL)
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -614,11 +614,11 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
 
   // Get element typecode.
   CORBA::TypeCode_var tc2 =
-    tc->content_type (ACE_TRY_ENV);
+    tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   char *dummy;
@@ -673,8 +673,8 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
         {
           continue_skipping =
             TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream,
-                                              ACE_TRY_ENV);
+                                              stream
+                                               TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
         }
       break;
@@ -693,23 +693,23 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         TAO_InputCDR *stream
+                         TAO_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
 
   // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_TRY_ENV);
+  CORBA::ULong bounds = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // get element typecode
   // Typecode of the element.
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   char *dummy;
@@ -764,8 +764,8 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
         {
           int stop =
             TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream,
-                                              ACE_TRY_ENV);
+                                              stream
+                                               TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
           if (stop == CORBA::TypeCode::TRAVERSE_STOP)
             continue_skipping = 0;
@@ -786,8 +786,8 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         TAO_InputCDR *stream
+                         TAO_ENV_ARG_DECL)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
@@ -797,12 +797,12 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (ACE_TRY_ENV);
+  tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   retval = TAO_Marshal_Object::perform_skip (tc2.in (),
-                                             stream,
-                                             ACE_TRY_ENV);
+                                             stream
+                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   //  tc2->_decr_refcnt ();
@@ -827,8 +827,8 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 // NOTE: This is asymmetric with respect to encoding exceptions.
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          TAO_InputCDR *stream
+                          TAO_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -839,19 +839,19 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_STOP;
 
   // Number of fields in the exception
-  int member_count = tc->member_count (ACE_TRY_ENV);
+  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count
          && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
        i++)
     {
-      param = tc->member_type (i, ACE_TRY_ENV);
+      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream,
-                                                 ACE_TRY_ENV);
+                                                 stream
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
@@ -869,8 +869,8 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
 // decode wstring
 CORBA::TypeCode::traverse_status
 TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
-                           TAO_InputCDR *stream,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           TAO_InputCDR *stream
+                           TAO_ENV_ARG_DECL)
 {
   ACE_CDR::Boolean continue_skipping = 1;
 
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index b6fdee8113d..3745bc069ea 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -32,8 +32,8 @@ AMI_Test_i::AMI_Test_i (CORBA::ORB_ptr orb)
 CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
-                 const char* in_str,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 const char* in_str
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    A::DidTheRightThing))
 {
@@ -58,7 +58,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 
 void
-AMI_Test_i::shutdown (CORBA::Environment &)
+AMI_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
@@ -66,7 +66,7 @@ AMI_Test_i::shutdown (CORBA::Environment &)
 
 
 CORBA::Long
-AMI_Test_i::yadda (CORBA::Environment &)
+AMI_Test_i::yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -76,8 +76,8 @@ AMI_Test_i::yadda (CORBA::Environment &)
 
 
 void
-AMI_Test_i::yadda (CORBA::Long yadda,
-                   CORBA::Environment &)
+AMI_Test_i::yadda (CORBA::Long yadda
+                   TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h
index fb235968a52..8e877174b25 100644
--- a/TAO/tests/AMI/ami_test_i.h
+++ b/TAO/tests/AMI/ami_test_i.h
@@ -37,19 +37,19 @@ public:
   // The AMI_Test methods.
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
-                   const char* in_str,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   const char* in_str
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      A::DidTheRightThing));
-  
-  void shutdown (CORBA::Environment&)
+
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long yadda (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Long yadda (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void yadda (CORBA::Long yadda,
-              CORBA::Environment &ACE_TRY_ENV)
+  void yadda (CORBA::Long yadda
+              TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 08ded59bd64..5ce889f4cfb 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -9,7 +9,7 @@
 //    server.cpp
 //
 // = DESCRIPTION
-//    A client, which uses the AMI callback model.
+//    A client which uses the AMI callback model.
 //
 // = AUTHOR
 //    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
@@ -99,8 +99,8 @@ public:
   Handler (void) {};
 
   void foo (CORBA::Long result,
-            CORBA::Long out_l,
-            CORBA::Environment&)
+            CORBA::Long out_l
+            TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -114,8 +114,8 @@ public:
       number_of_replies--;
     };
 
-   void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder,
-                  CORBA::Environment &ACE_TRY_ENV)
+   void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
+                  TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
@@ -123,20 +123,20 @@ public:
                   "Callback method <foo_excep> called: \n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (ACE_TRY_ENV);
+          excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Catched exception:");
+                               "Caught exception:");
         }
       ACE_ENDTRY;
       ACE_CHECK;
     };
 
-  void get_yadda (CORBA::Long result,
-                  CORBA::Environment &)
+  void get_yadda (CORBA::Long result
+                  TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -144,23 +144,23 @@ public:
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
-                        CORBA::Environment &)
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+                        TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (CORBA::Environment &)
+  void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
-                        CORBA::Environment &)
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+                        TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -175,22 +175,22 @@ Handler handler;
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       A::AMI_Test_var server =
-        A::AMI_Test::_narrow (object.in (), ACE_TRY_ENV);
+        A::AMI_Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -204,7 +204,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -213,16 +213,16 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-  
+
       // Let the client perform the test in a separate thread
 
       Client client (server.in (), niterations);
@@ -248,12 +248,12 @@ main (int argc, char *argv[])
       while (number_of_replies > 0)
         {
           CORBA::Boolean pending =
-            orb->work_pending(ACE_TRY_ENV);
+            orb->work_pending(TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (pending)
             {
-              orb->perform_work(ACE_TRY_ENV);
+              orb->perform_work(TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -273,17 +273,17 @@ main (int argc, char *argv[])
       //client.ami_test_var_->shutdown ();
 
       root_poa->destroy (1,  // ethernalize objects
-                         0, // wait for completion
-                         ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
@@ -298,7 +298,7 @@ Client::Client (A::AMI_Test_ptr server,
                 :  ami_test_var_ (A::AMI_Test::_duplicate (server)),
      niterations_ (niterations)
 {
-  the_handler_var_ = handler._this (/* ACE_TRY_ENV */);
+  the_handler_var_ = handler._this (/* TAO_ENV_SINGLE_ARG_PARAMETER */);
 }
 
 int
@@ -312,8 +312,8 @@ Client::svc (void)
         {
           ami_test_var_->sendc_foo (the_handler_var_.in (),
                                     number,
-                                    "Let's talk AMI.",
-                                    ACE_TRY_ENV);
+                                    "Let's talk AMI."
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (debug)
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index 9393656e85a..a5916a29a99 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -56,15 +56,15 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -73,11 +73,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -86,11 +86,11 @@ main (int argc, char *argv[])
       AMI_Test_i ami_test_i (orb.in ());
 
       A::AMI_Test_var ami_test_var =
-        ami_test_i._this (ACE_TRY_ENV);
+        ami_test_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (ami_test_var.in (), ACE_TRY_ENV);
+        orb->object_to_string (ami_test_var.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -108,18 +108,18 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,  // ethernalize objects
-                         0, // wait for completion
-                         ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 77c14b0e919..7cd8199157f 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -9,7 +9,7 @@
 //    simple_client.cpp
 //
 // = DESCRIPTION
-//    A very simple client, which uses the AMI callback model.
+//    A very simple client which uses the AMI callback model.
 //
 // = AUTHOR
 //    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
@@ -82,8 +82,8 @@ public:
   // Destructor.
 
   void foo (CORBA::Long ami_return_val,
-            CORBA::Long out_l,
-            CORBA::Environment &)
+            CORBA::Long out_l
+            TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -95,24 +95,24 @@ public:
         }
     };
 
-  void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder,
-                  CORBA::Environment &ACE_TRY_ENV)
+  void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
+                  TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <foo_excep> called: \n"
-				  "Testing proper exception handling ...\n"));
+                                  "Testing proper exception handling ...\n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (ACE_TRY_ENV);
+          excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (A::DidTheRightThing, ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... exception received successfully\n"));
-		    }
+                    }
       ACE_CATCHANY
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -123,8 +123,8 @@ public:
     };
 
 
-  void get_yadda (CORBA::Long result,
-                  CORBA::Environment &)
+  void get_yadda (CORBA::Long result
+                  TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -132,23 +132,23 @@ public:
                   result));
     };
 
-  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
-                  CORBA::Environment &)
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+                  TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (CORBA::Environment &)
+  void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *,
-                  CORBA::Environment &)
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
+                  TAO_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -161,38 +161,38 @@ int
 main (int argc, char *argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object_var =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa_var =
-        PortableServer::POA::_narrow (object_var.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager_var =
-        poa_var->the_POAManager (ACE_TRY_ENV);
+        poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager_var->activate (ACE_TRY_ENV);
+      poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
-      object_var = orb->string_to_object (ior, ACE_TRY_ENV);
+      object_var = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       A::AMI_Test_var ami_test_var =
-        A::AMI_Test::_narrow (object_var.in (), ACE_TRY_ENV);
+        A::AMI_Test::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ami_test_var.in ()))
@@ -206,7 +206,7 @@ main (int argc, char *argv[])
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
       A::AMI_AMI_TestHandler_var the_handler_var =
-        handler._this (ACE_TRY_ENV);
+        handler._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try out sending asynchronous messages without a reply handler
@@ -214,8 +214,8 @@ main (int argc, char *argv[])
 
       ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (),
                                0,
-                               "",
-                               ACE_TRY_ENV);
+                               ""
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -226,8 +226,8 @@ main (int argc, char *argv[])
 
       ami_test_var->sendc_foo (the_handler_var.in (),
                                0,
-                               "Let's talk AMI.",
-                               ACE_TRY_ENV);
+                               "Let's talk AMI."
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Long l = 931247;
@@ -240,23 +240,23 @@ main (int argc, char *argv[])
 
           ami_test_var->sendc_foo (the_handler_var.in (),
                                    l,
-                                   "Let's talk AMI.",
-                                   ACE_TRY_ENV);
+                                   "Let's talk AMI."
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Begin test of attributes
-      ami_test_var->sendc_get_yadda (the_handler_var.in (),
-                                     ACE_TRY_ENV);
+      ami_test_var->sendc_get_yadda (the_handler_var.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ami_test_var->sendc_set_yadda (the_handler_var.in (),
-                                     4711,
-                                     ACE_TRY_ENV);
+                                     4711
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ami_test_var->sendc_get_yadda (the_handler_var.in (),
-                                     ACE_TRY_ENV);
+      ami_test_var->sendc_get_yadda (the_handler_var.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // End test of attributes
@@ -280,8 +280,8 @@ main (int argc, char *argv[])
 
       CORBA::Long number = ami_test_var->foo (l,
                                               l,
-                                              "Let's talk SMI.",
-                                              ACE_TRY_ENV);
+                                              "Let's talk SMI."
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (debug)
@@ -293,22 +293,22 @@ main (int argc, char *argv[])
 
       if (shutdown_flag)
         {
-          ami_test_var->shutdown (ACE_TRY_ENV);
+          ami_test_var->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       poa_var->destroy (1,  // ethernalize objects
-                        0, // wait for completion
-                        ACE_TRY_ENV);
+                        0  // wait for completion
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
index 79a75408078..9d7ab0a4455 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -13,29 +13,29 @@ AMI_Buffering::AMI_Buffering (CORBA::ORB_ptr orb,
 }
 
 void
-AMI_Buffering::receive_data (const Test::Payload &the_payload,
-                                CORBA::Environment &ACE_TRY_ENV)
+AMI_Buffering::receive_data (const Test::Payload &the_payload
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->request_received (the_payload.length (), ACE_TRY_ENV);
+  this->admin_->request_received (the_payload.length () TAO_ENV_ARG_PARAMETER);
 }
 
 void
-AMI_Buffering::flush (CORBA::Environment &)
+AMI_Buffering::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-AMI_Buffering::sync (CORBA::Environment &ACE_TRY_ENV)
+AMI_Buffering::sync (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->flush (ACE_TRY_ENV);
+  this->admin_->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-AMI_Buffering::shutdown (CORBA::Environment &ACE_TRY_ENV)
+AMI_Buffering::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index d3f672a97ba..52614d58731 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h
@@ -26,17 +26,17 @@ public:
                  Test::AMI_Buffering_Admin_ptr admin);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &the_payload,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_data (const Test::Payload &the_payload
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (CORBA::Environment &ACE_TRY_ENV)
+  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (CORBA::Environment &ACE_TRY_ENV)
+  virtual void sync (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index b5350db820e..9f258445acd 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -13,22 +13,22 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::request_count (CORBA::Environment &)
+AMI_Buffering_Admin::request_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::bytes_received_count (CORBA::Environment &)
+AMI_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
 }
 
 void
-AMI_Buffering_Admin::request_received (CORBA::ULong payload_length,
-                                          CORBA::Environment &)
+AMI_Buffering_Admin::request_received (CORBA::ULong payload_length
+                                          TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
@@ -36,14 +36,14 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length,
 }
 
 void
-AMI_Buffering_Admin::flush (CORBA::Environment &)
+AMI_Buffering_Admin::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-AMI_Buffering_Admin::shutdown (CORBA::Environment &ACE_TRY_ENV)
+AMI_Buffering_Admin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index 23915510b1d..f3f3d305fbc 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
@@ -25,20 +25,20 @@ public:
   AMI_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong request_count (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong bytes_received_count (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong bytes_received_count (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void request_received (CORBA::ULong payload_length,
-                                 CORBA::Environment &ACE_TRY_ENV)
+  virtual void request_received (CORBA::ULong payload_length
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (CORBA::Environment &ACE_TRY_ENV)
+  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp
index 3c74d4aa262..e515a0b11a4 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.cpp
+++ b/TAO/tests/AMI_Buffering/Client_Task.cpp
@@ -23,14 +23,14 @@ int
 Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       while (1)
         {
           // run the even loop for 1 second...
           ACE_Time_Value tv (1, 0);
-          this->orb_->run (tv, ACE_TRY_ENV);
+          this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index e82471f58be..c07882c69ce 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -10,19 +10,19 @@ Reply_Handler::Reply_Handler (void)
 }
 
 void
-Reply_Handler::receive_data (CORBA::Environment &)
+Reply_Handler::receive_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_receive_data (ACE_TRY_ENV);
+      holder->raise_receive_data (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -34,19 +34,19 @@ Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holde
 }
 
 void
-Reply_Handler::sync (CORBA::Environment &)
+Reply_Handler::sync (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder,
-                           CORBA::Environment &ACE_TRY_ENV)
+Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_sync (ACE_TRY_ENV);
+      holder->raise_sync (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -58,19 +58,19 @@ Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder,
 }
 
 void
-Reply_Handler::shutdown (CORBA::Environment &)
+Reply_Handler::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Reply_Handler::shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder,
-                               CORBA::Environment &ACE_TRY_ENV)
+Reply_Handler::shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+                               TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_TRY_ENV);
+      holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index ee0d2665340..fe3b6df4fab 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -25,22 +25,22 @@ public:
   Reply_Handler (void);
 
   // = The skeleton methods
-  virtual void receive_data (CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_data (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder,
-                                   CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (CORBA::Environment &ACE_TRY_ENV)
+  virtual void sync (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder,
-                           CORBA::Environment &ACE_TRY_ENV)
+  virtual void sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 8f6e82d3b48..e9dc9dfbe62 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl);
 
       Test::AMI_Buffering_Admin_var AMI_buffering_admin =
-        AMI_buffering_admin_impl->_this (ACE_TRY_ENV);
+        AMI_buffering_admin_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (AMI_buffering_admin.in (), ACE_TRY_ENV);
+        orb->object_to_string (AMI_buffering_admin.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index f7d910eabf8..cc3efc9f4ab 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -88,25 +88,25 @@ parse_args (int argc, char *argv[])
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::AMI_Buffering_ptr ami_buffering,
-                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+                   TAO_ENV_ARG_DECL);
 int
 run_timeout (CORBA::ORB_ptr orb,
              Test::AMI_Buffering_ptr ami_buffering,
-             Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-             CORBA::Environment &ACE_TRY_ENV);
+             Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+             TAO_ENV_ARG_DECL);
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::AMI_Buffering_ptr oneway_buffering,
-                      Test::AMI_Buffering_Admin_ptr oneway_buffering_admin,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      Test::AMI_Buffering_Admin_ptr oneway_buffering_admin
+                      TAO_ENV_ARG_DECL);
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::AMI_Buffering_ptr ami_buffering,
-                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+                 TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
@@ -115,15 +115,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -132,21 +132,21 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(server_ior, ACE_TRY_ENV);
+        orb->string_to_object(server_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::AMI_Buffering_var ami_buffering =
-        Test::AMI_Buffering::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::AMI_Buffering::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ami_buffering.in ()))
@@ -158,11 +158,11 @@ main (int argc, char *argv[])
         }
 
       tmp =
-        orb->string_to_object(admin_ior, ACE_TRY_ENV);
+        orb->string_to_object(admin_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::AMI_Buffering_Admin_var ami_buffering_admin =
-        Test::AMI_Buffering_Admin::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::AMI_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ami_buffering_admin.in ()))
@@ -186,8 +186,8 @@ main (int argc, char *argv[])
           test_failed =
             run_message_count (orb.in (),
                                ami_buffering.in (),
-                               ami_buffering_admin.in (),
-                               ACE_TRY_ENV);
+                               ami_buffering_admin.in ()
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_test)
@@ -197,8 +197,8 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout (orb.in (),
                          ami_buffering.in (),
-                         ami_buffering_admin.in (),
-                         ACE_TRY_ENV);
+                         ami_buffering_admin.in ()
+                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_reactive_test)
@@ -208,8 +208,8 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout_reactive (orb.in (),
                                   ami_buffering.in (),
-                                  ami_buffering_admin.in (),
-                                  ACE_TRY_ENV);
+                                  ami_buffering_admin.in ()
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_buffer_size_test)
@@ -219,8 +219,8 @@ main (int argc, char *argv[])
           test_failed =
             run_buffer_size (orb.in (),
                              ami_buffering.in (),
-                             ami_buffering_admin.in (),
-                             ACE_TRY_ENV);
+                             ami_buffering_admin.in ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -233,16 +233,16 @@ main (int argc, char *argv[])
 
       client_task.thr_mgr ()->wait ();
 
-      ami_buffering->shutdown (ACE_TRY_ENV);
+      ami_buffering->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ami_buffering_admin->shutdown (ACE_TRY_ENV);
+      ami_buffering_admin->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -260,15 +260,15 @@ int
 configure_policies (CORBA::ORB_ptr orb,
                     const TAO::BufferingConstraint &buffering_constraint,
                     Test::AMI_Buffering_ptr ami_buffering,
-                    Test::AMI_Buffering_out flusher,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    Test::AMI_Buffering_out flusher
+                    TAO_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV);
+    orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+    CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (policy_current.in ()))
@@ -285,22 +285,22 @@ configure_policies (CORBA::ORB_ptr orb,
   CORBA::PolicyList policies (2); policies.length (2);
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        scope_as_any,
-                        ACE_TRY_ENV);
+                        scope_as_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   policies[1] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any,
-                        ACE_TRY_ENV);
+                        buffering_as_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (ACE_TRY_ENV);
+  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  policies[1]->destroy (ACE_TRY_ENV);
+  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO::BufferingConstraint flush_constraint;
@@ -313,21 +313,21 @@ configure_policies (CORBA::ORB_ptr orb,
   policies.length (1);
   policies[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any,
-                        ACE_TRY_ENV);
+                        buffering_as_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   object =
     ami_buffering->_set_policy_overrides (policies,
-                                             CORBA::ADD_OVERRIDE,
-                                             ACE_TRY_ENV);
+                                             CORBA::ADD_OVERRIDE
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (ACE_TRY_ENV);
+  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   flusher =
-    Test::AMI_Buffering::_narrow (object.in (), ACE_TRY_ENV);
+    Test::AMI_Buffering::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -335,18 +335,18 @@ configure_policies (CORBA::ORB_ptr orb,
 
 void
 sync_server (CORBA::ORB_ptr orb,
-             Test::AMI_Buffering_ptr flusher,
-             CORBA::Environment &ACE_TRY_ENV)
+             Test::AMI_Buffering_ptr flusher
+             TAO_ENV_ARG_DECL)
 {
   // Get back in sync with the server...
-  flusher->flush (ACE_TRY_ENV);
+  flusher->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  flusher->sync (ACE_TRY_ENV);
+  flusher->sync (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Drain responses from the queue
   ACE_Time_Value tv (0, 100000);
-  orb->run (tv, ACE_TRY_ENV);
+  orb->run (tv TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -355,18 +355,18 @@ run_liveness_test (CORBA::ORB_ptr orb,
                    Test::AMI_AMI_BufferingHandler_ptr reply_handler,
                    Test::AMI_Buffering_ptr ami_buffering,
                    Test::AMI_Buffering_ptr flusher,
-                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+                   TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n"));
   int test_failed = 0;
 
   // Get back in sync with the server...
-  sync_server (orb, flusher, ACE_TRY_ENV);
+  sync_server (orb, flusher TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count =
-    ami_buffering_admin->request_count (ACE_TRY_ENV);
+    ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int liveness_test_iterations = int(send_count);
@@ -380,13 +380,13 @@ run_liveness_test (CORBA::ORB_ptr orb,
   for (int i = 0; i != liveness_test_iterations; ++i)
     {
       ami_buffering->sendc_receive_data (reply_handler,
-                                         payload,
-                                         ACE_TRY_ENV);
+                                         payload
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       send_count++;
 
       CORBA::ULong receive_count =
-        ami_buffering_admin->request_count (ACE_TRY_ENV);
+        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // Once the system has sent enough messages we don't
@@ -404,13 +404,13 @@ run_liveness_test (CORBA::ORB_ptr orb,
                       "expected %u\n",
                       i, receive_count, expected));
 
-          sync_server (orb, flusher, ACE_TRY_ENV);
+          sync_server (orb, flusher TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
 
       if (depth++ == LIVENESS_MAX_DEPTH)
         {
-          sync_server (orb, flusher, ACE_TRY_ENV);
+          sync_server (orb, flusher TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           depth = 0;
@@ -423,8 +423,8 @@ run_liveness_test (CORBA::ORB_ptr orb,
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::AMI_Buffering_ptr ami_buffering,
-                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+                   TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT;
@@ -435,8 +435,8 @@ run_message_count (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        ami_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -454,17 +454,17 @@ run_message_count (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_TRY_ENV);
+    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in (), ACE_TRY_ENV);
+      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (ACE_TRY_ENV);
+        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -478,13 +478,13 @@ run_message_count (CORBA::ORB_ptr orb,
       while (1)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload,
-                                             ACE_TRY_ENV);
+                                             payload
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (ACE_TRY_ENV);
+            ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong iteration_count =
@@ -523,8 +523,8 @@ run_message_count (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin,
-                       ACE_TRY_ENV);
+                       ami_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -536,8 +536,8 @@ run_message_count (CORBA::ORB_ptr orb,
 int
 run_timeout (CORBA::ORB_ptr orb,
               Test::AMI_Buffering_ptr ami_buffering,
-              Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-              CORBA::Environment &ACE_TRY_ENV)
+              Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+              TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -548,8 +548,8 @@ run_timeout (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        ami_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -567,17 +567,17 @@ run_timeout (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_TRY_ENV);
+    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in (), ACE_TRY_ENV);
+      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (ACE_TRY_ENV);
+        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -592,13 +592,13 @@ run_timeout (CORBA::ORB_ptr orb,
       while (1)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload,
-                                             ACE_TRY_ENV);
+                                             payload
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (ACE_TRY_ENV);
+            ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -637,8 +637,8 @@ run_timeout (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin,
-                       ACE_TRY_ENV);
+                       ami_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -650,8 +650,8 @@ run_timeout (CORBA::ORB_ptr orb,
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::AMI_Buffering_ptr ami_buffering,
-                      Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+                      TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -662,8 +662,8 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        ami_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -681,17 +681,17 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_TRY_ENV);
+    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in (), ACE_TRY_ENV);
+      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (ACE_TRY_ENV);
+        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -706,19 +706,19 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
       for (int j = 0; j != 20; ++j)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload,
-                                             ACE_TRY_ENV);
+                                             payload
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
         }
       while (1)
         {
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (ACE_TRY_ENV);
+            ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value sleep (0, 10000);
-          orb->run (sleep, ACE_TRY_ENV);
+          orb->run (sleep TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -758,8 +758,8 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin,
-                       ACE_TRY_ENV);
+                       ami_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -773,8 +773,8 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::AMI_Buffering_ptr ami_buffering,
-                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 Test::AMI_Buffering_Admin_ptr ami_buffering_admin
+                 TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES;
@@ -785,8 +785,8 @@ run_buffer_size (CORBA::ORB_ptr orb,
   Test::AMI_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        ami_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        ami_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -802,17 +802,17 @@ run_buffer_size (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (ACE_TRY_ENV);
+    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong bytes_sent = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in (), ACE_TRY_ENV);
+      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_bytes_received =
-        ami_buffering_admin->bytes_received_count (ACE_TRY_ENV);
+        ami_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_bytes_received != bytes_sent)
@@ -826,13 +826,13 @@ run_buffer_size (CORBA::ORB_ptr orb,
       while (1)
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
-                                             payload,
-                                             ACE_TRY_ENV);
+                                             payload
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           bytes_sent += PAYLOAD_LENGTH;
 
           CORBA::ULong bytes_received =
-            ami_buffering_admin->bytes_received_count (ACE_TRY_ENV);
+            ami_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong payload_delta =
@@ -876,8 +876,8 @@ run_buffer_size (CORBA::ORB_ptr orb,
                        reply_handler.in (),
                        ami_buffering,
                        flusher.in (),
-                       ami_buffering_admin,
-                       ACE_TRY_ENV);
+                       ami_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index 17d74cb83b5..5403607d06d 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -18,19 +18,19 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile> "
-			   "-k <ior> "
+                           "-o <iorfile> "
+                           "-k <ior> "
                            "\n",
                            argv [0]),
                           -1);
@@ -45,15 +45,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -62,18 +62,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::AMI_Buffering_Admin_var admin =
-        Test::AMI_Buffering_Admin::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::AMI_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (admin.in ()))
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl);
 
       Test::AMI_Buffering_var AMI_buffering =
-        AMI_buffering_impl->_this (ACE_TRY_ENV);
+        AMI_buffering_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (AMI_buffering.in (), ACE_TRY_ENV);
+        orb->object_to_string (AMI_buffering.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -109,18 +109,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 4bdbefc4816..00c680e2009 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -65,22 +65,22 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeoutObj_var timeout_var =
-        TimeoutObj::_narrow (object.in (), ACE_TRY_ENV);
+        TimeoutObj::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (timeout_var.in ()))
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -103,21 +103,21 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this (ACE_TRY_ENV);
+        timeoutHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -130,19 +130,19 @@ main (int argc, char *argv[])
       client.activate ();
 
       // ORB loop.
-      orb->run (ACE_TRY_ENV);  // Fetch responses
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,  // ethernalize objects
-                         0, // wait for completion
-                         ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for all the threads to finish before destroying the
       // ORB.
       (void) client.thr_mgr ()->wait ();
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index 079b039edd2..c5185d188f0 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -56,15 +56,15 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -73,11 +73,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -86,11 +86,11 @@ main (int argc, char *argv[])
       Timeout_i timeout_i (orb.in ());
 
       TimeoutObj_var timeout_var =
-        timeout_i._this (ACE_TRY_ENV);
+        timeout_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (timeout_var.in (), ACE_TRY_ENV);
+        orb->object_to_string (timeout_var.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -108,14 +108,14 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this (ACE_TRY_ENV);
+        timeoutHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -128,18 +128,18 @@ main (int argc, char *argv[])
       client->activate ();
       */
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
-                         0, // wait for completion
-                         ACE_TRY_ENV);
+                         0  // wait for completion
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //delete client;
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index a21066e3ae9..a8b55d47f0b 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -44,7 +44,7 @@ TimeoutClient::svc ()
 {
   this->initialize ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
@@ -61,14 +61,14 @@ TimeoutClient::svc ()
       this->none_test ();
 
       // shut down remote ORB
-      timeoutObject_->shutdown (ACE_TRY_ENV);
+      timeoutObject_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw
       ACE_OS::sleep (tv);
 
       // shut down local ORB
-      orb_->shutdown (0, ACE_TRY_ENV);
+      orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -87,16 +87,16 @@ TimeoutClient::svc ()
 int
 TimeoutClient::initialize ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::Object_var object =
-        orb_->resolve_initial_references ("ORBPolicyManager",
-                                          ACE_TRY_ENV);
+        orb_->resolve_initial_references ("ORBPolicyManager"
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_manager_ =
-        CORBA::PolicyManager::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -131,7 +131,7 @@ TimeoutClient::send (CORBA::Boolean async,
 
   CORBA::PolicyList policy_list (1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY_EX (normal)
     {
       if (local_timeout != 0)
@@ -144,21 +144,21 @@ TimeoutClient::send (CORBA::Boolean async,
           policy_list.length (1);
           policy_list[0] =
             orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                 any_orb,
-                                 ACE_TRY_ENV);
+                                 any_orb
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
 
           policy_manager_->set_policy_overrides (policy_list,
-                                                 CORBA::SET_OVERRIDE,
-                                                 ACE_TRY_ENV);
+                                                 CORBA::SET_OVERRIDE
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
         }
       else
         {
           policy_list.length (0);
           policy_manager_->set_policy_overrides (policy_list,
-                                                 CORBA::SET_OVERRIDE,
-                                                 ACE_TRY_ENV);
+                                                 CORBA::SET_OVERRIDE
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
         }
 
@@ -169,13 +169,13 @@ TimeoutClient::send (CORBA::Boolean async,
       if (async)
         {
           timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (),
-                                                remote_sleep,
-                                                ACE_TRY_ENV);
+                                                remote_sleep
+                                                TAO_ENV_ARG_PARAMETER);
         }
       else // synch
         {
-          timeoutObject_->sendTimeToWait (remote_sleep,
-                                          ACE_TRY_ENV);
+          timeoutObject_->sendTimeToWait (remote_sleep
+                                          TAO_ENV_ARG_PARAMETER);
         }
       ACE_TRY_CHECK_EX (normal);
     }
@@ -196,7 +196,7 @@ TimeoutClient::send (CORBA::Boolean async,
     {
       if (local_timeout != 0)
         {
-          policy_list[0]->destroy (ACE_TRY_ENV);
+          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (cleanup);
         }
     }
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index 0d7e432d147..45727ec7e6f 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -29,8 +29,8 @@ Timeout_i::~Timeout_i ()
 }
 
 void
-Timeout_i::sendTimeToWait (CORBA::Long msec,
-                           CORBA::Environment &)
+Timeout_i::sendTimeToWait (CORBA::Long msec
+                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG,
@@ -48,7 +48,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec,
 }
 
 void
-Timeout_i::shutdown (CORBA::Environment &)
+Timeout_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   orb_->shutdown ();
@@ -72,7 +72,7 @@ TimeoutHandler_i::~TimeoutHandler_i ()
 }
 
 void
-TimeoutHandler_i::sendTimeToWait (CORBA::Environment &)
+TimeoutHandler_i::sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -82,15 +82,15 @@ TimeoutHandler_i::sendTimeToWait (CORBA::Environment &)
 }
 
 void
-TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutObjExceptionHolder *excep_holder,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutObjExceptionHolder *excep_holder
+                                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   timer_.stop ();
 
   ACE_TRY
     {
-      excep_holder->raise_sendTimeToWait (ACE_TRY_ENV);
+      excep_holder->raise_sendTimeToWait (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TIMEOUT, timeout)
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index 65fe528ca2a..0b2742dac01 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -32,11 +32,11 @@ public:
 
   ~Timeout_i ();
 
-  virtual void sendTimeToWait (CORBA::Long msec,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void sendTimeToWait (CORBA::Long msec
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -52,12 +52,12 @@ public:
 
   ~TimeoutHandler_i ();
 
-  virtual void sendTimeToWait (CORBA::Environment &ACE_TRY_ENV)
+  virtual void sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void sendTimeToWait_excep (
-      AMI_TimeoutObjExceptionHolder * excep_holder,
-      CORBA::Environment &ACE_TRY_ENV)
+      AMI_TimeoutObjExceptionHolder * excep_holder
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void reset_reply_counter ();
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index 84c252190bc..cdc63d41f5e 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -44,11 +44,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,11 +57,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the childPOA to be created.
@@ -72,8 +72,8 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol,
-                            ACE_TRY_ENV);
+                            pol
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -82,8 +82,8 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -91,22 +91,22 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -121,17 +121,17 @@ main (int argc, char *argv[])
       Callback_i callback_impl (orb.in ());
 
       Callback_var callback =
-        callback_impl._this (ACE_TRY_ENV);
+        callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Send the calback object to the server
-      server->callback_object (callback.in (),
-                               ACE_TRY_ENV);
+      server->callback_object (callback.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
-        server->test_method (1, ACE_TRY_ENV);
+        server->test_method (1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r != 0)
@@ -141,17 +141,17 @@ main (int argc, char *argv[])
                       r));
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index 0999d896458..17934fa1b42 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -44,11 +44,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,11 +57,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the childPOA to be created.
@@ -72,8 +72,8 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol,
-                            ACE_TRY_ENV);
+                            pol
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -82,8 +82,8 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -91,11 +91,11 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -108,17 +108,17 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          &server_impl,
-                                          ACE_TRY_ENV);
+                                          &server_impl
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in (),
-                                    ACE_TRY_ENV);
+        child_poa->id_to_reference (id.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in (), ACE_TRY_ENV);
+        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -141,27 +141,27 @@ main (int argc, char *argv[])
         {
           // Please see the README file on why this is being done
           CORBA::Boolean pending =
-            orb->work_pending(ACE_TRY_ENV);
+            orb->work_pending(TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (pending)
             {
-              orb->perform_work(ACE_TRY_ENV);
+              orb->perform_work(TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          retval = server_impl.call_client (ACE_TRY_ENV);
+          retval = server_impl.call_client (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 09776957239..e0afb927c2c 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -14,15 +14,15 @@
 ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
-Callback_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Callback_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Callback_i::callback_method (CORBA::Environment & /*ACE_TRY_ENV*/)
+Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -33,8 +33,8 @@ Callback_i::callback_method (CORBA::Environment & /*ACE_TRY_ENV*/)
 // ****************************************************************
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Boolean do_callback,
-                              CORBA::Environment& )
+Simple_Server_i::test_method (CORBA::Boolean do_callback
+                              TAO_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -46,8 +46,8 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
 }
 
 void
-Simple_Server_i::callback_object (Callback_ptr callback,
-                                  CORBA::Environment& )
+Simple_Server_i::callback_object (Callback_ptr callback
+                                  TAO_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -55,13 +55,13 @@ Simple_Server_i::callback_object (Callback_ptr callback,
 }
 
 int
-Simple_Server_i::call_client (CORBA::Environment &ACE_TRY_ENV)
+Simple_Server_i::call_client (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (this->flag_)
     {
       for (int times = 0; times < this->no_iterations_; ++times)
         {
-          this->callback_->callback_method (ACE_TRY_ENV);
+          this->callback_->callback_method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
@@ -73,7 +73,7 @@ Simple_Server_i::call_client (CORBA::Environment &ACE_TRY_ENV)
             }
         }
 
-      this->callback_->shutdown (ACE_TRY_ENV);
+      this->callback_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       this->flag_ = 0;
 
@@ -85,8 +85,8 @@ Simple_Server_i::call_client (CORBA::Environment &ACE_TRY_ENV)
 
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h
index 3ae9010bbcd..6dbdd7c79a5 100644
--- a/TAO/tests/BiDirectional/test_i.h
+++ b/TAO/tests/BiDirectional/test_i.h
@@ -31,11 +31,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (CORBA::Environment &ACE_TRY_ENV)
+  void callback_method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -58,18 +58,18 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback,
-                           CORBA::Environment&)
+  CORBA::Long test_method (CORBA::Boolean do_callback
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback,
-                        CORBA::Environment&)
+  void callback_object (Callback_ptr callback
+                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  int call_client (CORBA::Environment&);
+  int call_client (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 4bf70bbfd06..2fed8b8707f 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -45,11 +45,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -58,11 +58,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the childPOA to be created.
@@ -73,8 +73,8 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol,
-                            ACE_TRY_ENV);
+                            pol
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -83,8 +83,8 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -92,22 +92,22 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -120,24 +120,24 @@ main (int argc, char *argv[])
 
       Callback_i *callback_impl = 0;
       ACE_NEW_THROW_EX (callback_impl,
-			Callback_i (orb.in ()),
-			CORBA::NO_MEMORY ());
-      
+                        Callback_i (orb.in ()),
+                        CORBA::NO_MEMORY ());
+
       PortableServer::ServantBase_var owner_transfer(callback_impl);
-      
+
       Callback_var callback =
-        callback_impl->_this (ACE_TRY_ENV);
+        callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // Send the calback object to the server
-      server->callback_object (callback.in (),
-                               ACE_TRY_ENV);
+      server->callback_object (callback.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Call the client that will make remote calls
 
       CORBA::Long r =
-        server->test_method (1, ACE_TRY_ENV);
+        server->test_method (1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r != 0)
@@ -148,17 +148,17 @@ main (int argc, char *argv[])
         }
 
       // Shtdown the server
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index 6556f3526ad..9b7753566de 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -44,11 +44,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,11 +57,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the childPOA to be created.
@@ -72,8 +72,8 @@ main (int argc, char *argv[])
       pol <<= BiDirPolicy::BOTH;
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol,
-                            ACE_TRY_ENV);
+                            pol
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -82,8 +82,8 @@ main (int argc, char *argv[])
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -91,39 +91,39 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
-      
+
       Simple_Server_i *server_impl = 0;
-      
+
       ACE_NEW_THROW_EX (server_impl,
-			Simple_Server_i (orb.in (),
-					 no_iterations), 
-			CORBA::NO_MEMORY ());
+                        Simple_Server_i (orb.in (),
+                                         no_iterations),
+                        CORBA::NO_MEMORY ());
 
       PortableServer::ServantBase_var owner_transfer (server_impl);
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("simple_server");
 
       child_poa->activate_object_with_id (id.in (),
-                                          server_impl,
-                                          ACE_TRY_ENV);
+                                          server_impl
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in (),
-                                    ACE_TRY_ENV);
+        child_poa->id_to_reference (id.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in (), ACE_TRY_ENV);
+        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -142,18 +142,18 @@ main (int argc, char *argv[])
         }
 
       // Run the event loop
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index f7476d946df..04289ca3616 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -13,15 +13,15 @@
 ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
 
 void
-Callback_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Callback_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Callback_i::callback_method (CORBA::Environment & /*ACE_TRY_ENV*/)
+Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -32,8 +32,8 @@ Callback_i::callback_method (CORBA::Environment & /*ACE_TRY_ENV*/)
 // ****************************************************************
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Boolean do_callback,
-                              CORBA::Environment &ACE_TRY_ENV)
+Simple_Server_i::test_method (CORBA::Boolean do_callback
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -46,7 +46,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
            times < this->no_iterations_;
            ++times)
         {
-          this->callback_->callback_method (ACE_TRY_ENV);
+          this->callback_->callback_method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
@@ -63,8 +63,8 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
 }
 
 void
-Simple_Server_i::callback_object (Callback_ptr callback,
-                                  CORBA::Environment& )
+Simple_Server_i::callback_object (Callback_ptr callback
+                                  TAO_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -73,8 +73,8 @@ Simple_Server_i::callback_object (Callback_ptr callback,
 
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
index 404dc8ef610..f8424b7272f 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
@@ -19,7 +19,7 @@
 #include "testS.h"
 
 class Callback_i : public virtual POA_Callback,
-		   public virtual PortableServer::RefCountServantBase
+                   public virtual PortableServer::RefCountServantBase
 {
   // = TITLE
   //   A callback object to the "client"
@@ -32,11 +32,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (CORBA::Environment &ACE_TRY_ENV)
+  void callback_method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -46,7 +46,7 @@ private:
 };
 
 class Simple_Server_i : public virtual POA_Simple_Server,
-			public virtual PortableServer::RefCountServantBase
+                        public virtual PortableServer::RefCountServantBase
 {
   // = TITLE
   //   Simpler Server implementation
@@ -59,15 +59,15 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback,
-                           CORBA::Environment&)
+  CORBA::Long test_method (CORBA::Boolean do_callback
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void callback_object (Callback_ptr callback,
-                        CORBA::Environment&)
+  void callback_object (Callback_ptr callback
+                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 52fa351d814..60a43593f69 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -29,8 +29,8 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                                   CORBA::ULong payload_size,
                                   CORBA::ULong thread_count,
                                   CORBA::ULong message_count,
-                                  Test::Session_List &session_list,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  Test::Session_List &session_list
+                                  TAO_ENV_ARG_DECL)
 {
   session_list.length (this->peer_count_);
   CORBA::ULong count = 0;
@@ -43,14 +43,14 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                               payload_size,
                               thread_count,
                               message_count,
-                              this->peer_count_,
-                              ACE_TRY_ENV);
+                              this->peer_count_
+                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV)
+Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
@@ -58,7 +58,7 @@ Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV)
     {
       ACE_TRY
         {
-          (*i)->shutdown (ACE_TRY_ENV);
+          (*i)->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -71,8 +71,8 @@ Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Coordinator::add_peer (Test::Peer_ptr peer,
-                       CORBA::Environment &)
+Coordinator::add_peer (Test::Peer_ptr peer
+                       TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index e754658f952..48f5180eb78 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -35,15 +35,15 @@ public:
                             CORBA::ULong payload_size,
                             CORBA::ULong thread_count,
                             CORBA::ULong message_count,
-                            Test::Session_List &session_list,
-                            CORBA::Environment &ACE_TRY_ENV);
+                            Test::Session_List &session_list
+                            TAO_ENV_ARG_DECL);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL);
 
   // = The skeleton methods
-  virtual void add_peer (Test::Peer_ptr peer,
-                         CORBA::Environment &ACE_TRY_ENV)
+  virtual void add_peer (Test::Peer_ptr peer
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index e5cf894acba..c4bd8a20639 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -20,8 +20,8 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong payload_size,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
-                      CORBA::ULong peer_count,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::ULong peer_count
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl;
@@ -35,11 +35,11 @@ Peer::create_session (Test::Session_Control_ptr control,
   ACE_CHECK_RETURN (Test::Session::_nil ());
   PortableServer::ServantBase_var transfer_ownership (session_impl);
 
-  return session_impl->_this (ACE_TRY_ENV);
+  return session_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Peer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,5 +47,5 @@ Peer::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, shutting down ORB\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index ed34b0eb6fa..41ab681be6f 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -32,10 +32,10 @@ public:
                                             CORBA::ULong payload_size,
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
-                                            CORBA::ULong peer_count,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::ULong peer_count
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index ea0c7b62789..dc1ed674ba4 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -36,7 +36,7 @@ Session::svc (void)
   /// thread
   PortableServer::ServantBase_var auto_decrement (this);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -53,7 +53,7 @@ Session::svc (void)
       CORBA::ULong session_count =
         this->other_sessions_.length ();
 
-      this->validate_connections (ACE_TRY_ENV);
+      this->validate_connections (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i != this->message_count_; ++i)
@@ -69,8 +69,8 @@ Session::svc (void)
 #endif /* 0 */
           for (CORBA::ULong j = 0; j != session_count; ++j)
             {
-              this->other_sessions_[j]->receive_payload (payload,
-                                                         ACE_TRY_ENV);
+              this->other_sessions_[j]->receive_payload (payload
+                                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -83,7 +83,7 @@ Session::svc (void)
             return 0;
           }
       }
-      this->terminate (1, ACE_TRY_ENV);
+      this->terminate (1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -97,7 +97,7 @@ Session::svc (void)
 }
 
 void
-Session::validate_connections (CORBA::Environment &ACE_TRY_ENV)
+Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong session_count =
     this->other_sessions_.length ();
@@ -107,7 +107,7 @@ Session::validate_connections (CORBA::Environment &ACE_TRY_ENV)
         {
           ACE_TRY
             {
-              this->other_sessions_[j]->ping (ACE_TRY_ENV);
+              this->other_sessions_[j]->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY {} ACE_ENDTRY;
@@ -116,8 +116,8 @@ Session::validate_connections (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Session::start (const Test::Session_List &other_sessions,
-                CORBA::Environment &ACE_TRY_ENV)
+Session::start (const Test::Session_List &other_sessions
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Already_Running,
                    Test::No_Peers))
@@ -138,12 +138,12 @@ Session::start (const Test::Session_List &other_sessions,
         // access to this object....
         ACE_TRY
           {
-            this->_add_ref (ACE_TRY_ENV);
+            this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (this->task_.activate (
                     THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
               {
-                this->_remove_ref (ACE_TRY_ENV);
+                this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
               }
             else
@@ -170,17 +170,17 @@ Session::start (const Test::Session_List &other_sessions,
   }
   /// None of the threads are running, this session is useless at
   /// this point, report the problem and destroy the local objects
-  this->terminate (0, ACE_TRY_ENV);
+  this->terminate (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Session::ping (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException))
+Session::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Session::receive_payload (const Test::Payload &the_payload,
-                          CORBA::Environment &ACE_TRY_ENV)
+Session::receive_payload (const Test::Payload &the_payload
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
@@ -217,23 +217,23 @@ Session::receive_payload (const Test::Payload &the_payload,
     if (this->more_work ())
       return;
   }
-  this->terminate (1, ACE_TRY_ENV);
+  this->terminate (1 TAO_ENV_ARG_PARAMETER);
 }
 
 
 void
-Session::destroy (CORBA::Environment &ACE_TRY_ENV)
+Session::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -249,15 +249,15 @@ Session::more_work (void) const
 }
 
 void
-Session::terminate (CORBA::Boolean success,
-                    CORBA::Environment &ACE_TRY_ENV)
+Session::terminate (CORBA::Boolean success
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   ACE_TRY_EX(GLOBAL)
     {
-      this->control_->session_finished (success,
-                                        ACE_TRY_ENV);
+      this->control_->session_finished (success
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GLOBAL);
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 021da78a550..62dcd896fa5 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -36,27 +36,27 @@ public:
   int svc (void);
 
   // = The skeleton methods
-  virtual void start (const Test::Session_List &other_sessions,
-                      CORBA::Environment &ACE_TRY_ENV)
+  virtual void start (const Test::Session_List &other_sessions
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Already_Running,
                      Test::No_Peers));
 
-  virtual void ping (CORBA::Environment &)
+  virtual void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void receive_payload (const Test::Payload &the_payload,
-                                CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_payload (const Test::Payload &the_payload
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
-  void terminate (CORBA::Boolean success,
-                  CORBA::Environment &ACE_TRY_ENV)
+  void terminate (CORBA::Boolean success
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
   /// Return 1 if all the work in this session has been completed
@@ -64,7 +64,7 @@ private:
 
   /// Make sure that all threads have connections avaiable to the
   /// other sessions.
-  void validate_connections (CORBA::Environment &ACE_TRY_ENV);
+  void validate_connections (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index f0f5c3bd4b4..62a77e985b3 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -41,8 +41,8 @@ Session_Control::~Session_Control (void)
 }
 
 void
-Session_Control::session_finished (CORBA::Boolean success,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Session_Control::session_finished (CORBA::Boolean success
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -63,12 +63,12 @@ Session_Control::session_finished (CORBA::Boolean success,
   if (session_count_ == 0)
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 09c19dbaaba..3f3dfcab3f9 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -34,8 +34,8 @@ public:
   int all_sessions_finished (void) const;
 
   // = The skeleton methods
-  virtual void session_finished (CORBA::Boolean success,
-                                 CORBA::Environment &ACE_TRY_ENV)
+  virtual void session_finished (CORBA::Boolean success
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index 20c6f6900df..2bf4fc0ca25 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -40,15 +40,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,18 +57,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Coordinator_var coordinator =
-        Test::Coordinator::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Coordinator::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -86,24 +86,24 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
       Test::Peer_var peer =
-        peer_impl->_this (ACE_TRY_ENV);
+        peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coordinator->add_peer (peer.in (), ACE_TRY_ENV);
+      coordinator->add_peer (peer.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for all the threads.
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 9de3f84deba..0287285b12b 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -64,15 +64,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -81,7 +81,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl);
 
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this (ACE_TRY_ENV);
+        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in (), ACE_TRY_ENV);
+        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . "));
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
            ++i)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl);
 
       Test::Session_Control_var session_control =
-        session_control_impl->_this (ACE_TRY_ENV);
+        session_control_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Session_List session_list;
@@ -147,8 +147,8 @@ main (int argc, char *argv[])
                                              payload_size,
                                              thread_count,
                                              message_count,
-                                             session_list,
-                                             ACE_TRY_ENV);
+                                             session_list
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (session_list.length () == peer_count);
@@ -168,8 +168,8 @@ main (int argc, char *argv[])
                 Test::Session::_duplicate (session_list[k]);
             }
 
-          session_list[j]->start (other_sessions,
-                                  ACE_TRY_ENV);
+          session_list[j]->start (other_sessions
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
            ++k)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -195,18 +195,18 @@ main (int argc, char *argv[])
 
       for (j = 0; j != peer_count; ++j)
         {
-          session_list[j]->destroy (ACE_TRY_ENV);
+          session_list[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
 
-      coordinator_impl->shutdown_all_peers (ACE_TRY_ENV);
+      coordinator_impl->shutdown_all_peers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 69777719ff9..c4b67da432f 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -38,18 +38,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Big_Reply_var reply_gen =
-        Test::Big_Reply::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Big_Reply::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (reply_gen.in ()))
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n"));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index 2fa6ba4ea5a..71ac4df2afb 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -43,11 +43,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -56,11 +56,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -78,12 +78,12 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen);
 
       Test::Big_Reply_var big_reply =
-        big_reply_gen->_this (ACE_TRY_ENV);
+        big_reply_gen->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (big_reply.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (big_reply.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -96,19 +96,19 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run ();
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index 0ce80749e44..399aa4e0e41 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -30,18 +30,18 @@ Client_Task::svc (void)
   for (CORBA::ULong j = 0; j != payload.length (); ++j)
     payload[j] = (j % 256);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any scope_as_any;
@@ -52,18 +52,18 @@ Client_Task::svc (void)
       policy_list.length (1);
       policy_list[0] =
         this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                                   scope_as_any,
-                                   ACE_TRY_ENV);
+                                   scope_as_any
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::ADD_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::ADD_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->event_count_; ++i)
         {
-          this->payload_receiver_->more_data (payload, ACE_TRY_ENV);
+          this->payload_receiver_->more_data (payload TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -76,13 +76,13 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->payload_receiver_->get_message_count (ACE_TRY_ENV);
+          (void) this->payload_receiver_->get_message_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index a4179b53960..86d6c47f73d 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -12,8 +12,8 @@ Payload_Receiver::Payload_Receiver (void)
 }
 
 void
-Payload_Receiver::more_data (const Test::Payload &payload,
-                             CORBA::Environment &)
+Payload_Receiver::more_data (const Test::Payload &payload
+                             TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->message_count_++;
@@ -21,7 +21,7 @@ Payload_Receiver::more_data (const Test::Payload &payload,
 }
 
 CORBA::Long
-Payload_Receiver::get_message_count (CORBA::Environment &)
+Payload_Receiver::get_message_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->message_count_;
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index 73787c62451..4675c2e2b30 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -28,10 +28,10 @@ public:
   Payload_Receiver (void);
 
   // = The skeleton methods
-  virtual void more_data (const Test::Payload &payload,
-                          CORBA::Environment &ACE_TRY_ENV)
+  virtual void more_data (const Test::Payload &payload
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Long get_message_count (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::Long get_message_count (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index d6c0682c6eb..47e29b9544d 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -18,13 +18,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior>"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,18 +39,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Payload_Receiver_var payload_receiver =
-        Test::Payload_Receiver::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Payload_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (payload_receiver.in ()))
@@ -96,20 +96,20 @@ main (int argc, char *argv[])
         }
 
       ACE_Time_Value tv (120, 0);
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Thread_Manager::instance ()->wait ();
       ACE_DEBUG ((LM_DEBUG, "(%P) Threads finished\n"));
 
       CORBA::Long count =
-        payload_receiver->get_message_count (ACE_TRY_ENV);
+        payload_receiver->get_message_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P) - Payload_Receiver got %d messages\n",
                   count));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index fb64629eb8d..bda9db4e71d 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
       Test::Payload_Receiver_var payload_receiver =
-        payload_receiver_impl->_this (ACE_TRY_ENV);
+        payload_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (payload_receiver.in (), ACE_TRY_ENV);
+        orb->object_to_string (payload_receiver.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -81,23 +81,23 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (240, 0);
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index 52fa351d814..60a43593f69 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -29,8 +29,8 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                                   CORBA::ULong payload_size,
                                   CORBA::ULong thread_count,
                                   CORBA::ULong message_count,
-                                  Test::Session_List &session_list,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  Test::Session_List &session_list
+                                  TAO_ENV_ARG_DECL)
 {
   session_list.length (this->peer_count_);
   CORBA::ULong count = 0;
@@ -43,14 +43,14 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                               payload_size,
                               thread_count,
                               message_count,
-                              this->peer_count_,
-                              ACE_TRY_ENV);
+                              this->peer_count_
+                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV)
+Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
@@ -58,7 +58,7 @@ Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV)
     {
       ACE_TRY
         {
-          (*i)->shutdown (ACE_TRY_ENV);
+          (*i)->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -71,8 +71,8 @@ Coordinator::shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Coordinator::add_peer (Test::Peer_ptr peer,
-                       CORBA::Environment &)
+Coordinator::add_peer (Test::Peer_ptr peer
+                       TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index e754658f952..48f5180eb78 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -35,15 +35,15 @@ public:
                             CORBA::ULong payload_size,
                             CORBA::ULong thread_count,
                             CORBA::ULong message_count,
-                            Test::Session_List &session_list,
-                            CORBA::Environment &ACE_TRY_ENV);
+                            Test::Session_List &session_list
+                            TAO_ENV_ARG_DECL);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL);
 
   // = The skeleton methods
-  virtual void add_peer (Test::Peer_ptr peer,
-                         CORBA::Environment &ACE_TRY_ENV)
+  virtual void add_peer (Test::Peer_ptr peer
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index e5cf894acba..c4bd8a20639 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -20,8 +20,8 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong payload_size,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
-                      CORBA::ULong peer_count,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::ULong peer_count
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl;
@@ -35,11 +35,11 @@ Peer::create_session (Test::Session_Control_ptr control,
   ACE_CHECK_RETURN (Test::Session::_nil ());
   PortableServer::ServantBase_var transfer_ownership (session_impl);
 
-  return session_impl->_this (ACE_TRY_ENV);
+  return session_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Peer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,5 +47,5 @@ Peer::shutdown (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, shutting down ORB\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index ed34b0eb6fa..41ab681be6f 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/Peer.h
@@ -32,10 +32,10 @@ public:
                                             CORBA::ULong payload_size,
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
-                                            CORBA::ULong peer_count,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::ULong peer_count
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index 2e176ce61f1..efe3afe001f 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -36,7 +36,7 @@ Session::svc (void)
   /// thread
   PortableServer::ServantBase_var auto_decrement (this);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -62,8 +62,8 @@ Session::svc (void)
           for (CORBA::ULong j = 0; j != session_count; ++j)
             {
               Test::Payload_var received =
-                this->other_sessions_[j]->echo_payload (payload,
-                                                        ACE_TRY_ENV);
+                this->other_sessions_[j]->echo_payload (payload
+                                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -76,7 +76,7 @@ Session::svc (void)
             return 0;
           }
       }
-      this->terminate (1, ACE_TRY_ENV);
+      this->terminate (1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -90,8 +90,8 @@ Session::svc (void)
 }
 
 void
-Session::start (const Test::Session_List &other_sessions,
-                CORBA::Environment &ACE_TRY_ENV)
+Session::start (const Test::Session_List &other_sessions
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Already_Running,
                    Test::No_Peers))
@@ -112,12 +112,12 @@ Session::start (const Test::Session_List &other_sessions,
         // access to this object....
         ACE_TRY
           {
-            this->_add_ref (ACE_TRY_ENV);
+            this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (this->task_.activate (
                     THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
               {
-                this->_remove_ref (ACE_TRY_ENV);
+                this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
               }
             else
@@ -144,12 +144,12 @@ Session::start (const Test::Session_List &other_sessions,
   }
   /// None of the threads are running, this session is useless at
   /// this point, report the problem and destroy the local objects
-  this->terminate (0, ACE_TRY_ENV);
+  this->terminate (0 TAO_ENV_ARG_PARAMETER);
 }
 
 Test::Payload *
-Session::echo_payload (const Test::Payload &the_payload,
-                       CORBA::Environment &ACE_TRY_ENV)
+Session::echo_payload (const Test::Payload &the_payload
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
@@ -188,7 +188,7 @@ Session::echo_payload (const Test::Payload &the_payload,
     if (this->more_work ())
       return retval._retn ();
   }
-  this->terminate (1, ACE_TRY_ENV);
+  this->terminate (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
@@ -196,18 +196,18 @@ Session::echo_payload (const Test::Payload &the_payload,
 
 
 void
-Session::destroy (CORBA::Environment &ACE_TRY_ENV)
+Session::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -223,15 +223,15 @@ Session::more_work (void) const
 }
 
 void
-Session::terminate (CORBA::Boolean success,
-                    CORBA::Environment &ACE_TRY_ENV)
+Session::terminate (CORBA::Boolean success
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   ACE_TRY_EX(GLOBAL)
     {
-      this->control_->session_finished (success,
-                                        ACE_TRY_ENV);
+      this->control_->session_finished (success
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GLOBAL);
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 6f02a52f802..112165a85b2 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -36,24 +36,24 @@ public:
   int svc (void);
 
   // = The skeleton methods
-  virtual void start (const Test::Session_List &other_sessions,
-                      CORBA::Environment &ACE_TRY_ENV)
+  virtual void start (const Test::Session_List &other_sessions
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Already_Running,
                      Test::No_Peers));
 
-  virtual Test::Payload* echo_payload (const Test::Payload &the_payload,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Payload* echo_payload (const Test::Payload &the_payload
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV)
+  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
-  void terminate (CORBA::Boolean success,
-                  CORBA::Environment &ACE_TRY_ENV)
+  void terminate (CORBA::Boolean success
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
   /// Return 1 if all the work in this session has been completed
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index f0f5c3bd4b4..62a77e985b3 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -41,8 +41,8 @@ Session_Control::~Session_Control (void)
 }
 
 void
-Session_Control::session_finished (CORBA::Boolean success,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Session_Control::session_finished (CORBA::Boolean success
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -63,12 +63,12 @@ Session_Control::session_finished (CORBA::Boolean success,
   if (session_count_ == 0)
     {
       PortableServer::POA_var poa =
-        this->_default_POA (ACE_TRY_ENV);
+        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 09c19dbaaba..3f3dfcab3f9 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -34,8 +34,8 @@ public:
   int all_sessions_finished (void) const;
 
   // = The skeleton methods
-  virtual void session_finished (CORBA::Boolean success,
-                                 CORBA::Environment &ACE_TRY_ENV)
+  virtual void session_finished (CORBA::Boolean success
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index 20c6f6900df..2bf4fc0ca25 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/client.cpp
@@ -40,15 +40,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,18 +57,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Coordinator_var coordinator =
-        Test::Coordinator::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Coordinator::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -86,24 +86,24 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
       Test::Peer_var peer =
-        peer_impl->_this (ACE_TRY_ENV);
+        peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coordinator->add_peer (peer.in (), ACE_TRY_ENV);
+      coordinator->add_peer (peer.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for all the threads.
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 4a1b4d08252..daba45ad5cc 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -64,15 +64,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -81,7 +81,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl);
 
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this (ACE_TRY_ENV);
+        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in (), ACE_TRY_ENV);
+        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . "));
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
            ++i)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl);
 
       Test::Session_Control_var session_control =
-        session_control_impl->_this (ACE_TRY_ENV);
+        session_control_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Session_List session_list;
@@ -147,8 +147,8 @@ main (int argc, char *argv[])
                                              payload_size,
                                              thread_count,
                                              message_count,
-                                             session_list,
-                                             ACE_TRY_ENV);
+                                             session_list
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (session_list.length () == peer_count);
@@ -168,8 +168,8 @@ main (int argc, char *argv[])
                 Test::Session::_duplicate (session_list[k]);
             }
 
-          session_list[j]->start (other_sessions,
-                                  ACE_TRY_ENV);
+          session_list[j]->start (other_sessions
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
            ++k)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -195,18 +195,18 @@ main (int argc, char *argv[])
 
       for (j = 0; j != peer_count; ++j)
         {
-          session_list[j]->destroy (ACE_TRY_ENV);
+          session_list[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
 
-      coordinator_impl->shutdown_all_peers (ACE_TRY_ENV);
+      coordinator_impl->shutdown_all_peers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index 6c856fe1cab..80af10cfde4 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -12,8 +12,8 @@ Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb)
 
 void
 Blocking_Sync_None::slow_operation (const Test::Payload &,
-                                    CORBA::ULong sleep_microseconds,
-                                    CORBA::Environment &)
+                                    CORBA::ULong sleep_microseconds
+                                    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value sleep_time (0, sleep_microseconds);
@@ -21,8 +21,8 @@ Blocking_Sync_None::slow_operation (const Test::Payload &,
 }
 
 void
-Blocking_Sync_None::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Blocking_Sync_None::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index a7ac6065f56..8e970e76ee4 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -26,11 +26,11 @@ public:
 
   // = The skeleton methods
   virtual void slow_operation (const Test::Payload &the_payload,
-                               CORBA::ULong sleep_microseconds,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::ULong sleep_microseconds
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 72ac3fcc768..0a10da916d4 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -19,19 +19,19 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
-			   "-i <iterations> "
+                           "-k <ior> "
+                           "-i <iterations> "
                            "\n",
                            argv [0]),
                           -1);
@@ -46,18 +46,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        Test::Blocking_Sync_None::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Blocking_Sync_None::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (blocking_sync_none.in ()))
@@ -67,11 +67,11 @@ main (int argc, char *argv[])
                           1);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV);
+        orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (policy_current.in ()))
@@ -85,15 +85,15 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            scope_as_any,
-                            ACE_TRY_ENV);
+                            scope_as_any
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE,
-                                            ACE_TRY_ENV);
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[0]->destroy (ACE_TRY_ENV);
+      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const int payload_length = 65536;
@@ -110,8 +110,8 @@ main (int argc, char *argv[])
           ACE_Time_Value start = ACE_OS::gettimeofday ();
 
           blocking_sync_none->slow_operation (payload,
-                                              sleep_microseconds,
-                                              ACE_TRY_ENV);
+                                              sleep_microseconds
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday ();
@@ -123,10 +123,10 @@ main (int argc, char *argv[])
             }
         }
 
-      blocking_sync_none->shutdown (ACE_TRY_ENV);
+      blocking_sync_none->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (blocked_calls > iterations / 20)
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index cd20f410a85..87bed6de345 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl);
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        blocking_sync_none_impl->_this (ACE_TRY_ENV);
+        blocking_sync_none_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (blocking_sync_none.in (), ACE_TRY_ENV);
+        orb->object_to_string (blocking_sync_none.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,22 +82,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index b7b23188e72..6933e23c293 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -61,8 +61,6 @@ test_put (TAO_OutputCDR &cdr, CDR_Test_Types &test_types)
 {
   for (int i = 0; i < n; ++i)
     {
-      CORBA::Environment env;
-
       if (cdr.write_octet (test_types.o) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "write_octet[%d] failed\n",
@@ -113,8 +111,6 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
   CORBA::Long xl;
   CORBA::Any any;
 
-  CORBA::Environment env;
-
   for (int i = 0; i < n; ++i)
     {
       if (cdr.read_octet (xo) == 0)
@@ -216,8 +212,8 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Get_Opt get_opt (argc, argv, "dn:l:");
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 65b66e0ba66..c82887f6eae 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -32,8 +32,8 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       static const CORBA::TypeCode_ptr tcs[]=
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
         {
           CORBA::TypeCode_ptr tc = *i;
 
-          CORBA::TCKind k = tc->kind (ACE_TRY_ENV);
+          CORBA::TCKind k = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           switch (k)
@@ -116,10 +116,10 @@ main (int argc, char *argv[])
             case CORBA::tk_alias:
             case CORBA::tk_except:
               {
-                const char *id = tc->id (ACE_TRY_ENV);
+                const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
-                const char *name = tc->name (ACE_TRY_ENV);
+                const char *name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 CORBA::ULong length = 0;
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index 038663b416a..c1cb89ae728 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -14,7 +14,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (CORBA::Environment &)
+Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
@@ -27,8 +27,8 @@ Hello::get_string (CORBA::Environment &)
 }
 
 void
-Hello::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Hello::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index 5b5a1609a68..cfa57e4609b 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -45,18 +45,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Hello::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hello.in ()))
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_TRY_ENV);
+        hello->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
@@ -76,11 +76,11 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          hello->shutdown (ACE_TRY_ENV);
+          hello->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index 339a0d5ab71..37e44cc4c33 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_TRY_ENV);
+        hello_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (hello.in (), ACE_TRY_ENV);
+        orb->object_to_string (hello.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,22 +82,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index 89de1eb0279..f7135b2fab6 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -11,16 +11,16 @@ Process::Process (CORBA::ORB_ptr orb)
 }
 
 CORBA::Long
-Process::get_process_id (CORBA::Environment &)
+Process::get_process_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ACE_OS::getpid ();
 }
 
 void
-Process::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Process::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index cc58bd7ee74..48bfb96e6d7 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -20,7 +20,7 @@ Process_Factory::shutdown_received (void)
 }
 
 Test::Process_ptr
-Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
+Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed))
 {
   Startup_Callback *startup_callback_impl;
@@ -32,11 +32,11 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
   PortableServer::ServantBase_var owner_transfer(startup_callback_impl);
 
   Test::Startup_Callback_var startup_callback =
-    startup_callback_impl->_this (ACE_TRY_ENV);
+    startup_callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (Test::Process::_nil ());
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (startup_callback.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (startup_callback.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Test::Process::_nil ());
 
   const char* argv[3] = {
@@ -68,7 +68,7 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
   for (int i = 0; i != 500 && !process_has_started; ++i)
     {
       ACE_Time_Value interval (0, 10000);
-      this->orb_->perform_work (interval, ACE_TRY_ENV);
+      this->orb_->perform_work (interval TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Test::Process::_nil ());
 
       process_has_started =
@@ -78,12 +78,12 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        startup_callback_impl->_default_POA (ACE_TRY_ENV);
+        startup_callback_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (startup_callback_impl, ACE_TRY_ENV);
+        poa->servant_to_id (startup_callback_impl TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -104,15 +104,15 @@ Process_Factory::create_new_process (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Process_Factory::noop (CORBA::Environment &)
+Process_Factory::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Process_Factory::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Process_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->shutdown_received_ = 1;
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index 5b82a0586aa..6c55a96b5a0 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -22,8 +22,8 @@ Startup_Callback::process_has_started (Test::Process_out the_process)
 }
 
 void
-Startup_Callback::started (Test::Process_ptr process,
-                           CORBA::Environment &)
+Startup_Callback::started (Test::Process_ptr process
+                           TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index 51a83a8c39b..e5b6c619ef4 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_Callback.h
@@ -32,8 +32,8 @@ public:
   int process_has_started (Test::Process_out the_process);
 
   // = The skeleton methods
-  virtual void started (Test::Process_ptr the_process,
-                        CORBA::Environment &ACE_TRY_ENV)
+  virtual void started (Test::Process_ptr the_process
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index b0205868b58..b2d66aae41a 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -11,14 +11,14 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (argc < 2)
         {
           // Paranoia, we should have an auto_ptr-like gadget for
           // this.
-          orb->destroy (ACE_TRY_ENV);
+          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -27,10 +27,10 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (argv[1], ACE_TRY_ENV);
+        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Test::Startup_Callback_var startup_callback =
-        Test::Startup_Callback::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Startup_Callback::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (startup_callback.in ()))
         {
@@ -40,11 +40,11 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Process *process_impl;
@@ -63,23 +63,23 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(process_impl);
 
       Test::Process_var process =
-        process_impl->_this (ACE_TRY_ENV);
+        process_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      startup_callback->started (process.in (), ACE_TRY_ENV);
+      startup_callback->started (process.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (50, 0);
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index cd4765cd026..9366170a104 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -19,24 +19,24 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'n':
-	threads = ACE_OS::atoi (get_opts.optarg);
-	break;
+        threads = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
-			   "-i <iterations> "
-			   "-i <threads> "
+                           "-k <ior> "
+                           "-i <iterations> "
+                           "-i <threads> "
                            "\n",
                            argv [0]),
                           -1);
@@ -51,18 +51,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Process_Factory_var process_factory =
-        Test::Process_Factory::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Process_Factory::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (process_factory.in ()))
@@ -83,10 +83,10 @@ main (int argc, char *argv[])
         }
       ACE_Thread_Manager::instance ()->wait ();
 
-      process_factory->shutdown (ACE_TRY_ENV);
+      process_factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only pass the test if 90% of the calls worked
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index f6e61ccf181..185626ebe56 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -18,13 +18,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(process_factory_impl);
 
       Test::Process_Factory_var process =
-        process_factory_impl->_this (ACE_TRY_ENV);
+        process_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (process.in (), ACE_TRY_ENV);
+        orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,11 +82,11 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in (),
@@ -101,10 +101,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index d70e9172f54..29062b2a642 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -39,21 +39,21 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted)
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "my_orb", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "my_orb" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain a reference to the CodecFactory.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("CodecFactory",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("CodecFactory"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IOP::CodecFactory_var codec_factory =
-        IOP::CodecFactory::_narrow (obj.in (), ACE_TRY_ENV);
+        IOP::CodecFactory::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ----------------------------------------------------------
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
 
       // Obtain the CDR encapsulation Codec.
       IOP::Codec_var codec =
-        codec_factory->create_codec (encoding, ACE_TRY_ENV);
+        codec_factory->create_codec (encoding TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ----------------------------------------------------------
@@ -101,11 +101,11 @@ main (int argc, char *argv[])
 
       // Start out with the encode() method, i.e. the one that
       // includes the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode (data, ACE_TRY_ENV);
+      encoded_data = codec->encode (data TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Extract the data from the octet sequence.
-      decoded_data = codec->decode (encoded_data.in (), ACE_TRY_ENV);
+      decoded_data = codec->decode (encoded_data.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       decoded_data.in() >>= extracted_value;
@@ -127,13 +127,13 @@ main (int argc, char *argv[])
 
       // Now use the encode_value() method, i.e. the one that does
       // *not* include the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode_value (data, ACE_TRY_ENV);
+      encoded_data = codec->encode_value (data TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Extract the data from the octet sequence.
       decoded_data = codec->decode_value (encoded_data.in (),
-                                          Foo::_tc_Bar,
-                                          ACE_TRY_ENV);
+                                          Foo::_tc_Bar
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       decoded_data.in() >>= extracted_value;
diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp
index d27105582f2..d0e720b64a0 100644
--- a/TAO/tests/Collocation/Collocation.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -13,13 +13,13 @@ int main (int argc, char *argv[])
     {
       Collocation_Test coll_test;
 
-      coll_test.init (argc, argv, ACE_TRY_ENV);
+      coll_test.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coll_test.run (ACE_TRY_ENV);
+      coll_test.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coll_test.shutdown (ACE_TRY_ENV);
+      coll_test.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 7dba0e02c44..c179cc0c9dd 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -21,19 +21,19 @@ Collocation_Test::Collocation_Test (void)
 }
 
 void
-Collocation_Test::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Collocation_Test::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->root_poa_->destroy (1, 1, ACE_TRY_ENV);
+  this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->orb_->destroy (ACE_TRY_ENV);
+  this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
-Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
+Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL)
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int result = this->parse_args (argc, argv);
@@ -42,52 +42,52 @@ Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
-    PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+    PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POAManager of RootPOA
   this->poa_manager_ =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
+    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Activate the diamond servant and its base classes under RootPOA.
   PortableServer::ObjectId_var id =
-    this->root_poa_->activate_object (&this->top_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->top_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 //    // We only care about the most derived class here.
-//    this->diamond_obj_ = this->diamond_servant_._this (ACE_TRY_ENV);
+//    this->diamond_obj_ = this->diamond_servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 //    ACE_CHECK_RETURN (-1);
 
   id =
-    this->root_poa_->activate_object (&this->diamond_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->diamond_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We only care about the most derived class here.
-  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in (),
-                                                         ACE_TRY_ENV);
+  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
-    this->root_poa_->activate_object (&this->left_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->left_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
-    this->root_poa_->activate_object (&this->right_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->right_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (this->diamond_obj_.in (),
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (this->diamond_obj_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n",
@@ -106,37 +106,37 @@ Collocation_Test::parse_args (int /*argc*/,
 }
 
 int
-Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV)
+Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL)
 {
   Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Top::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Left::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Right::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Buttom::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::String_var str = top->shape (ACE_TRY_ENV);
+  CORBA::String_var str = top->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ()));
 
-  str = left->shape (ACE_TRY_ENV);
+  str = left->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ()));
 
-  str = right->shape (ACE_TRY_ENV);
+  str = right->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ()));
 
-  str = buttom->shape (ACE_TRY_ENV);
+  str = buttom->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ()));
 
@@ -144,12 +144,12 @@ Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Collocation_Test::run (CORBA::Environment &ACE_TRY_ENV)
+Collocation_Test::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
+  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->test_narrow (ACE_TRY_ENV);
+  this->test_narrow (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h
index 584710a098a..ee51d2fa1f0 100644
--- a/TAO/tests/Collocation/Collocation_Tester.h
+++ b/TAO/tests/Collocation/Collocation_Tester.h
@@ -29,19 +29,19 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
-  int init (int argc, char *argv[], CORBA::Environment &);
+  int init (int argc, char *argv[] TAO_ENV_ARG_DECL_NOT_USED);
   // Initializing the Collocation_Test object.
 
   int parse_args (int argc, char *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (CORBA::Environment &);
+  int test_narrow (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (CORBA::Environment &);
+  int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Run the test.
 
 private:
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index 81bfb90f63e..b253b9f4dbc 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -58,11 +58,11 @@ main (int argc, char *argv[])
             {
               iorfile = "file://" + iorfile;
               CORBA::Object_var tmp =
-                orb->string_to_object(iorfile.c_str (), ACE_TRY_ENV);
+                orb->string_to_object(iorfile.c_str () TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               test_var test =
-                test::_narrow(tmp.in (), ACE_TRY_ENV);
+                test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (test.in ()))
@@ -73,14 +73,14 @@ main (int argc, char *argv[])
                                     1);
                 }
 
-              test->send_stuff ("Some stuff to send", ACE_TRY_ENV);
+              test->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK
 
               // Test for LFU strategy.  The transport to any other
               // server should be removed before the first one.
               if (i == 0)
                 {
-                  test->send_stuff ("Some stuff to send", ACE_TRY_ENV);
+                  test->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK
 
                   holder = test;
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
                                 // removed.
                   if (!CORBA::is_nil(holder.in ()))
                     {
-                      holder->send_stuff ("Some stuff to send", ACE_TRY_ENV);
+                      holder->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK
                     }
                 }
@@ -102,10 +102,10 @@ main (int argc, char *argv[])
             }
         }
 
-      orb->shutdown (1, ACE_TRY_ENV);
+      orb->shutdown (1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index 9b66cb607e1..d8972b2362a 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -38,15 +38,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       test_var test =
-        test_impl->_this (ACE_TRY_ENV);
+        test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in (), ACE_TRY_ENV);
+        orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -85,19 +85,19 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
       delete test_impl;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp
index ad27e9ee1b1..9f69f9e1ec0 100644
--- a/TAO/tests/Connection_Purging/test_i.cpp
+++ b/TAO/tests/Connection_Purging/test_i.cpp
@@ -4,8 +4,8 @@
 #include "test_i.h"
 
 void
-test_i::send_stuff (const char* string,
-                  CORBA::Environment &)
+test_i::send_stuff (const char* string
+                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string));
diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h
index 40c180558ac..b862bd1e806 100644
--- a/TAO/tests/Connection_Purging/test_i.h
+++ b/TAO/tests/Connection_Purging/test_i.h
@@ -22,8 +22,8 @@ class test_i
 {
 public:
   // = The skeleton methods
-  virtual void send_stuff (const char* string,
-                           CORBA::Environment &ACE_TRY_ENV)
+  virtual void send_stuff (const char* string
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index 6db05eed05e..b689510cd8a 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -18,18 +18,18 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
+                           "-k <ior> "
                            "-i iterations "
                            "\n",
                            argv [0]),
@@ -40,12 +40,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-single_iteration (Test::Oneway_Receiver_ptr oneway_receiver,
-                  CORBA::Environment &ACE_TRY_ENV)
+single_iteration (Test::Oneway_Receiver_ptr oneway_receiver
+                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      oneway_receiver->receive_oneway (ACE_TRY_ENV);
+      oneway_receiver->receive_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_Time_Value tv (0, 40000);
       ACE_OS::sleep (tv);
@@ -64,18 +64,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Receiver_var oneway_receiver =
-        Test::Oneway_Receiver::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Oneway_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_receiver.in ()))
@@ -90,8 +90,8 @@ main (int argc, char *argv[])
       int exception_count = 0;
       for (int i = 0; i != iterations; ++i)
         {
-          int result = single_iteration (oneway_receiver.in (),
-                                         ACE_TRY_ENV);
+          int result = single_iteration (oneway_receiver.in ()
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (result)
             exception_count++;
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
       if (normal_count == 0)
         ACE_ERROR ((LM_ERROR, "ERROR: no request was succesful\n"));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index c6ccb281636..6fae627ce65 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -18,14 +18,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -40,15 +40,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this (ACE_TRY_ENV);
+        oneway_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (oneway_receiver.in (), ACE_TRY_ENV);
+        orb->object_to_string (oneway_receiver.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a separate thread to crash the server.
@@ -99,16 +99,16 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /*NOTREACHED*/
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index 3cfc1a048c4..69f2817c3ff 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -21,29 +21,29 @@ Service::dump_results (void)
 }
 
 void
-Service::run_test (Test::Crashed_Callback_ptr callback,
-                   CORBA::Environment &ACE_TRY_ENV)
+Service::run_test (Test::Crashed_Callback_ptr callback
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int pre_crash_exceptions =
-    this->call_are_you_there (callback, ACE_TRY_ENV);
+    this->call_are_you_there (callback TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   pre_crash_exceptions +=
-    this->call_test_oneway (callback, ACE_TRY_ENV);
+    this->call_test_oneway (callback TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) - Service, calling crash_now_please\n"));
-      callback->crash_now_please (ACE_TRY_ENV);
+      callback->crash_now_please (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
   int pos_crash_exceptions =
-    this->call_test_oneway (callback, ACE_TRY_ENV);
+    this->call_test_oneway (callback TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (pre_crash_exceptions != 0)
@@ -69,8 +69,8 @@ Service::run_test (Test::Crashed_Callback_ptr callback,
 }
 
 int
-Service::call_are_you_there (Test::Crashed_Callback_ptr callback,
-                             CORBA::Environment &ACE_TRY_ENV)
+Service::call_are_you_there (Test::Crashed_Callback_ptr callback
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n"));
@@ -81,7 +81,7 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback,
     {
       ACE_TRY
         {
-          (void) callback->are_you_there (ACE_TRY_ENV);
+          (void) callback->are_you_there (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -94,8 +94,8 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback,
 }
 
 int
-Service::call_test_oneway (Test::Crashed_Callback_ptr callback,
-                           CORBA::Environment &ACE_TRY_ENV)
+Service::call_test_oneway (Test::Crashed_Callback_ptr callback
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n"));
@@ -106,7 +106,7 @@ Service::call_test_oneway (Test::Crashed_Callback_ptr callback,
     {
       ACE_TRY
         {
-          (void) callback->test_oneway (ACE_TRY_ENV);
+          (void) callback->test_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index de738cf134f..8427d6d80fe 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -31,8 +31,8 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void run_test (Test::Crashed_Callback_ptr callback,
-                         CORBA::Environment &ACE_TRY_ENV)
+  virtual void run_test (Test::Crashed_Callback_ptr callback
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -40,16 +40,16 @@ private:
   /**
    * @return Number of exceptions raised
    */
-  int call_are_you_there (Test::Crashed_Callback_ptr callback,
-                          CORBA::Environment &ACE_TRY_ENV)
+  int call_are_you_there (Test::Crashed_Callback_ptr callback
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
   /// Call the test_oneway method mutiple times.
   /**
    * @return Number of exceptions raised
    */
-  int call_test_oneway (Test::Crashed_Callback_ptr callback,
-                        CORBA::Environment &ACE_TRY_ENV)
+  int call_test_oneway (Test::Crashed_Callback_ptr callback
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
 private:
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 8585107b75c..7f81e47e831 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -19,13 +19,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior>"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -40,15 +40,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -57,18 +57,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
-          orb->resolve_initial_references("ORBPolicyManager",
-                                          ACE_TRY_ENV);
+          orb->resolve_initial_references("ORBPolicyManager"
+                                          TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
         CORBA::PolicyManager_var policy_manager =
-          CORBA::PolicyManager::_narrow(manager_object.in(),
-                                        ACE_TRY_ENV);
+          CORBA::PolicyManager::_narrow(manager_object.in()
+                                        TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (policy_manager.in ()))
@@ -80,16 +80,16 @@ main (int argc, char *argv[])
         CORBA::PolicyList policies(1); policies.length(1);
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              policy_value,
-                              ACE_TRY_ENV);
+                              policy_value
+                              TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         policy_manager->set_policy_overrides (policies,
-                                              CORBA::ADD_OVERRIDE,
-                                              ACE_TRY_ENV);
+                                              CORBA::ADD_OVERRIDE
+                                              TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        policies[0]->destroy (ACE_TRY_ENV);
+        policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -97,11 +97,11 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Service_var service =
-        Test::Service::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (service.in ()))
@@ -119,22 +119,22 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(crashed_callback_impl);
 
       Test::Crashed_Callback_var crashed_callback =
-        crashed_callback_impl->_this (ACE_TRY_ENV);
+        crashed_callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      service->run_test (crashed_callback.in (), ACE_TRY_ENV);
+      service->run_test (crashed_callback.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 90650f28024..e0e2e637d72 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -19,13 +19,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -40,15 +40,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -57,18 +57,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_object =
-          orb->resolve_initial_references("ORBPolicyManager",
-                                          ACE_TRY_ENV);
+          orb->resolve_initial_references("ORBPolicyManager"
+                                          TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
         CORBA::PolicyManager_var policy_manager =
-          CORBA::PolicyManager::_narrow(manager_object.in(),
-                                        ACE_TRY_ENV);
+          CORBA::PolicyManager::_narrow(manager_object.in()
+                                        TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (policy_manager.in ()))
@@ -80,16 +80,16 @@ main (int argc, char *argv[])
         CORBA::PolicyList policies(1); policies.length(1);
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                              policy_value,
-                              ACE_TRY_ENV);
+                              policy_value
+                              TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         policy_manager->set_policy_overrides (policies,
-                                              CORBA::ADD_OVERRIDE,
-                                              ACE_TRY_ENV);
+                                              CORBA::ADD_OVERRIDE
+                                              TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        policies[0]->destroy (ACE_TRY_ENV);
+        policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -103,11 +103,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(service_impl);
 
       Test::Service_var service =
-        service_impl->_this (ACE_TRY_ENV);
+        service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (service.in (), ACE_TRY_ENV);
+        orb->object_to_string (service.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -116,25 +116,25 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (50, 0);
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
 
       service_impl->dump_results ();
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 34d22d0a5e4..cdc2bf8fa0d 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -63,7 +63,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
   // -----------------------------------------------------------------
   // Boilerplate CORBA/TAO client-side ORB initialization code.
   // -----------------------------------------------------------------
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Prepend a "dummy" program name argument to the Service
@@ -87,8 +87,8 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
       // Initialize the ORB.
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.get_buffer (),
-                                    "",
-                                    ACE_TRY_ENV);
+                                    ""
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->orb_.in ()))
@@ -98,11 +98,11 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var obj =
-        this->orb_->string_to_object (ior, ACE_TRY_ENV);
+        this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->test_ =
-        Test::_narrow (obj.in (), ACE_TRY_ENV);
+        Test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->test_.in ()))
@@ -139,13 +139,13 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
 int
 Test_Client_Module::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Make sure the ORB is destroyed.
       if (!CORBA::is_nil (this->orb_.in ()))
         {
-          this->orb_->destroy (ACE_TRY_ENV);
+          this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -184,15 +184,15 @@ Test_Client_Module::fini (void)
 int
 Test_Client_Module::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Invoke an operation on the Test object.
-      this->test_->invoke_me (ACE_TRY_ENV);
+      this->test_->invoke_me (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Shutdown the remote ORB.
-      this->test_->shutdown (ACE_TRY_ENV);
+      this->test_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index 58166838b78..5f47b6cb1ce 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -63,7 +63,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
   // -----------------------------------------------------------------
   // Boilerplate CORBA/TAO server-side ORB initialization code.
   // -----------------------------------------------------------------
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Add one to the new argc since "dummy" is being added to the
@@ -87,15 +87,15 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
       // Initialize the ORB.
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.get_buffer (),
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->orb_.in ()))
         return -1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -104,23 +104,23 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
                           1);
 
       this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->poa_manager_ = this->poa_->the_POAManager (ACE_TRY_ENV);
+      this->poa_manager_ = this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->poa_manager_->activate (ACE_TRY_ENV);
+      this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (new_argc, new_argv.get_buffer ()) != 0)
         return -1;
 
-      CORBA::Object_var obj = this->servant_._this (ACE_TRY_ENV);
+      CORBA::Object_var obj = this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (obj.in (), ACE_TRY_ENV);
+        this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -165,13 +165,13 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
 int
 Test_Server_Module::fini (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Make sure the ORB is destroyed.
       if (!CORBA::is_nil (this->orb_.in ()))
         {
-          this->orb_->destroy (ACE_TRY_ENV);
+          this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -201,11 +201,11 @@ Test_Server_Module::fini (void)
 int
 Test_Server_Module::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Run the ORB event loop in its own thread.
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index a385bba01e1..f5ee66fd980 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -12,7 +12,7 @@ Test_i::Test_i (void)
 }
 
 void
-Test_i::invoke_me (CORBA::Environment & /* ACE_TRY_ENV */)
+Test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
@@ -20,14 +20,14 @@ Test_i::invoke_me (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 void
-Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
 
   if (!CORBA::is_nil (this->orb_.in ()))
-    this->orb_->shutdown (0, ACE_TRY_ENV);
+    this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 34b2d1be516..b90a0724f11 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -95,12 +95,12 @@ main (int argc, char *argv[])
 
       if (test_user_exception == 1)
         {
-          server->raise_user_exception (ACE_TRY_ENV);
+          server->raise_user_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (test_system_exception == 1)
         {
-          server->raise_system_exception (ACE_TRY_ENV);
+          server->raise_system_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -116,8 +116,8 @@ main (int argc, char *argv[])
                 server->test_method (i,
                                      the_in_structure,
                                      the_out_structure.out (),
-                                     name.inout (),
-                                     ACE_TRY_ENV);
+                                     name.inout ()
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (TAO_debug_level > 0)
@@ -145,7 +145,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 8c639fcc85b..2dbe2dad28d 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -33,8 +33,8 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'o':
-	      ior_output_file = get_opts.optarg;
-	      break;
+              ior_output_file = get_opts.optarg;
+              break;
 
       case '?':
       default:
@@ -43,7 +43,7 @@ parse_args (int argc, char *argv[])
                            "-x "
                            "-k <ior> "
                            "-i <niterations> "
-			                     "-o <iorfile> "
+                                             "-o <iorfile> "
                            "\n",
                            argv [0]),
                           -1);
@@ -59,11 +59,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -74,14 +74,14 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -90,46 +90,46 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DSI_Simple_Server server_impl (orb.in (),
                                      object.in (),
                                      root_poa.in ());
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (&server_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (&server_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
-        root_poa->id_to_reference (oid.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (oid.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	      orb->object_to_string (server.in (), ACE_TRY_ENV);
+              orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	      {
-	        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+              {
+                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
 
-	        if (output_file == 0)
+                if (output_file == 0)
             {
-	            ACE_ERROR_RETURN ((LM_ERROR,
-			               "Cannot open output file for writing IOR: %s",
-			               ior_output_file),
-			              1);
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                       "Cannot open output file for writing IOR: %s",
+                                       ior_output_file),
+                                      1);
             }
 
-	        ACE_OS::fprintf (output_file, "%s", ior.in ());
-	        ACE_OS::fclose (output_file);
-	      }
+                ACE_OS::fprintf (output_file, "%s", ior.in ());
+                ACE_OS::fclose (output_file);
+              }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index 72819309c96..7bc94dda05f 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -20,18 +20,18 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'n':
-	nthreads = ACE_OS::atoi (get_opts.optarg);
-	break;
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -46,11 +46,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -61,11 +61,11 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -76,36 +76,36 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	      orb->object_to_string (server.in (), ACE_TRY_ENV);
+              orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	      {
-	        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+              {
+                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
 
-	        if (output_file == 0)
+                if (output_file == 0)
             {
-	            ACE_ERROR_RETURN ((LM_ERROR,
-			               "Cannot open output file for writing IOR: %s",
-			               ior_output_file),
-			              1);
+                    ACE_ERROR_RETURN ((LM_ERROR,
+                                       "Cannot open output file for writing IOR: %s",
+                                       ior_output_file),
+                                      1);
             }
 
-	        ACE_OS::fprintf (output_file, "%s", ior.in ());
-	        ACE_OS::fclose (output_file);
-	      }
+                ACE_OS::fprintf (output_file, "%s", ior.in ());
+                ACE_OS::fclose (output_file);
+              }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index 4a96384e624..a278997774d 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -11,21 +11,21 @@
 ACE_RCSID(DSI_Gateway, test_dsi, "$Id$")
 
 void
-DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request,
-                           CORBA::Environment &ACE_TRY_ENV)
+DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0, ACE_TRY_ENV);
+      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   CORBA::NVList_ptr list;
-  this->orb_->create_list (0, list, ACE_TRY_ENV);
+  this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  request->arguments (list, ACE_TRY_ENV);
+  request->arguments (list TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Request_var target_request;
@@ -37,8 +37,8 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request,
                                   0, // exception_list,
                                   0, // context_list,
                                   target_request.inout (),
-                                  0,
-                                  ACE_TRY_ENV);
+                                  0
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   target_request->_tao_lazy_evaluation (1);
@@ -49,7 +49,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request,
   ACE_TRY
     {
       // Updates the byte order state, if necessary.
-      target_request->invoke (ACE_TRY_ENV);
+      target_request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UNKNOWN, ex)
@@ -71,15 +71,15 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request,
 
 CORBA::RepositoryId
 DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
-                                       PortableServer::POA_ptr,
-                                       CORBA::Environment &)
+                                       PortableServer::POA_ptr
+                                       TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC (())
 {
   return CORBA::string_dup ("IDL:Simple_Server:1.0");
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (CORBA::Environment &)
+DSI_Simple_Server::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h
index eb219d03547..77333ed445d 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_Gateway/test_dsi.h
@@ -35,19 +35,19 @@ public:
   // ctor
 
   // = The DynamicImplementation methods.
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA::Environment &env)
+  virtual void invoke (CORBA::ServerRequest_ptr request
+                       TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa,
-      CORBA::Environment &ACE_TRY_ENV
+      PortableServer::POA_ptr poa
+      TAO_ENV_ARG_DECL
     )
       ACE_THROW_SPEC (());
 
   virtual PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV
+      TAO_ENV_SINGLE_ARG_DECL
     );
 
 private:
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index 50876045e12..6813e9f6af5 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -13,8 +13,8 @@ CORBA::Long
 Simple_Server_i::test_method (CORBA::Long x,
                               const Structure& the_in_structure,
                               Structure_out the_out_structure,
-                              char *&name,
-                              CORBA::Environment&)
+                              char *&name
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Structure *tmp;
@@ -39,7 +39,7 @@ Simple_Server_i::test_method (CORBA::Long x,
 }
 
 void
-Simple_Server_i::raise_user_exception (CORBA::Environment &ACE_TRY_ENV)
+Simple_Server_i::raise_user_exception (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception))
 {
@@ -49,15 +49,15 @@ Simple_Server_i::raise_user_exception (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Simple_Server_i::raise_system_exception (CORBA::Environment &ACE_TRY_ENV)
+Simple_Server_i::raise_system_exception (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::NO_PERMISSION ());
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index a115367cc34..6f960b77359 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -34,18 +34,18 @@ public:
   CORBA::Long test_method (CORBA::Long x,
                            const Structure& the_in_structure,
                            Structure_out the_out_structure,
-                           char *&name,
-                           CORBA::Environment &)
+                           char *&name
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void raise_user_exception (CORBA::Environment &)
+  void raise_user_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception));
 
-  void raise_system_exception (CORBA::Environment &)
+  void raise_system_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index 89a008bf0b0..9582037ebd3 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -39,7 +39,7 @@ Data::Data (CORBA::ORB_var orb)
     m_any1 (CORBA::_tc_long),
     orb_ (orb)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -62,8 +62,8 @@ Data::Data (CORBA::ORB_var orb)
 
       // Getting the RootPOA so we can generate object references.
       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;
 
@@ -75,28 +75,28 @@ Data::Data (CORBA::ORB_var orb)
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Generate values for the member variables.
      this->m_objref1 =
-        root_poa->create_reference ("foo",
-                                    ACE_TRY_ENV);
+        root_poa->create_reference ("foo"
+                                    TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       this->m_objref2 =
-        root_poa->create_reference ("foo",
-                                    ACE_TRY_ENV);
+        root_poa->create_reference ("foo"
+                                    TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Clean up after the POA
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index ffe04da689a..2cbc2873eac 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -60,7 +60,7 @@ Driver::~Driver (void)
   if (this->orb_.in () != 0)
     {
       this->orb_->shutdown ();
-      this->orb_->destroy (); 
+      this->orb_->destroy ();
     }
 }
 
@@ -73,8 +73,8 @@ Driver::init (int argc, char* argv[])
       // Retrieve the underlying ORB
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "local",
-                                    ACE_TRY_ENV);
+                                    "local"
+                                    TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 875bca9c851..c18f79d4569 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -54,13 +54,13 @@ Test_DynAny::run_test (void)
                  "testing: constructor(Any)/insert/get\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("DynAnyFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
-                                            ACE_TRY_ENV);
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -72,13 +72,13 @@ Test_DynAny::run_test (void)
 
       CORBA::Any in1 (CORBA::_tc_double);
       DynamicAny::DynAny_var fa1 =
-        dynany_factory->create_dyn_any (in1, ACE_TRY_ENV);
+        dynany_factory->create_dyn_any (in1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      fa1->insert_double (data.m_double1,
-                          ACE_TRY_ENV);
+      fa1->insert_double (data.m_double1
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Double d_out = fa1->get_double (ACE_TRY_ENV);
+      CORBA::Double d_out = fa1->get_double (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (d_out == data.m_double1)
@@ -96,15 +96,15 @@ Test_DynAny::run_test (void)
 
       d_out = data.m_double2;
       DynamicAny::DynAny_var ftc1 =
-        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double,
-                                                       ACE_TRY_ENV);
+        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any in_any1;
       in_any1 <<= data.m_double1;
-      ftc1->from_any (in_any1,
-                      ACE_TRY_ENV);
+      ftc1->from_any (in_any1
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
+      CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       out_any1 >>= d_out;
 
@@ -118,9 +118,9 @@ Test_DynAny::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_TRY_ENV);
+      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (ACE_TRY_ENV);
+      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -132,17 +132,17 @@ Test_DynAny::run_test (void)
 
       CORBA_Any in (CORBA::_tc_TypeCode);
       DynamicAny::DynAny_var fa2 =
-        dynany_factory->create_dyn_any (in,
-                                        ACE_TRY_ENV);
+        dynany_factory->create_dyn_any (in
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa2->insert_typecode (data.m_typecode1,
-                            ACE_TRY_ENV);
+      fa2->insert_typecode (data.m_typecode1
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var tc_out = fa2->get_typecode (ACE_TRY_ENV);
+      CORBA::TypeCode_var tc_out = fa2->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (tc_out->equal (data.m_typecode1,
-                         ACE_TRY_ENV))
+      if (tc_out->equal (data.m_typecode1
+                         TAO_ENV_ARG_PARAMETER))
         {
           ACE_DEBUG ((LM_DEBUG,
                      "++ OK ++\n"));
@@ -158,21 +158,21 @@ Test_DynAny::run_test (void)
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var ftc2 =
-        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode,
-                                                       ACE_TRY_ENV);
+        dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any in_any2;
       in_any2 <<= data.m_typecode1;
-      ftc2->from_any (in_any2,
-                      ACE_TRY_ENV);
+      ftc2->from_any (in_any2
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any2 = ftc2->to_any (ACE_TRY_ENV);
+      CORBA::Any_var out_any2 = ftc2->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::TypeCode_ptr out_tc;
       out_any2 >>= out_tc;
 
-      CORBA::Boolean equal = out_tc->equal (data.m_typecode1,
-                                            ACE_TRY_ENV);
+      CORBA::Boolean equal = out_tc->equal (data.m_typecode1
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (equal)
@@ -187,9 +187,9 @@ Test_DynAny::run_test (void)
 
       ACE_TRY_CHECK;
 
-      fa2->destroy (ACE_TRY_ENV);
+      fa2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc2->destroy (ACE_TRY_ENV);
+      ftc2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 1db1cb02c04..ec9fc3c1fbd 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -57,13 +57,13 @@ Test_DynArray::run_test (void)
                  "testing: constructor(Any)/insert/get/seek/rewind/current_component\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("DynAnyFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
-                                            ACE_TRY_ENV);
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -76,25 +76,25 @@ Test_DynArray::run_test (void)
       CORBA::Any in_any1;
       in_any1 <<= ta;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1,
-                                        ACE_TRY_ENV);
+        dynany_factory->create_dyn_any (in_any1
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in (),
-                                                        ACE_TRY_ENV);
+      DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->seek (1,
-                 ACE_TRY_ENV);
+      fa1->seek (1
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->insert_long (data.m_long1,
-                        ACE_TRY_ENV);
+      fa1->insert_long (data.m_long1
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->rewind (ACE_TRY_ENV);
+      fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Long l_out1 = data.m_long2;
-      fa1->seek (1,
-                 ACE_TRY_ENV);
+      fa1->seek (1
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      l_out1 = fa1->get_long (ACE_TRY_ENV);
+      l_out1 = fa1->get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (l_out1 == data.m_long1)
@@ -111,13 +111,13 @@ Test_DynArray::run_test (void)
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var ftc1_base =
-        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array,
-                                                       ACE_TRY_ENV);
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynArray_var ftc1 =
-        DynamicAny::DynArray::_narrow (ftc1_base.in (),
-                                       ACE_TRY_ENV);
+        DynamicAny::DynArray::_narrow (ftc1_base.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -130,10 +130,10 @@ Test_DynArray::run_test (void)
       ta[1] = data.m_long1;
       CORBA::Any in_any2;
       in_any2 <<= ta;
-      ftc1->from_any (in_any2,
-                      ACE_TRY_ENV);
+      ftc1->from_any (in_any2
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
+      CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynAnyTests::test_array_forany ta_out;
       out_any1.in () >>= ta_out;
@@ -157,10 +157,10 @@ Test_DynArray::run_test (void)
       in_any3 <<= data.m_long1;
       as_in[0] = in_any3;
       as_in[1] = in_any3;
-      ftc1->set_elements (as_in,
-                          ACE_TRY_ENV);
+      ftc1->set_elements (as_in
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_TRY_ENV);
+      DynamicAny::AnySeq_var as_out = ftc1->get_elements (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA_Any out_any2 = as_out[1U];
       CORBA::Long l_out2;
@@ -176,9 +176,9 @@ Test_DynArray::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_TRY_ENV);
+      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (ACE_TRY_ENV);
+      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index b0b04b65927..1b8b4d77894 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -49,13 +49,13 @@ Test_DynEnum::run_test (void)
                  "testing: constructor(Any)/set_as_string/get_as_ulong\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("DynAnyFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
-                                            ACE_TRY_ENV);
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -69,17 +69,17 @@ Test_DynEnum::run_test (void)
       CORBA_Any in_any1;
       in_any1 <<= te;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1,
-                                        ACE_TRY_ENV);
+        dynany_factory->create_dyn_any (in_any1
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::DynEnum_var de1 = 
-        DynamicAny::DynEnum::_narrow (dp1.in (),
-                                      ACE_TRY_ENV);
+      DynamicAny::DynEnum_var de1 =
+        DynamicAny::DynEnum::_narrow (dp1.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      de1->set_as_string ("TE_FIRST", 
-                          ACE_TRY_ENV);
+      de1->set_as_string ("TE_FIRST"
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::ULong ul_out1 = de1->get_as_ulong (ACE_TRY_ENV);
+      CORBA::ULong ul_out1 = de1->get_as_ulong (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ul_out1 == 1)
@@ -95,10 +95,10 @@ Test_DynEnum::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_as_ulong/get_as_string\n"));
 
-      de1->set_as_ulong (3,
-                         ACE_TRY_ENV);
+      de1->set_as_ulong (3
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var s = de1->get_as_string (ACE_TRY_ENV);
+      CORBA::String_var s = de1->get_as_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0)
@@ -116,13 +116,13 @@ Test_DynEnum::run_test (void)
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var de2_base =
-        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum,
-                                                       ACE_TRY_ENV);
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynEnum_var de2 =
-        DynamicAny::DynEnum::_narrow (de2_base.in (),
-                                      ACE_TRY_ENV);
+        DynamicAny::DynEnum::_narrow (de2_base.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (de2.in ()))
@@ -134,10 +134,10 @@ Test_DynEnum::run_test (void)
 
       CORBA_Any in_any2;
       in_any2 <<= DynAnyTests::TE_THIRD;
-      de2->from_any (in_any2,
-                     ACE_TRY_ENV);
+      de2->from_any (in_any2
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA_Any_var out_any1 = de2->to_any (ACE_TRY_ENV);
+      CORBA_Any_var out_any1 = de2->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       out_any1.in () >>= te;
 
@@ -151,9 +151,9 @@ Test_DynEnum::run_test (void)
           ++this->error_count_;
         }
 
-      de1->destroy (ACE_TRY_ENV);
+      de1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      de2->destroy (ACE_TRY_ENV);
+      de2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 61c62345a03..36e8ab2b1ce 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -59,13 +59,13 @@ Test_DynSequence::run_test (void)
                  "rewind/current_component\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("DynAnyFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
-                                            ACE_TRY_ENV);
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -80,25 +80,25 @@ Test_DynSequence::run_test (void)
       CORBA_Any in_any1;
       in_any1 <<= ts;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1,
-                                        ACE_TRY_ENV);
+        dynany_factory->create_dyn_any (in_any1
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::DynSequence_var fa1 = 
-        DynamicAny::DynSequence::_narrow (dp1.in (),
-                                          ACE_TRY_ENV);
+      DynamicAny::DynSequence_var fa1 =
+        DynamicAny::DynSequence::_narrow (dp1.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->seek (1,
-                 ACE_TRY_ENV);
+      fa1->seek (1
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->insert_string (data.m_string1,
-                          ACE_TRY_ENV);
+      fa1->insert_string (data.m_string1
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->rewind (ACE_TRY_ENV);
+      fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->seek (1,
-                 ACE_TRY_ENV);
+      fa1->seek (1
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var out_str1 = fa1->get_string (ACE_TRY_ENV);
+      CORBA::String_var out_str1 = fa1->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!ACE_OS::strcmp (out_str1.in (), data.m_string1))
@@ -116,7 +116,7 @@ Test_DynSequence::run_test (void)
           "testing: set_elements_as_dyn_any/get_elements_as_dyn_any/equal\n"
         ));
 
-      static const char *values[] = 
+      static const char *values[] =
       {
         "zero",
         "one",
@@ -137,17 +137,17 @@ Test_DynSequence::run_test (void)
         {
           elem_any <<= CORBA::Any::from_string (values[i],
                                                 8);
-          elements[i] = dynany_factory->create_dyn_any (elem_any,
-                                                        ACE_TRY_ENV);
+          elements[i] = dynany_factory->create_dyn_any (elem_any
+                                                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      fa1->set_elements_as_dyn_any (elements.in (),
-                                    ACE_TRY_ENV);
+      fa1->set_elements_as_dyn_any (elements.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      DynamicAny::DynAnySeq_var out_elems = 
-        fa1->get_elements_as_dyn_any (ACE_TRY_ENV);
+      DynamicAny::DynAnySeq_var out_elems =
+        fa1->get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (out_elems->length () != 3)
@@ -160,12 +160,12 @@ Test_DynSequence::run_test (void)
 
       for (i = 0; i < length; ++i)
         {
-          out_str = out_elems[i]->get_string (ACE_TRY_ENV);
+          out_str = out_elems[i]->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::Boolean equal = 
-            out_elems[i]->equal (elements[i].in (),
-                                 ACE_TRY_ENV);
+          CORBA::Boolean equal =
+            out_elems[i]->equal (elements[i].in ()
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!equal)
@@ -175,7 +175,7 @@ Test_DynSequence::run_test (void)
 
           // To show that calling destroy() on a component does
           // nothing, as required by the spec.
-          out_elems[i]->destroy (ACE_TRY_ENV);
+          out_elems[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -190,14 +190,14 @@ Test_DynSequence::run_test (void)
 
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (
-                            DynAnyTests::_tc_test_seq,
-                            ACE_TRY_ENV
+                            DynAnyTests::_tc_test_seq
+                            TAO_ENV_ARG_PARAMETER
                           );
       ACE_TRY_CHECK;
 
       DynamicAny::DynSequence_var ftc1 =
-        DynamicAny::DynSequence::_narrow (ftc1_base.in (),
-                                          ACE_TRY_ENV);
+        DynamicAny::DynSequence::_narrow (ftc1_base.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -210,10 +210,10 @@ Test_DynSequence::run_test (void)
       ts[0] = CORBA::string_dup (data.m_string1);
       CORBA_Any in_any2;
       in_any2 <<= ts;
-      ftc1->from_any (in_any2,
-                      ACE_TRY_ENV);
+      ftc1->from_any (in_any2
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
+      CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynAnyTests::test_seq *ts_out;
       out_any1.in () >>= ts_out;
@@ -231,7 +231,7 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: length/set_elements/get_elements\n"));
 
-      length = ftc1->get_length (ACE_TRY_ENV);
+      length = ftc1->get_length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (length != 2)
@@ -239,8 +239,8 @@ Test_DynSequence::run_test (void)
           ++this->error_count_;
         }
 
-      ftc1->set_length (3,
-                        ACE_TRY_ENV);
+      ftc1->set_length (3
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::AnySeq as_in (3);
       as_in.length (3);
@@ -250,10 +250,10 @@ Test_DynSequence::run_test (void)
       as_in[1] = in_any3;
       in_any3 <<= CORBA::Any::from_string (data.m_string1, 8);
       as_in[2] = in_any3;
-      ftc1->set_elements (as_in,
-                          ACE_TRY_ENV);
+      ftc1->set_elements (as_in
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_TRY_ENV);
+      DynamicAny::AnySeq_var as_out = ftc1->get_elements (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::ULong index = 2;
       CORBA_Any out_any2 = as_out[index];
@@ -271,9 +271,9 @@ Test_DynSequence::run_test (void)
                      "++ OK ++\n"));
         }
 
-      fa1->destroy (ACE_TRY_ENV);
+      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (ACE_TRY_ENV);
+      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 25ccd38df43..b72b83e6229 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -57,13 +57,13 @@ Test_DynStruct::run_test (void)
                  "testing: constructor(Any)/insert/get/next/seek/rewind/current_component\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("DynAnyFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
-                                            ACE_TRY_ENV);
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -76,45 +76,45 @@ Test_DynStruct::run_test (void)
       CORBA::Any in_any1;
       in_any1 <<= ts;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1,
-                                        ACE_TRY_ENV);
+        dynany_factory->create_dyn_any (in_any1
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynStruct_var fa1 =
-        DynamicAny::DynStruct::_narrow (dp1.in (),
-                                        ACE_TRY_ENV);
+        DynamicAny::DynStruct::_narrow (dp1.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->insert_char (data.m_char1,
-                        ACE_TRY_ENV);
+      fa1->insert_char (data.m_char1
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->next (ACE_TRY_ENV);
+      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->insert_long (data.m_long1,
-                        ACE_TRY_ENV);
+      fa1->insert_long (data.m_long1
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->next (ACE_TRY_ENV);
+      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      DynamicAny::DynAny_var cc = fa1->current_component (ACE_TRY_ENV);
+      DynamicAny::DynAny_var cc = fa1->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      cc->insert_float (data.m_float1,
-                        ACE_TRY_ENV);
+      cc->insert_float (data.m_float1
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      cc->next (ACE_TRY_ENV);
+      cc->next (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      cc->insert_short (data.m_short1,
-                        ACE_TRY_ENV);
+      cc->insert_short (data.m_short1
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      cc->rewind (ACE_TRY_ENV);
+      cc->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // To show that calling destroy() on a component does
       // nothing, as required by the spec.
-      cc->destroy (ACE_TRY_ENV);
+      cc->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      fa1->rewind (ACE_TRY_ENV);
+      fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Char c = fa1->get_char (ACE_TRY_ENV);
+      CORBA::Char c = fa1->get_char (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (c != data.m_char1)
@@ -122,9 +122,9 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->next (ACE_TRY_ENV);
+      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Long l = fa1->get_long (ACE_TRY_ENV);
+      CORBA::Long l = fa1->get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (l != data.m_long1)
@@ -132,16 +132,16 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->next (ACE_TRY_ENV);
+      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      cc = fa1->current_component (ACE_TRY_ENV);
+      cc = fa1->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      cc->seek (1,
-                ACE_TRY_ENV);
+      cc->seek (1
+                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Short s = cc->get_short (ACE_TRY_ENV);
+      CORBA::Short s = cc->get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s != data.m_short1)
@@ -159,13 +159,13 @@ Test_DynStruct::run_test (void)
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
       DynamicAny::DynAny_var ftc1_base =
-        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct,
-                                                       ACE_TRY_ENV);
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynStruct_var ftc1 =
-        DynamicAny::DynStruct::_narrow (ftc1_base.in (),
-                                          ACE_TRY_ENV);
+        DynamicAny::DynStruct::_narrow (ftc1_base.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -181,10 +181,10 @@ Test_DynStruct::run_test (void)
       ts.es.s = data.m_short1;
       CORBA_Any in_any2;
       in_any2 <<= ts;
-      ftc1->from_any (in_any2,
-                      ACE_TRY_ENV);
+      ftc1->from_any (in_any2
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA_Any_var out_any1 = ftc1->to_any (ACE_TRY_ENV);
+      CORBA_Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynAnyTests::test_struct* ts_out;
       out_any1.in () >>= ts_out;
@@ -202,11 +202,11 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: current_member_name/current_member_kind\n"));
 
-      ftc1->seek (2,
-                 ACE_TRY_ENV);
+      ftc1->seek (2
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::FieldName_var fn =
-        ftc1->current_member_name (ACE_TRY_ENV);
+        ftc1->current_member_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (fn.in (), "es"))
@@ -214,7 +214,7 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      CORBA::TCKind tk = ftc1->current_member_kind (ACE_TRY_ENV);
+      CORBA::TCKind tk = ftc1->current_member_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (tk != CORBA::tk_struct)
@@ -231,18 +231,18 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: get_members/set_members\n"));
 
-      DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (ACE_TRY_ENV);
+      DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynAny_var sm_base =
         dynany_factory->create_dyn_any_from_type_code (
-            DynAnyTests::_tc_test_struct,
-            ACE_TRY_ENV
+            DynAnyTests::_tc_test_struct
+            TAO_ENV_ARG_PARAMETER
           );
       ACE_TRY_CHECK;
 
       DynamicAny::DynStruct_var sm =
-        DynamicAny::DynStruct::_narrow (sm_base.in (),
-                                        ACE_TRY_ENV);
+        DynamicAny::DynStruct::_narrow (sm_base.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sm.in ()))
@@ -252,10 +252,10 @@ Test_DynStruct::run_test (void)
                             -1);
         }
 
-      sm->set_members (nvps.in (),
-                       ACE_TRY_ENV);
+      sm->set_members (nvps.in ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::NameValuePairSeq_var gm = sm->get_members (ACE_TRY_ENV);
+      DynamicAny::NameValuePairSeq_var gm = sm->get_members (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::ULong index = 2;
 
@@ -264,11 +264,11 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_TRY_ENV);
+      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (ACE_TRY_ENV);
+      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      sm->destroy (ACE_TRY_ENV);
+      sm->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 9eba7003926..fb4ce42e20f 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -57,13 +57,13 @@ Test_DynUnion::run_test (void)
                  "testing: constructor(Any)/insert/get\n"));
 
       CORBA::Object_var factory_obj =
-        this->orb_->resolve_initial_references ("DynAnyFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("DynAnyFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
-        DynamicAny::DynAnyFactory::_narrow (factory_obj.in (),
-                                            ACE_TRY_ENV);
+        DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -78,20 +78,20 @@ Test_DynUnion::run_test (void)
       CORBA_Any in_any1;
       in_any1 <<= tu;
       DynamicAny::DynAny_var dp1 =
-        dynany_factory->create_dyn_any (in_any1,
-                                        ACE_TRY_ENV);
+        dynany_factory->create_dyn_any (in_any1
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynUnion_var fa1 =
-        DynamicAny::DynUnion::_narrow (dp1.in (),
-                                       ACE_TRY_ENV);
+        DynamicAny::DynUnion::_narrow (dp1.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->seek (1,
-                 ACE_TRY_ENV);
+      fa1->seek (1
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->insert_typecode (data.m_typecode1,
-                            ACE_TRY_ENV);
+      fa1->insert_typecode (data.m_typecode1
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_TRY_ENV);
+      CORBA::TypeCode_var s_out1 = fa1->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s_out1.in ()->equal (data.m_typecode1))
@@ -107,16 +107,16 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_Any_var out_any1 = fa1->to_any (ACE_TRY_ENV);
+      CORBA_Any_var out_any1 = fa1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynAny_var ftc1_base =
-        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union,
-                                                       ACE_TRY_ENV);
+        dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynUnion_var ftc1 =
-        DynamicAny::DynUnion::_narrow (ftc1_base.in (),
-                                          ACE_TRY_ENV);
+        DynamicAny::DynUnion::_narrow (ftc1_base.in ()
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -126,13 +126,13 @@ Test_DynUnion::run_test (void)
                             -1);
         }
 
-      ftc1->from_any (out_any1.in (),
-                      ACE_TRY_ENV);
+      ftc1->from_any (out_any1.in ()
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->seek (1,
-                 ACE_TRY_ENV);
+      ftc1->seek (1
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var s_out2 = ftc1->get_typecode (ACE_TRY_ENV);
+      CORBA::TypeCode_var s_out2 = ftc1->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s_out2.in ()->equal (data.m_typecode1))
@@ -148,15 +148,15 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:discriminator/discriminator_kind\n"));
 
-      DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TypeCode_var tc2 = dp2->type (ACE_TRY_ENV);
+      CORBA::TypeCode_var tc2 = dp2->type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TCKind tc1kind = ftc1->discriminator_kind (ACE_TRY_ENV);
+      CORBA::TCKind tc1kind = ftc1->discriminator_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TCKind tc2kind = tc2->kind (ACE_TRY_ENV);
+      CORBA::TCKind tc2kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (tc2kind == tc1kind)
@@ -172,13 +172,13 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:member/member_kind/member_name\n"));
 
-      DynamicAny::DynAny_var dp3 = ftc1->member (ACE_TRY_ENV);
+      DynamicAny::DynAny_var dp3 = ftc1->member (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var m_nm = ftc1->member_name (ACE_TRY_ENV);
+      CORBA::String_var m_nm = ftc1->member_name (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TCKind tk = ftc1->member_kind (ACE_TRY_ENV);
+      CORBA::TCKind tk = ftc1->member_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var tc3 = dp3->get_typecode (ACE_TRY_ENV);
+      CORBA::TypeCode_var tc3 = dp3->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!ACE_OS::strcmp (m_nm.in (), "tc")
@@ -198,17 +198,17 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_to_default_member\n"));
 
-      ftc1->set_to_default_member (ACE_TRY_ENV);
+      ftc1->set_to_default_member (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->seek (1,
-                  ACE_TRY_ENV);
+      ftc1->seek (1
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->insert_short (data.m_short1,
-                          ACE_TRY_ENV);
+      ftc1->insert_short (data.m_short1
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::DynAny_var mem = ftc1->member (ACE_TRY_ENV);
+      DynamicAny::DynAny_var mem = ftc1->member (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Short out_s = mem->get_short (ACE_TRY_ENV);
+      CORBA::Short out_s = mem->get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (out_s == data.m_short1)
@@ -221,9 +221,9 @@ Test_DynUnion::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (ACE_TRY_ENV);
+      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (ACE_TRY_ENV);
+      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp
index 6537950ca44..984dcbc34c6 100644
--- a/TAO/tests/Explicit_Event_Loop/client.cpp
+++ b/TAO/tests/Explicit_Event_Loop/client.cpp
@@ -29,18 +29,18 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY 
+  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_TRY
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "",
-                                            ACE_TRY_ENV);
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check arguments.
-      if  (argc != 2) 
+      if  (argc != 2)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Usage: client IOR_string\n"),
@@ -48,11 +48,11 @@ main (int argc, char *argv[])
         }
 
       // Destringify argv[1].
-      CORBA::Object_var obj = orb->string_to_object (argv[1],
-                                                     ACE_TRY_ENV);
+      CORBA::Object_var obj = orb->string_to_object (argv[1]
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if  (CORBA::is_nil (obj.in ())) 
+      if  (CORBA::is_nil (obj.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Nil Time reference\n"),
@@ -60,11 +60,11 @@ main (int argc, char *argv[])
         }
 
       // Narrow.
-      Time_var tm = Time::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+      Time_var tm = Time::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if  (CORBA::is_nil (tm.in ())) 
+      if  (CORBA::is_nil (tm.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Argument is not a Time reference\n"),
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
         }
 
       // Get time.
-      TimeOfDay tod = tm->get_gmt (ACE_TRY_ENV);
+      TimeOfDay tod = tm->get_gmt (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -85,20 +85,20 @@ main (int argc, char *argv[])
                   tod.second));
     }
 
-  ACE_CATCHANY 
+  ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "client: a CORBA exception occured");
       return 1;
     }
-  ACE_CATCHALL 
+  ACE_CATCHALL
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "client: an unknown exception was caught\n"),
                         1);
     }
-  ACE_ENDTRY;  
-  
+  ACE_ENDTRY;
+
   ACE_CHECK_RETURN (-1);
   return 0;
 }
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index eb040211863..b714a1f80ab 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -49,7 +49,7 @@ parse_args (int argc, char *argv[])
                            "\n",
                            argv [0]),
                           -1);
-      }                       
+      }
   // Indicates sucessful parsing of the command line
   return 0;
 }
@@ -57,7 +57,7 @@ parse_args (int argc, char *argv[])
 
 TimeOfDay
 Time_impl::
-get_gmt ( CORBA_Environment &)
+get_gmt ( TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_t time_now = time (0);
@@ -83,14 +83,14 @@ void do_something_else()
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "",
-                                            ACE_TRY_ENV);
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -100,32 +100,32 @@ main (int argc, char *argv[])
 
       // Get reference to Root POA.
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
+        = orb->resolve_initial_references ("RootPOA"
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
+        = PortableServer::POA::_narrow (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate POA manager.
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_TRY_ENV);
+        = poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an object.
       Time_impl time_servant;
 
       // Write its stringified reference to stdout.
-      Time_var tm = time_servant._this (ACE_TRY_ENV);
+      Time_var tm = time_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::String_var str = orb->object_to_string (tm.in (),
-                                                     ACE_TRY_ENV);
+      CORBA::String_var str = orb->object_to_string (tm.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -147,8 +147,8 @@ main (int argc, char *argv[])
               );
             }
 
-          ACE_OS::fprintf (output_file, 
-                           "%s", 
+          ACE_OS::fprintf (output_file,
+                           "%s",
                            str.in ());
           ACE_OS::fclose (output_file);
         }
@@ -157,12 +157,12 @@ main (int argc, char *argv[])
       while (!done)
         {
           CORBA::Boolean pending =
-            orb->work_pending (ACE_TRY_ENV);
+            orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (pending)
             {
-              orb->perform_work (ACE_TRY_ENV);
+              orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           do_something_else ();
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
 
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "server: a CORBA exception occured");
       return 1;
     }
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 841d29cd783..e8beea4ce17 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -28,38 +28,38 @@ Policy_Tester::~Policy_Tester (void)
 }
 
 void
-Policy_Tester::run (CORBA::Environment &ACE_TRY_ENV)
+Policy_Tester::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager_var poa_manager =
-    this->child_poa_->the_POAManager (ACE_TRY_ENV);
+    this->child_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->run (ACE_TRY_ENV);
+  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Policy_Tester::init (int argc,
-                     char *argv[],
-                     CORBA::Environment &ACE_TRY_ENV)
+                     char *argv[]
+                     TAO_ENV_ARG_DECL)
 {
   // ORB Initialization.
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "",
-                     ACE_TRY_ENV);
+    CORBA::ORB_init (argc, argv, ""
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get a reference to the RT-ORB.
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTORB",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTORB"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in (),
-                                           ACE_TRY_ENV);
+  this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Here we parse the command line paramether passed
@@ -74,13 +74,13 @@ Policy_Tester::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg, ACE_TRY_ENV);
+            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg, ACE_TRY_ENV);
+            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
@@ -119,7 +119,7 @@ Policy_Tester::init (int argc,
     }
 
   int result =
-    this->create_objects (ACE_TRY_ENV);
+    this->create_objects (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -142,7 +142,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 
 
 int
-Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
+Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::PolicyList poa_policy_list;
   poa_policy_list.length (3);
@@ -151,8 +151,8 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
   RTCORBA::Priority priority = this->rt_poa_properties_->priority ();
   poa_policy_list[0] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                                 priority,
-                                                 ACE_TRY_ENV);
+                                                 priority
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
       // Create priority Banded Connection Policy.
@@ -160,8 +160,8 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
     this->rt_poa_properties_->priority_bands ();
 
   poa_policy_list[1] =
-    this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands,
-                                                             ACE_TRY_ENV);
+    this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
       // Client Protocol Policy.
@@ -179,11 +179,11 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
     this->rt_orb_->create_client_protocol_policy (protocol_list);
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+    PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_mgr =
@@ -192,19 +192,19 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
   object =
     this->poa_->create_POA ("Child_POA",
                             poa_mgr.in (),
-                            poa_policy_list,
-                            ACE_TRY_ENV);
+                            poa_policy_list
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->child_poa_ =
-    RTPortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+    RTPortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create a Corba Object reference, using the policies
   // set at the POA level.
   object =
-    this->child_poa_->create_reference ("IDL:Counter:1.0",
-                                        ACE_TRY_ENV);
+    this->child_poa_->create_reference ("IDL:Counter:1.0"
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -214,7 +214,7 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
                         "Unable to create Object!\n"))
     return -1;
 
-  Counter_var base_object = Counter::_narrow (object.in (), ACE_TRY_ENV);
+  Counter_var base_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (!check_reference (base_object.in(),
@@ -222,7 +222,7 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
     return -1;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (base_object.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (base_object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -247,8 +247,8 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
   object =
     this->child_poa_->create_reference_with_priority
     ("IDL:Counter:1.0",
-     this->rt_object_properties_->priority (),
-     ACE_TRY_ENV);
+     this->rt_object_properties_->priority ()
+     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -258,7 +258,7 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
                         "Unable to create a Counter Object!\n"))
     return -1;
 
-  Counter_var over_object = Counter::_narrow (object.in (), ACE_TRY_ENV);
+  Counter_var over_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (!check_reference (over_object.in(),
@@ -267,7 +267,7 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
 
 
   CORBA::String_var o_ior =
-    this->orb_->object_to_string (over_object.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (over_object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -286,8 +286,8 @@ Policy_Tester::create_objects (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Policy_Tester::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Policy_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h
index a2ba26dd7ef..86440cb829e 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.h
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.h
@@ -35,17 +35,17 @@ public:
   Policy_Tester (void);
   ~Policy_Tester (void);
 
-  void run (CORBA::Environment &ACE_TRY_ENV);
+  void run (TAO_ENV_SINGLE_ARG_DECL);
   // Runs the test.
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 private:
   // Helper method used internally.
-  int create_objects (CORBA::Environment &ACE_TRY_ENV);
+  int create_objects (TAO_ENV_SINGLE_ARG_DECL);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                    const char *msg);
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 9ef23562029..8d2329cfa06 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -18,11 +18,11 @@ Policy_Verifier::~Policy_Verifier (void)
 
 void
 Policy_Verifier::init (int argc,
-                       char *argv[],
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char *argv[]
+                       TAO_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+    CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Arg_Shifter arg_shifter (argc, argv);
@@ -34,7 +34,7 @@ Policy_Verifier::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg, ACE_TRY_ENV);
+            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
           this->priority_bands_ =
             this->rt_poa_properties_->priority_bands ().length ();
@@ -42,7 +42,7 @@ Policy_Verifier::init (int argc,
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg, ACE_TRY_ENV);
+            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
@@ -88,27 +88,27 @@ Policy_Verifier::init (int argc,
     }
 
   // Get the Object references.
-  CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_,
-                                                           ACE_TRY_ENV);
+  CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_
+                                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return;
 
-  this->base_object_ = Counter::_narrow (object.in (), ACE_TRY_ENV);
+  this->base_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (this->base_object_.in (),
                                          "Unable to convert the IOR to the proper object reference.\n"))
     return;
 
-  object = this->orb_->string_to_object (this->overridden_object_ref_, ACE_TRY_ENV);
+  object = this->orb_->string_to_object (this->overridden_object_ref_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return;
 
-  this->overridden_object_ = Counter::_narrow (object.in (), ACE_TRY_ENV);
+  this->overridden_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (this->overridden_object_.in (),
@@ -118,30 +118,30 @@ Policy_Verifier::init (int argc,
 }
 
 void
-Policy_Verifier::run (CORBA::Environment &ACE_TRY_ENV )
+Policy_Verifier::run (TAO_ENV_SINGLE_ARG_DECL )
 {
   this->verify_reference (this->base_object_.in (),
-                          this->rt_poa_properties_,
-                          ACE_TRY_ENV);
+                          this->rt_poa_properties_
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->verify_reference (this->overridden_object_.in (),
-                          this->rt_object_properties_,
-                          ACE_TRY_ENV);
+                          this->rt_object_properties_
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Policy_Verifier::verify_reference (Counter_ptr object,
-                                   RT_Properties *rt_properties,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   RT_Properties *rt_properties
+                                   TAO_ENV_ARG_DECL)
 {
 
   ACE_TRY
     {
       CORBA::Policy_var policy_var =
-        object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
-                             ACE_TRY_ENV);
+        object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n"))
@@ -150,11 +150,11 @@ Policy_Verifier::verify_reference (Counter_ptr object,
             RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ());
 
           RTCORBA::PriorityModel priority_model =
-            priority_policy->priority_model (ACE_TRY_ENV);
+            priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RTCORBA::Priority priority =
-            priority_policy->server_priority (ACE_TRY_ENV);
+            priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (priority_model == RTCORBA::SERVER_DECLARED)
@@ -174,15 +174,15 @@ Policy_Verifier::verify_reference (Counter_ptr object,
                         ACE_TEXT ("Priority Value Mismatch.\n")));
         }
 
-      policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE,
-                                        ACE_TRY_ENV);
+      policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
+                                        TAO_ENV_ARG_PARAMETER);
       if (Policy_Verifier::check_reference (policy_var.in (),
                                           "Unable to get Priority Banded Policy\n"))
         {
 
           RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy =
-            RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in (),
-                                                              ACE_TRY_ENV);
+            RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ()
+                                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -218,17 +218,17 @@ Policy_Verifier::verify_reference (Counter_ptr object,
                 }
             }
         }
-      policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE,
-                                        ACE_TRY_ENV);
+      policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE
+                                        TAO_ENV_ARG_PARAMETER);
       if (Policy_Verifier::check_reference (policy_var.in (),
                                             "Unable to get Client Protocol Policy\n"))
         {
           RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
-            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in (), ACE_TRY_ENV);
+            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RTCORBA::ProtocolList_var protocol_list =
-            client_protocol_policy->protocols (ACE_TRY_ENV);
+            client_protocol_policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (unsigned int  i = 0; i < protocol_list->length (); i++)
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index 830bbdc11f2..d533a32f64a 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -39,19 +39,16 @@ public:
   ~Policy_Verifier (void);
 
   void init (int argc,
-             char *argv[],
-             CORBA::Environment &ACE_TRY_ENV
-             = TAO_default_environment ());
+             char *argv[]
+             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void run (CORBA::Environment &ACE_TRY_ENV
-            = TAO_default_environment ());
+  void run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 private:
   // -- Helper methods --
   void verify_reference (Counter_ptr counter,
-                         RT_Properties *rt_properties,
-                         CORBA::Environment &ACE_TRY_ENV
-                         = TAO_default_environment ());
+                         RT_Properties *rt_properties
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                   const char *msg);
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index 17a9dd6aca3..cff2300b0be 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -16,8 +16,8 @@ RT_Properties::~RT_Properties (void)
 }
 
 RT_Properties *
-RT_Properties::read_from (const char *file_name,
-                          CORBA::Environment &ACE_TRY_ENV)
+RT_Properties::read_from (const char *file_name
+                          TAO_ENV_ARG_DECL)
 {
   FILE *fp = ACE_OS::fopen (file_name, "r");
 
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h
index 2608fc37e7a..310c8c99174 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.h
+++ b/TAO/tests/Exposed_Policies/RT_Properties.h
@@ -29,8 +29,8 @@ public:
   RT_Properties (void);
   ~RT_Properties (void);
 
-  static RT_Properties * read_from (const char *file_name,
-                                    CORBA::Environment &ACE_TRY_ENV);
+  static RT_Properties * read_from (const char *file_name
+                                    TAO_ENV_ARG_DECL);
 
   // -- Accessor Methods --
   void priority (RTCORBA::Priority priority);
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index 30e1205c761..4859498b674 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -14,16 +14,16 @@ ACE_RCSID(tao, client, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       Policy_Verifier policy_verifier;
 
-      policy_verifier.init (argc, argv, ACE_TRY_ENV);
+      policy_verifier.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policy_verifier.run (ACE_TRY_ENV);
+      policy_verifier.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index 4087198ca21..2903e49602e 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -21,19 +21,19 @@ ACE_RCSID(tao, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       Policy_Tester policy_tester;
 
-      int result = policy_tester.init (argc, argv, ACE_TRY_ENV);
+      int result = policy_tester.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      policy_tester.run (ACE_TRY_ENV);
+      policy_tester.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 46acabb859b..1956c605ca5 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -39,8 +39,8 @@ public:
   void show (void);
   // Call show on all the window objects
 
-  void parse_args (int argc, char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV);
+  void parse_args (int argc, char *argv[]
+                   TAO_ENV_ARG_DECL);
 
 private:
   static void x_cb (Fl_Widget *widget, void* cookie);
@@ -68,7 +68,7 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Fl_Window window (300, 100);
@@ -81,14 +81,14 @@ int main (int argc, char* argv[])
 
       client.show ();
 
-      client.parse_args (argc, argv, ACE_TRY_ENV);
+      client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Fl::run ();
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
@@ -149,7 +149,7 @@ Client::x_changed (void)
   ACE_TRY_NEW_ENV
     {
       CORBA::Long x = CORBA::Long (this->x_roller_->value ());
-      this->server_->set_x_angle (x, ACE_TRY_ENV);
+      this->server_->set_x_angle (x TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -165,7 +165,7 @@ Client::y_changed (void)
   ACE_TRY_NEW_ENV
     {
       CORBA::Long y = CORBA::Long (this->y_roller_->value ());
-      this->server_->set_y_angle (y, ACE_TRY_ENV);
+      this->server_->set_y_angle (y TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -176,8 +176,8 @@ Client::y_changed (void)
 }
 
 void
-Client::parse_args (int argc, char *argv[],
-                    CORBA::Environment &ACE_TRY_ENV)
+Client::parse_args (int argc, char *argv[]
+                    TAO_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
@@ -200,11 +200,11 @@ Client::parse_args (int argc, char *argv[],
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior, ACE_TRY_ENV);
+    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->server_ =
-    Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+    Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 #endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index 561a50778db..f8f466aecd7 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -31,14 +31,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -82,39 +82,39 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_i server_impl (orb.in (), &sw);
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (Fl::run () == -1)
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index b6208c01cf9..cac8329a03c 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -20,19 +20,19 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
 }
 
 void
-Simple_Server_i::set_x_angle (CORBA::Long x, CORBA::Environment&)
+Simple_Server_i::set_x_angle (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->window_->set_x_angle (x);
 }
 
 void
-Simple_Server_i::set_y_angle (CORBA::Long y, CORBA::Environment&)
+Simple_Server_i::set_y_angle (CORBA::Long y TAO_ENV_ARG_DECL_NOT_USED)
 {
   this->window_->set_y_angle (y);
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment&)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index 76b105cff79..2ae0ae47de9 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -64,9 +64,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void set_x_angle (CORBA::Long x, CORBA::Environment&);
-  void set_y_angle (CORBA::Long y, CORBA::Environment&);
-  void shutdown (CORBA::Environment&);
+  void set_x_angle (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED);
+  void set_y_angle (CORBA::Long y TAO_ENV_ARG_DECL_NOT_USED);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 9a4ee0a775e..f293e7095f8 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -71,11 +71,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -84,25 +84,25 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -116,14 +116,14 @@ main (int argc, char *argv[])
       Callback_i callback_impl (orb.in ());
 
       Callback_var callback =
-        callback_impl._this (ACE_TRY_ENV);
+        callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != niterations; ++i)
         {
           CORBA::Long r =
-            server->test_method (0, 0, callback.in (),
-                                 ACE_TRY_ENV);
+            server->test_method (0, 0, callback.in ()
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (r != 0)
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
         {
           ACE_TRY_EX(ABORT)
             {
-              server->shutdown_now (0, ACE_TRY_ENV);
+              server->shutdown_now (0 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX(ABORT);
             }
           ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
         {
           ACE_TRY_EX(CRASH)
             {
-              server->shutdown_now (1, ACE_TRY_ENV);
+              server->shutdown_now (1 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX(CRASH);
             }
           ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
@@ -166,25 +166,25 @@ main (int argc, char *argv[])
         }
       else if (do_suicide)
         {
-          (void) server->test_method (1, 0, callback.in (),
-                                      ACE_TRY_ENV);
+          (void) server->test_method (1, 0, callback.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n"));
         }
       else if (do_self_shutdown)
         {
-          (void) server->test_method (1, 1, callback.in (),
-                                      ACE_TRY_ENV);
+          (void) server->test_method (1, 1, callback.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (do_shutdown)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 6f88904ccef..157a5a9fc9b 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -19,8 +19,8 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'k':
         ior = get_opts.optarg;
@@ -34,7 +34,7 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "-k <ior> "
                            "-i <niterations> "
                            "\n",
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -64,25 +64,25 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -97,34 +97,34 @@ main (int argc, char *argv[])
                             server.in ());
 
       Simple_Server_var middle =
-        middle_impl._this (ACE_TRY_ENV);
+        middle_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (middle.in (), ACE_TRY_ENV);
+        orb->object_to_string (middle.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      orb->run (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index cc21f45d8cd..3f571087e52 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -39,22 +39,22 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // create child poa with PERSISTENT policy
@@ -62,25 +62,25 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT,
-                                         ACE_TRY_ENV);
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
+                                         TAO_ENV_ARG_PARAMETER);
       policies[1] =
-        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION,
-                                                    ACE_TRY_ENV);
+        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies,
-                             ACE_TRY_ENV);
+                             policies
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[0]->destroy (ACE_TRY_ENV);
+      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[1]->destroy (ACE_TRY_ENV);
+      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
                           persistent_poa.in ());
 
       PingObject_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -112,15 +112,15 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      persistent_poa->destroy (1, 1, ACE_TRY_ENV);
+      persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index ec8e6b64105..e8129cce447 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -9,28 +9,28 @@
 ACE_RCSID(Faults, test_i, "$Id$")
 
 void
-PingObject_i::ping (PingObject_ptr callback,
-      CORBA::Environment &ACE_TRY_ENV)
+PingObject_i::ping (PingObject_ptr callback
+      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  callback->pong (ACE_TRY_ENV);
+  callback->pong (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-PingObject_i::pong (CORBA::Environment &)
+PingObject_i::pong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-PingObject_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+PingObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-PingObject_i::_default_POA (CORBA::Environment &)
+PingObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h
index 1e3ef958cf5..76ded91dcbf 100644
--- a/TAO/tests/Faults/ping_i.h
+++ b/TAO/tests/Faults/ping_i.h
@@ -34,15 +34,15 @@ public:
   // ctor
 
   // = The PingObject interface methods
-  void ping (PingObject_ptr callback,
-             CORBA::Environment &ACE_TRY_ENV)
+  void ping (PingObject_ptr callback
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void pong (CORBA::Environment &ACE_TRY_ENV)
+  void pong (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &ACE_TRY_ENV)
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index 108184cad9e..1066400e786 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -55,8 +55,8 @@ parse_args (int argc, char *argv[])
 void
 run_client (CORBA::ORB_ptr orb,
             PingObject_ptr server,
-            PingObject_ptr callback,
-            CORBA::Environment &ACE_TRY_ENV)
+            PingObject_ptr callback
+            TAO_ENV_ARG_DECL)
 {
   // Run the client requests in a separate routine to isolate the
   // exceptions...
@@ -68,11 +68,11 @@ run_client (CORBA::ORB_ptr orb,
       ACE_TRY
         {
           reason = "Exception during ping call";
-          server->ping (callback, ACE_TRY_ENV);
+          server->ping (callback TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Run for <period> milliseconds, to receive the reply
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Terminate the client if:
@@ -83,7 +83,7 @@ run_client (CORBA::ORB_ptr orb,
             {
               ACE_DEBUG ((LM_DEBUG, "Shutting down server\n"));
               reason = "Exception during server shutdown";
-              server->shutdown (ACE_TRY_ENV);
+              server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -115,22 +115,22 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // create child poa with PERSISTENT policy
@@ -138,37 +138,37 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT,
-                                         ACE_TRY_ENV);
+        root_poa->create_lifespan_policy(PortableServer::PERSISTENT
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policies[1] =
-        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION,
-                                                    ACE_TRY_ENV);
+        root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
-                             policies,
-                             ACE_TRY_ENV);
+                             policies
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[0]->destroy (ACE_TRY_ENV);
+      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[1]->destroy (ACE_TRY_ENV);
+      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PingObject_var server =
-        PingObject::_narrow (object.in (), ACE_TRY_ENV);
+        PingObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -183,21 +183,21 @@ main (int argc, char *argv[])
                             persistent_poa.in ());
 
       PingObject_var callback =
-        callback_impl._this (ACE_TRY_ENV);
+        callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // If the ior_output_file exists, output the ior to it
       run_client (orb.in (),
                   server.in (),
-                  callback.in (),
-                  ACE_TRY_ENV);
+                  callback.in ()
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      persistent_poa->destroy (1, 1, ACE_TRY_ENV);
+      persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 5dfdad61ba8..1ed8bab1f07 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -39,11 +39,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,14 +52,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -76,11 +76,11 @@ main (int argc, char *argv[])
 
 
       Simple_Server_var server =
-        server_impl->_this (ACE_TRY_ENV);
+        server_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -98,12 +98,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index 67c8cc13dc2..ac290b81b1a 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -9,8 +9,8 @@
 ACE_RCSID(Failure, test_i, "$Id$")
 
 void
-Callback_i::shutdown (CORBA::Boolean is_clean,
-                      CORBA::Environment &ACE_TRY_ENV)
+Callback_i::shutdown (CORBA::Boolean is_clean
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
@@ -27,7 +27,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean,
       return;
     }
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -35,15 +35,15 @@ Callback_i::shutdown (CORBA::Boolean is_clean,
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback,
                               CORBA::Boolean is_clean,
-                              Callback_ptr callback,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              Callback_ptr callback
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
       ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n",
                   is_clean));
-      callback->shutdown (is_clean, ACE_TRY_ENV);
+      callback->shutdown (is_clean TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   ACE_Time_Value tv (0, 20000);
@@ -52,8 +52,8 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
 }
 
 void
-Simple_Server_i::shutdown_now (CORBA::Boolean is_clean,
-                               CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown_now (CORBA::Boolean is_clean
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
@@ -68,14 +68,14 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean,
     }
 
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -83,8 +83,8 @@ Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
 CORBA::Long
 Middle_i::test_method (CORBA::Boolean do_callback,
                        CORBA::Boolean is_clean,
-                       Callback_ptr callback,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       Callback_ptr callback
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int i = 0;
@@ -92,23 +92,23 @@ Middle_i::test_method (CORBA::Boolean do_callback,
     {
       this->server_->test_method (0,
                                   0,
-                                  callback,
-                                  ACE_TRY_ENV);
+                                  callback
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   this->server_->test_method (do_callback,
                               is_clean,
-                              callback,
-                              ACE_TRY_ENV);
+                              callback
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   for (; i != 10; ++i)
     {
       this->server_->test_method (0,
                                   0,
-                                  callback,
-                                  ACE_TRY_ENV);
+                                  callback
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -116,20 +116,20 @@ Middle_i::test_method (CORBA::Boolean do_callback,
 }
 
 void
-Middle_i::shutdown_now (CORBA::Boolean is_clean,
-                        CORBA::Environment& ACE_TRY_ENV)
+Middle_i::shutdown_now (CORBA::Boolean is_clean
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->server_->shutdown_now (is_clean, ACE_TRY_ENV);
+  this->server_->shutdown_now (is_clean TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Middle_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Middle_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->server_->shutdown (ACE_TRY_ENV);
+      this->server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -138,5 +138,5 @@ Middle_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
     }
   ACE_ENDTRY;
 
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
index 648e8e4f0f1..87335c1adb3 100644
--- a/TAO/tests/Faults/test_i.h
+++ b/TAO/tests/Faults/test_i.h
@@ -33,8 +33,8 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (CORBA::Boolean is_clean,
-                 CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (CORBA::Boolean is_clean
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -58,15 +58,15 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
-                           Callback_ptr callback,
-                           CORBA::Environment&)
+                           Callback_ptr callback
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown_now (CORBA::Boolean is_clean,
-                     CORBA::Environment&)
+  void shutdown_now (CORBA::Boolean is_clean
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -90,15 +90,15 @@ public:
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
-                           Callback_ptr callback,
-                           CORBA::Environment&)
+                           Callback_ptr callback
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown_now (CORBA::Boolean is_clean,
-                     CORBA::Environment&)
+  void shutdown_now (CORBA::Boolean is_clean
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index a613869e10e..aec7d4a2464 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -24,9 +24,9 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
     // Create the Default Descriptor Servant
     fd_servant_ (poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_, ACE_TRY_ENV);
+  poa->set_servant (&this->fd_servant_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -35,15 +35,15 @@ FileImpl::System::~System (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (CORBA::Environment &)
+FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
-                        CORBA::Long flags,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Long flags
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
@@ -72,13 +72,13 @@ FileImpl::System::open (const char *file_name,
   // from ACE_HANDLE string
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (oid.in (),
-                                          "IDL:File/Descriptor:1.0",
-                                          ACE_TRY_ENV);
+                                          "IDL:File/Descriptor:1.0"
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
   // Narrow the object reference to a File Descriptor
   File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in (), ACE_TRY_ENV);
+    File::Descriptor::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
@@ -96,26 +96,26 @@ FileImpl::Descriptor::~Descriptor (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (CORBA::Environment &)
+FileImpl::Descriptor::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
 {
   //
   // One way of getting our id.
   //
 
   // Get a reference to myself
-  File::Descriptor_var me = this->_this (ACE_TRY_ENV);
+  File::Descriptor_var me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid1 =
-    this->poa_->reference_to_id (me.in (), ACE_TRY_ENV);
+    this->poa_->reference_to_id (me.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -123,7 +123,7 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
   //
 
   PortableServer::ObjectId_var oid2 =
-    this->poa_->servant_to_id (this, ACE_TRY_ENV);
+    this->poa_->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -131,23 +131,23 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
   //
 
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0, ACE_TRY_ENV);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the POA Current object reference
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("POACurrent",
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references ("POACurrent"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Narrow the object reference to a POA Current reference
   PortableServer::Current_var poa_current =
-    PortableServer::Current::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+    PortableServer::Current::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   PortableServer::ObjectId_var oid3 =
-    poa_current->get_object_id (ACE_TRY_ENV);
+    poa_current->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   ACE_ASSERT (oid1.in () == oid2.in ());
@@ -162,12 +162,12 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Long
-FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
-                             CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   const CORBA::Octet *data = &buffer[0];
@@ -182,12 +182,12 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
 }
 
 File::Descriptor::DataBuffer *
-FileImpl::Descriptor::read (CORBA::Long num_bytes,
-                            CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::read (CORBA::Long num_bytes
+                            TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
@@ -205,12 +205,12 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes,
 
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
-                             CORBA::Long whence,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Long whence
+                             TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
@@ -223,11 +223,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
+  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Close the file corresponding to this object reference.
diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h
index cee4e41d63e..30c6c6f5e5b 100644
--- a/TAO/tests/File_IO/File_i.h
+++ b/TAO/tests/File_IO/File_i.h
@@ -34,35 +34,35 @@ public:
     ~Descriptor (void);
     // Destructor
 
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
     // Returns the default POA of this object
 
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer,
-                               CORBA::Environment &env)
+    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer
+                               TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // write buffer to File corresponding to this Descriptor
 
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes,
-                                                CORBA::Environment &env)
+    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes
+                                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
     // Reads num_bytes from the file and returns it
                        File::IOError));
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
-                                CORBA::Long whence,
-                                CORBA::Environment &env)
+                                CORBA::Long whence
+                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // seek to the offset in file from whence
 
-    virtual void destroy (CORBA::Environment &env)
+    virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
     // closes the file corresponding to the requested ObjectID
 
   private:
 
-    ACE_HANDLE fd (CORBA::Environment &env);
+    ACE_HANDLE fd (TAO_ENV_SINGLE_ARG_DECL);
     // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
@@ -80,12 +80,12 @@ public:
     ~System (void);
     //Destructor
 
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
-                               CORBA::Long flags,
-                               CORBA::Environment &env)
+                               CORBA::Long flags
+                               TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // Opens a file ,creates a Descriptor reference with the
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 78754b993cc..5160344c020 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -75,41 +75,41 @@ parse_args (int argc, char **argv)
 static void *
 MTTEST (void *args)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_CString& ior = *(ACE_CString*)args;
   ACE_TRY
     {
-    CORBA::Object_var object = orb->string_to_object (ior.c_str (),
-                                                      ACE_TRY_ENV);
+    CORBA::Object_var object = orb->string_to_object (ior.c_str ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Narrow the object reference to a File::System
-    File::System_var file_system = File::System::_narrow (object.in (),
-                                                          ACE_TRY_ENV);
+    File::System_var file_system = File::System::_narrow (object.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Creat the file filename i.e "test"
     File::Descriptor_var fd = file_system->open (filename,
-                                                 O_RDONLY,
-                                                 ACE_TRY_ENV);
+                                                 O_RDONLY
+                                                 TAO_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     for( int i=0; i<loops; ++i)
     {
       //seek to the beginning of the file
       ACE_DEBUG((LM_DEBUG,"Making request number %d\n",i));
-      fd->lseek (0, SEEK_SET, ACE_TRY_ENV);
+      fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Read back the written message
       // Twice the size of the socket buffer
-      File::Descriptor::DataBuffer_var data_received = fd->read (128*1024,
-                                                                 ACE_TRY_ENV);
+      File::Descriptor::DataBuffer_var data_received = fd->read (128*1024
+                                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
     // close the file
-    fd->destroy (ACE_TRY_ENV);
+    fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -125,12 +125,12 @@ MTTEST (void *args)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index da008488264..87749551f69 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
   ACE_OS::write (handle, "", 1);
   ACE_OS::close (handle);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -90,17 +90,17 @@ main (int argc, char *argv[])
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (5);
@@ -108,35 +108,35 @@ main (int argc, char *argv[])
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, ACE_TRY_ENV);
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa =
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0;
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -155,17 +155,17 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("FileSystem");
 
       first_poa->activate_object_with_id (file_system_oid.in (),
-                                          &file_system_impl,
-                                          ACE_TRY_ENV);
+                                          &file_system_impl
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var file_system =
-        first_poa->id_to_reference (file_system_oid.in (), ACE_TRY_ENV);
+        first_poa->id_to_reference (file_system_oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the "FileSystem" object
       CORBA::String_var file_system_ior =
-        orb->object_to_string (file_system.in (), ACE_TRY_ENV);
+        orb->object_to_string (file_system.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
@@ -182,7 +182,7 @@ main (int argc, char *argv[])
 
       // set the state of the poa_manager to active i.e ready to
       // process requests
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker (orb.in ());
@@ -217,12 +217,12 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Run the ORB for atmost 75 seconds
       ACE_Time_Value tv (75, 0);
-      this->orb_->run (tv, ACE_TRY_ENV);
+      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index d2ecf591d29..74fb63e708f 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -52,7 +52,7 @@ public:
   Worker (CORBA::ORB_ptr orb);
   // Constructor
 
-  virtual void run_test (CORBA::Environment &ACE_TRY_ENV);
+  virtual void run_test (TAO_ENV_SINGLE_ARG_DECL);
   // The actual implementation of the test
 
   // = The Task_Base methods
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -85,12 +85,12 @@ main (int argc, char *argv[])
 
       ACE_Time_Value tv (5, 0);
 
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now run a test in the main thread, just to confuse matters a
       // little more.
-      worker.run_test (ACE_TRY_ENV);
+      worker.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       worker.thr_mgr ()->wait ();
@@ -98,18 +98,18 @@ main (int argc, char *argv[])
       if (do_shutdown)
         {
           CORBA::Object_var object =
-            orb->string_to_object (ior, ACE_TRY_ENV);
+            orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           Simple_Server_var server =
-            Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+            Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -135,7 +135,7 @@ Worker::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->run_test (ACE_TRY_ENV);
+      this->run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -149,16 +149,16 @@ Worker::svc (void)
 }
 
 void
-Worker::run_test (CORBA::Environment &ACE_TRY_ENV)
+Worker::run_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   for (int j = 0; j != niterations; ++j)
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior, ACE_TRY_ENV);
+        this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Boolean is_simple_server =
-        object->_is_a ("IDL:Simple_Server:1.0", ACE_TRY_ENV);
+        object->_is_a ("IDL:Simple_Server:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (!is_simple_server)
         ACE_DEBUG ((LM_DEBUG,
@@ -166,11 +166,11 @@ Worker::run_test (CORBA::Environment &ACE_TRY_ENV)
     }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior, ACE_TRY_ENV);
+    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+    Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -184,7 +184,7 @@ Worker::run_test (CORBA::Environment &ACE_TRY_ENV)
   for (int i = 0; i != niterations; ++i)
     {
       CORBA::Boolean r =
-        server->test_is_a ("IDL:Foo:1.0", ACE_TRY_ENV);
+        server->test_is_a ("IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (r != 0)
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index acd0a523c8a..c1978fab285 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -18,14 +18,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -40,15 +40,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -65,25 +65,25 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references("IORTable", ACE_TRY_ENV);
+        orb->resolve_initial_references("IORTable" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var table =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (table.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the IORTable.\n"),
                           1);
-      table->bind ("Simple_Server", ior.in (), ACE_TRY_ENV);
+      table->bind ("Simple_Server", ior.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -97,10 +97,10 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index b972bb9ff01..ede8a267b1b 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -9,8 +9,8 @@
 ACE_RCSID(Forwarding, test_i, "$Id$")
 
 CORBA::Boolean
-Simple_Server_i::test_is_a (const char * /* type */,
-                            CORBA::Environment&)
+Simple_Server_i::test_is_a (const char * /* type */
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a %s\n", type));
@@ -18,8 +18,8 @@ Simple_Server_i::test_is_a (const char * /* type */,
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h
index 8627dc3768e..e8ce284c368 100644
--- a/TAO/tests/Forwarding/test_i.h
+++ b/TAO/tests/Forwarding/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Boolean test_is_a (const char * type, CORBA::Environment&)
+  CORBA::Boolean test_is_a (const char * type TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index ed757e48b2a..dc959b7650c 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (CORBA::Environment &)
+Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Hello::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 1c18d055e45..d2f8b87923b 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
+                           "-k <ior> "
                            "\n",
                            argv [0]),
                           -1);
@@ -39,18 +39,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Hello::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hello.in ()))
@@ -62,16 +62,16 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (ACE_TRY_ENV);
+        hello->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (ACE_TRY_ENV);
+      hello->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index 339a0d5ab71..37e44cc4c33 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (ACE_TRY_ENV);
+        hello_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (hello.in (), ACE_TRY_ENV);
+        orb->object_to_string (hello.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,22 +82,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index a5aa746de5a..d46d46e94ef 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -42,25 +42,25 @@ class aloha_i : public virtual POA_aloha
 {
 };
 
-int 
+int
 main (int argc , char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                            argv, 
-                                            "", 
-                                            ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", 
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), 
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test of pragma prefix handling.
@@ -71,7 +71,7 @@ main (int argc , char *argv[])
 
       hello_i h;
 
-      obj = h._this (ACE_TRY_ENV);
+      obj = h._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -86,13 +86,13 @@ main (int argc , char *argv[])
 
       goodbye_i g;
 
-      obj = g._this (ACE_TRY_ENV);
+      obj = g._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/goodbye:1.0"))
-        {          
+        {
           ACE_DEBUG ((LM_DEBUG,
                       "pragma prefix error in object 'goodbye'\n"));
 
@@ -101,13 +101,13 @@ main (int argc , char *argv[])
 
       sayonara_i s;
 
-      obj = s._this (ACE_TRY_ENV);
+      obj = s._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:hammer.com/salutation/sayonara:1.0"))
-        {          
+        {
           ACE_DEBUG ((LM_DEBUG,
                       "pragma prefix error in object 'sayonara'\n"));
 
@@ -116,13 +116,13 @@ main (int argc , char *argv[])
 
       ciao_i c;
 
-      obj = c._this (ACE_TRY_ENV);
+      obj = c._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/ciao:1.0"))
-        {          
+        {
           ACE_DEBUG ((LM_DEBUG,
                       "pragma prefix error in object 'ciao'\n"));
 
@@ -131,13 +131,13 @@ main (int argc , char *argv[])
 
       aloha_i a;
 
-      obj = a._this (ACE_TRY_ENV);
+      obj = a._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (obj->_interface_repository_id (),
                           "IDL:anvil.com/aloha:1.0"))
-        {          
+        {
           ACE_DEBUG ((LM_DEBUG,
                       "pragma prefix error in object 'aloha'\n"));
 
@@ -172,13 +172,13 @@ main (int argc , char *argv[])
                   str));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Unexpected exception in main");
       return 1;
     }
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index abdef9c52d0..0e8a36929f6 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -32,50 +32,50 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IORManipulation Tests.\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
                                              argv,
-                                             "",
-                                             ACE_TRY_ENV);
+                                             ""
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
 
       // Get an object reference for the ORBs IORManipulation object!
       CORBA::Object_var IORM =
-        orb_->resolve_initial_references ("IORManipulation",
-                                          ACE_TRY_ENV);
+        orb_->resolve_initial_references ("IORManipulation"
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation_var iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in (),
-                                                ACE_TRY_ENV);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
 
       // Create a few fictitious IORs
       CORBA::Object_var name1 =
-        orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz",
-                                ACE_TRY_ENV);
+        orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz"
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Object_var name2 =
-        orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz",
-                                ACE_TRY_ENV);
+        orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz"
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
 
       CORBA::String_var name1_ior =
-        orb_->object_to_string (name1.in (), ACE_TRY_ENV);
+        orb_->object_to_string (name1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "\tFirst made up IOR = %s\n", name1_ior.in ()));
 
       CORBA::String_var name2_ior =
-        orb_->object_to_string (name2.in (), ACE_TRY_ENV);
+        orb_->object_to_string (name2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "\tSecond made up IOR = %s\n", name2_ior.in ()));
 
@@ -87,21 +87,21 @@ main (int argc, char *argv[])
       iors [0] = name1;
       iors [1] = name2;
 
-      CORBA::Object_var merged = iorm->merge_iors (iors, ACE_TRY_ENV);
+      CORBA::Object_var merged = iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var merged_ior =
-        orb_->object_to_string (merged.in (), ACE_TRY_ENV);
+        orb_->object_to_string (merged.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong count1 = iorm->get_profile_count (iors [0], ACE_TRY_ENV);
+      CORBA::ULong count1 = iorm->get_profile_count (iors [0] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong count2 = iorm->get_profile_count (iors [1], ACE_TRY_ENV);
+      CORBA::ULong count2 = iorm->get_profile_count (iors [1] TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong count = iorm->get_profile_count (merged.in (),
-                                                    ACE_TRY_ENV);
+      CORBA::ULong count = iorm->get_profile_count (merged.in ()
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count != (count1 + count2))
@@ -116,8 +116,8 @@ main (int argc, char *argv[])
       // is_in_ior throws an exception if the intersection of the two
       // IORs is NULL.
       CORBA::ULong in_count = iorm->is_in_ior (merged.in (),
-                                               name1.in (),
-                                               ACE_TRY_ENV);
+                                               name1.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != in_count)
@@ -127,8 +127,8 @@ main (int argc, char *argv[])
                     in_count));
 
       in_count = iorm->is_in_ior (merged.in (),
-                                  name2.in (),
-                                  ACE_TRY_ENV);
+                                  name2.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != in_count)
@@ -142,14 +142,14 @@ main (int argc, char *argv[])
       // Verify ability to remove profiles from an IOR
       // First remove the second IOR from the merged IOR
       CORBA::Object_var just1 =
-        iorm->remove_profiles (merged.in (), name2.in (), ACE_TRY_ENV);
+        iorm->remove_profiles (merged.in (), name2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var just1_ior =
-        orb_->object_to_string (just1.in (), ACE_TRY_ENV);
+        orb_->object_to_string (just1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      count = iorm->get_profile_count (just1.in (), ACE_TRY_ENV);
+      count = iorm->get_profile_count (just1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != count)
@@ -162,7 +162,7 @@ main (int argc, char *argv[])
                   count,
                   just1_ior.in ()));
 
-      in_count = iorm->is_in_ior (just1.in (), name1.in (), ACE_TRY_ENV);
+      in_count = iorm->is_in_ior (just1.in (), name1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != in_count)
@@ -175,10 +175,10 @@ main (int argc, char *argv[])
 
       // Now try the add_profiles interface.
       CORBA::Object_var merged2 =
-        iorm->add_profiles (just1.in (), name2.in (), ACE_TRY_ENV);
+        iorm->add_profiles (just1.in (), name2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      count = iorm->get_profile_count (merged2.in (), ACE_TRY_ENV);
+      count = iorm->get_profile_count (merged2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count != (count1 + count2))
@@ -186,7 +186,7 @@ main (int argc, char *argv[])
                     "**ERROR: add_profile failed profile count test!\n"));
 
       CORBA::String_var merged2_ior =
-        orb_->object_to_string (merged2.in (), ACE_TRY_ENV);
+        orb_->object_to_string (merged2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -196,7 +196,7 @@ main (int argc, char *argv[])
 
       // is_in_ior throws an exception if the intersection of the two
       // IORs is NULL.
-      in_count = iorm->is_in_ior (merged2.in (), name1. in (), ACE_TRY_ENV);
+      in_count = iorm->is_in_ior (merged2.in (), name1. in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != in_count)
@@ -205,7 +205,7 @@ main (int argc, char *argv[])
                     "count bad (%d)!\n",
                     in_count));
 
-      in_count = iorm->is_in_ior (merged2.in (), name2.in (), ACE_TRY_ENV);
+      in_count = iorm->is_in_ior (merged2.in (), name2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != in_count)
@@ -216,14 +216,14 @@ main (int argc, char *argv[])
       // **********************************************************************
 
       CORBA::Object_var just2 =
-        iorm->remove_profiles (merged2.in (), name1.in (), ACE_TRY_ENV);
+        iorm->remove_profiles (merged2.in (), name1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var just2_ior =
-        orb_->object_to_string (just2.in (), ACE_TRY_ENV);
+        orb_->object_to_string (just2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      count = iorm->get_profile_count (just2.in (), ACE_TRY_ENV);
+      count = iorm->get_profile_count (just2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != count)
@@ -234,7 +234,7 @@ main (int argc, char *argv[])
                   count,
                   just2_ior.in ()));
 
-      in_count = iorm->is_in_ior (just2.in (), name2.in (), ACE_TRY_ENV);
+      in_count = iorm->is_in_ior (just2.in (), name2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != in_count)
@@ -247,7 +247,7 @@ main (int argc, char *argv[])
       Status = 1;
       // Finally generate an exception and quit.
       // This will generate a NotFound exception.
-      in_count = iorm->is_in_ior (just2.in (), name1.in (), ACE_TRY_ENV);
+      in_count = iorm->is_in_ior (just2.in (), name1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index e6f9e1a5d1b..3e843c3a1c3 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -8,14 +8,14 @@ main (int argc, char *argv[])
 {
   int i = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Retrieve a reference to the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (argc < 2)
@@ -33,7 +33,7 @@ main (int argc, char *argv[])
             {
               // List initial services
               CORBA::ORB::ObjectIdList_var list =
-                orb->list_initial_services (ACE_TRY_ENV);
+                orb->list_initial_services (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               size_t length = list->length ();
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
             }
           else
             {
-              objref = orb->resolve_initial_references (argv[i], ACE_TRY_ENV);
+              objref = orb->resolve_initial_references (argv[i] TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (objref.in ()))
@@ -73,8 +73,8 @@ main (int argc, char *argv[])
                                    "given name.\n"),
                                   -1);
 
-              INS_var server = INS::_narrow (objref.in (),
-                                                 ACE_TRY_ENV);
+              INS_var server = INS::_narrow (objref.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -82,8 +82,8 @@ main (int argc, char *argv[])
                           argv[i],
                           orb->object_to_string (server.in ())));
 
-              CORBA::String_var test_ins_result = 
-                server->test_ins (ACE_TRY_ENV);
+              CORBA::String_var test_ins_result =
+                server->test_ins (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index 26bd72579b2..a65bffc9c54 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -16,12 +16,12 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       if (server.init (argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
+                       argv
+                       TAO_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index 5621980ddb2..97b776c45ff 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -77,15 +77,15 @@ Server_i::add_IOR_to_table (CORBA::String_var ior)
 
       CORBA::Object_var table_object =
         this->orb_manager_.orb ()->resolve_initial_references (
-            "IORTable",
-            ACE_TRY_ENV);
+            "IORTable"
+            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      adapter->bind (this->ins_, ior.in (), ACE_TRY_ENV);
+      adapter->bind (this->ins_, ior.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, ex)
@@ -100,15 +100,15 @@ Server_i::add_IOR_to_table (CORBA::String_var ior)
 // Initialize the server.
 int
 Server_i::init (int argc,
-                char *argv[],
-                CORBA::Environment &ACE_TRY_ENV)
+                char *argv[]
+                TAO_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -133,8 +133,8 @@ Server_i::init (int argc,
     {
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa ("INS_servant",
-                                                     &this->servant_,
-                                                     ACE_TRY_ENV);
+                                                     &this->servant_
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -167,10 +167,10 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (CORBA::Environment &env)
+Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index 28dd76343ce..d15824c425b 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -37,14 +37,14 @@ public:
   // Destructor.
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &env);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
 
   int add_IOR_to_table (CORBA::String_var ior);
   // Add an IOR to the ORB-IOR table.
 
-  int run (CORBA::Environment &env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
 protected:
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index dc53a97fae9..ca19357f5dd 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -109,7 +109,7 @@ public:
 
   int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       ACE_TRY
         {
@@ -134,8 +134,8 @@ public:
                       "Client: Invoking server from thread %t for time %d @ %T\n",
                       work_from_this_thread));
 
-          CORBA::ULong result = this->test_->method (work_from_this_thread,
-                                                     ACE_TRY_ENV);
+          CORBA::ULong result = this->test_->method (work_from_this_thread
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (work_from_this_thread != result)
@@ -185,7 +185,7 @@ public:
 
   int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       ACE_TRY
         {
@@ -205,7 +205,7 @@ public:
           ACE_Time_Value timeout (0,
                                   event_loop_timeout_for_this_thread * 1000);
 
-          this->orb_->run (timeout, ACE_TRY_ENV);
+          this->orb_->run (timeout TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n"));
@@ -237,7 +237,7 @@ private:
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -245,8 +245,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -256,12 +256,12 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR, ACE_TRY_ENV);
+        orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <server> reference.
-      test_var server = test::_narrow (object.in (),
-                                       ACE_TRY_ENV);
+      test_var server = test::_narrow (object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_task (server.in ());
@@ -292,7 +292,7 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 15c7f9ee652..1746658649c 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -54,11 +54,11 @@ public:
 
   int svc (void)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
 
       ACE_TRY
         {
-          this->orb_->run (ACE_TRY_ENV);
+          this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -87,25 +87,25 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -114,12 +114,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -146,8 +146,8 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Server: Event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index c12bcb08073..342ea2ea087 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -10,16 +10,16 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
-test_i::method (CORBA::ULong work,
-                CORBA::Environment &)
+test_i::method (CORBA::ULong work
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index 776e7fc86fc..6395ac7eb07 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -25,11 +25,11 @@ public:
   // ctor.
 
   // = The test interface methods.
-  CORBA::ULong method (CORBA::ULong work,
-                       CORBA::Environment &)
+  CORBA::ULong method (CORBA::ULong work
+                       TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index b3a92ab9689..712ed680558 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -14,8 +14,8 @@ AMI_Manager::AMI_Manager (CORBA::ORB_ptr orb)
 void
 AMI_Manager::start_workers (CORBA::Short worker_count,
                             CORBA::Long milliseconds,
-                            Test::Controller_ptr controller,
-                            CORBA::Environment &)
+                            Test::Controller_ptr controller
+                            TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
@@ -31,10 +31,10 @@ AMI_Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-AMI_Manager::shutdown (CORBA::Environment &ACE_TRY_ENV)
+AMI_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -54,7 +54,7 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_SYNCH_MUTEX mutex;
@@ -69,11 +69,11 @@ Worker::svc (void)
                         -1);
 
         PortableServer::ServantBase_var auto_destroy (handler_impl);
-        handler = handler_impl->_this (ACE_TRY_ENV);
+        handler = handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
-      this->controller_->sendc_worker_started (handler.in (),
-                                               ACE_TRY_ENV);
+      this->controller_->sendc_worker_started (handler.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
@@ -81,8 +81,8 @@ Worker::svc (void)
       ACE_Time_Value tv (0, 1000 * this->milliseconds_);
       ACE_OS::sleep (tv);
 
-      this->controller_->sendc_worker_finished (handler.in (),
-                                                ACE_TRY_ENV);
+      this->controller_->sendc_worker_finished (handler.in ()
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
@@ -90,7 +90,7 @@ Worker::svc (void)
       for (;;)
         {
           ACE_Time_Value tv (0, 1000 * this->milliseconds_);
-          this->orb_->run (tv, ACE_TRY_ENV);
+          this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1);
@@ -117,7 +117,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
 }
 
 void
-Controller_Handler::worker_started (CORBA::Environment &)
+Controller_Handler::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -126,13 +126,13 @@ Controller_Handler::worker_started (CORBA::Environment &)
 
 void
 Controller_Handler::worker_started_excep
-    (Test::AMI_ControllerExceptionHolder* h,
-     CORBA::Environment &ACE_TRY_ENV)
+    (Test::AMI_ControllerExceptionHolder* h
+     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_worker_started (ACE_TRY_ENV);
+      h->raise_worker_started (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -145,7 +145,7 @@ Controller_Handler::worker_started_excep
 }
 
 void
-Controller_Handler::worker_finished (CORBA::Environment &)
+Controller_Handler::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -154,13 +154,13 @@ Controller_Handler::worker_finished (CORBA::Environment &)
 
 void
 Controller_Handler::worker_finished_excep
-    (Test::AMI_ControllerExceptionHolder *h,
-     CORBA::Environment &ACE_TRY_ENV)
+    (Test::AMI_ControllerExceptionHolder *h
+     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_worker_finished (ACE_TRY_ENV);
+      h->raise_worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index f2517bedf7f..84ca8247dd5 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -24,10 +24,10 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              Test::Controller_ptr controller
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -70,15 +70,15 @@ public:
                       int *pending_replies);
   // Constructor
 
-  virtual void worker_started (CORBA::Environment &ACE_TRY_ENV)
+  virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder*,
-                                     CORBA::Environment &ACE_TRY_ENV)
+  virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder*
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished (CORBA::Environment &ACE_TRY_ENV)
+  virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder*,
-                                      CORBA::Environment &ACE_TRY_ENV)
+  virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder*
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index c519ceec7a5..b9b9a2d1685 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -14,8 +14,8 @@ Manager::Manager (CORBA::ORB_ptr orb)
 void
 Manager::start_workers (CORBA::Short worker_count,
                         CORBA::Long milliseconds,
-                        Test::Controller_ptr controller,
-                        CORBA::Environment &)
+                        Test::Controller_ptr controller
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
@@ -30,10 +30,10 @@ Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-Manager::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -52,10 +52,10 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->controller_->worker_started (ACE_TRY_ENV);
+      this->controller_->worker_started (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
@@ -63,7 +63,7 @@ Worker::svc (void)
       ACE_Time_Value tv (0, 1000 * this->milliseconds_);
       ACE_OS::sleep (tv);
 
-      this->controller_->worker_finished (ACE_TRY_ENV);
+      this->controller_->worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index cabf27d0b5d..31cf037ced8 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -26,10 +26,10 @@ public:
   // = The skeleton methods
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
-                              Test::Controller_ptr controller,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              Test::Controller_ptr controller
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index f5207ae0fb6..a4ed57650f7 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -14,15 +14,15 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
 }
 
 void
-Manager_Handler::start_workers (CORBA::Environment &ACE_TRY_ENV)
+Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       this->manager_->start_workers (CORBA::Short(10),
                                      CORBA::Long(1000),
-                                     this->controller_.in (),
-                                     ACE_TRY_ENV);
+                                     this->controller_.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -34,13 +34,13 @@ Manager_Handler::start_workers (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_start_workers (ACE_TRY_ENV);
+      holder->raise_start_workers (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index 94f1e3b3427..bc489e678b1 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -25,10 +25,10 @@ public:
   // Constructor
 
   // = The skeleton methods
-  virtual void start_workers (CORBA::Environment &ACE_TRY_ENV)
+  virtual void start_workers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder*,
-                                    CORBA::Environment &ACE_TRY_ENV)
+  virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder*
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index 4cb612e5fb8..64d285abdd4 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -18,13 +18,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior>"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,11 +39,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -65,14 +65,14 @@ main (int argc, char *argv[])
       Controller controller_impl;
 
       Test::Controller_var controller =
-        controller_impl._this (ACE_TRY_ENV);
+        controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->string_to_object (ior, ACE_TRY_ENV);
+      object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (manager.in ()))
@@ -83,33 +83,33 @@ main (int argc, char *argv[])
       Manager_Handler handler_impl (manager.in (),
                                     controller.in ());
       Test::AMI_ManagerHandler_var handler =
-        handler_impl._this (ACE_TRY_ENV);
+        handler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const CORBA::Short worker_count = 10;
       manager->sendc_start_workers (handler.in (),
                                     worker_count,
                                     CORBA::Long (1000),
-                                    controller.in (),
-                                    ACE_TRY_ENV);
+                                    controller.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (30, 0);
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       controller_impl.dump_results ();
 
-      manager->shutdown (ACE_TRY_ENV);
+      manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index a05f10333d7..6eeacf2732d 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
       AMI_Manager manager_impl (orb.in ());
 
       Test::Manager_var manager =
-        manager_impl._this (ACE_TRY_ENV);
+        manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (manager.in (), ACE_TRY_ENV);
+        orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -77,22 +77,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index 870496069e3..12e9fd95501 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior>"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -64,14 +64,14 @@ main (int argc, char *argv[])
       Controller controller_impl;
 
       Test::Controller_var controller =
-        controller_impl._this (ACE_TRY_ENV);
+        controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->string_to_object (ior, ACE_TRY_ENV);
+      object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (manager.in ()))
@@ -80,25 +80,25 @@ main (int argc, char *argv[])
                           1);
 
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const CORBA::Short worker_count = 10;
       manager->start_workers (worker_count,
                               CORBA::Long (1000),
-                              controller.in (),
-                              ACE_TRY_ENV);
+                              controller.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       controller_impl.dump_results ();
 
-      manager->shutdown (ACE_TRY_ENV);
+      manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 05af445eb9f..5a58dbfd8f7 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
       Manager manager_impl (orb.in ());
 
       Test::Manager_var manager =
-        manager_impl._this (ACE_TRY_ENV);
+        manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (manager.in (), ACE_TRY_ENV);
+        orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -77,22 +77,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index d81e4ace056..e15389d644c 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -48,18 +48,18 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Simple_Server_ptr server,
-          CORBA::Environment &ACE_TRY_ENV);
+run_test (Simple_Server_ptr server
+          TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -67,23 +67,23 @@ main (int argc, char *argv[])
 
       // Primary server
       CORBA::Object_var object_primary =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Secondary server
       CORBA::Object_var object_secondary =
-        orb->string_to_object (name, ACE_TRY_ENV);
+        orb->string_to_object (name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA_Object_ptr IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0,
-                                         ACE_TRY_ENV);
+                                         0
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM, ACE_TRY_ENV);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
@@ -91,12 +91,12 @@ main (int argc, char *argv[])
       iors [0] = object_primary;
       iors [1] = object_secondary;
 
-      CORBA_Object_var merged = iorm->merge_iors (iors, ACE_TRY_ENV);
+      CORBA_Object_var merged = iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Combined IOR stuff
       Simple_Server_var server =
-        Simple_Server::_narrow (merged.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (merged.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in (), ACE_TRY_ENV);
+      run_test (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -119,8 +119,8 @@ main (int argc, char *argv[])
   return 0;
 }
 
-void run_test (Simple_Server_ptr server,
-               CORBA::Environment &ACE_TRY_ENV)
+void run_test (Simple_Server_ptr server
+               TAO_ENV_ARG_DECL)
 {
   for (int loop = 0; loop < 10; loop++)
     {
@@ -129,7 +129,7 @@ void run_test (Simple_Server_ptr server,
           // Make a remote call
           cout << "Remote call "<<endl;
           CORBA::Long ret=
-            server->remote_call (ACE_TRY_ENV);
+            server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           cout << "The retval is .. " << ret << endl;
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index 7d91591bccc..0edb0a7bd20 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,15 +51,15 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,35 +68,35 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-
-      orb->run (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index 700a76a2070..c7d8400ef38 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -49,7 +49,7 @@ int
 main (int argc,
       char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   Manager manager;
 
@@ -57,20 +57,20 @@ main (int argc,
     {
       // Initilaize the ORB, POA etc.
       manager.init (argc,
-                    argv,
-                    ACE_TRY_ENV);
+                    argv
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
-      manager.activate_servant (ACE_TRY_ENV);
+      manager.activate_servant (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      manager.make_iors_register (ACE_TRY_ENV);
+      manager.make_iors_register (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      manager.run (ACE_TRY_ENV);
+      manager.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -93,31 +93,31 @@ Manager::Manager (void)
 
 int
 Manager::init (int argc,
-               char *argv[],
-               CORBA::Environment &ACE_TRY_ENV)
+               char *argv[]
+               TAO_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0,
-                                ACE_TRY_ENV);
+                                0
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in (), ACE_TRY_ENV);
+    PortableServer::POA::_narrow (obj_var.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (ACE_TRY_ENV);
+    root_poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  poa_manager_var->activate (ACE_TRY_ENV);
+  poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Policies for the childPOA to be created.
@@ -127,26 +127,26 @@ Manager::init (int argc,
   // The next two policies are common to both
   // Id Assignment Policy
   policies[0] =
-    root_poa_var->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+    root_poa_var->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Lifespan policy
   policies[1] =
-    root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
+    root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Tell the POA to use a servant manager
   policies[2] =
-    root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER,
-                                                    ACE_TRY_ENV);
+    root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Servant Retention Policy -> Use a locator
   policies[3] =
-    root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN,
-                                                   ACE_TRY_ENV);
+    root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_CString name = "newPOA";
@@ -154,8 +154,8 @@ Manager::init (int argc,
   new_poa_var_ =
     root_poa_var->create_POA (name.c_str (),
                               poa_manager_var.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Creation of childPOAs is over. Destroy the Policy objects.
@@ -164,7 +164,7 @@ Manager::init (int argc,
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
+      policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -173,7 +173,7 @@ Manager::init (int argc,
 
 
 int
-Manager::activate_servant (CORBA::Environment &ACE_TRY_ENV)
+Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_NEW_THROW_EX (this->servant_locator_,
@@ -185,8 +185,8 @@ Manager::activate_servant (CORBA::Environment &ACE_TRY_ENV)
 
   // Set ServantLocator object as the servant Manager of
   // secondPOA.
-  this->new_poa_var_->set_servant_manager (this->servant_locator_,
-                                           ACE_TRY_ENV);
+  this->new_poa_var_->set_servant_manager (this->servant_locator_
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Try to create a reference with user created ID in new_poa
@@ -197,7 +197,7 @@ Manager::activate_servant (CORBA::Environment &ACE_TRY_ENV)
 
   this->new_manager_ior_ =
     new_poa_var_->create_reference_with_id (second_foo_oid_var.in (),
-                                            "IDL:Simple_Server:1.0", ACE_TRY_ENV);
+                                            "IDL:Simple_Server:1.0" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -205,18 +205,18 @@ Manager::activate_servant (CORBA::Environment &ACE_TRY_ENV)
 
 
 int
-Manager::make_iors_register (CORBA::Environment &ACE_TRY_ENV)
+Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL)
 {
   // First  server
   CORBA::Object_var object_primary =
-    this->orb_->string_to_object (first_ior,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (first_ior
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //Second server
   CORBA::Object_var object_secondary =
-    this->orb_->string_to_object (second_ior,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (second_ior
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (third_ior == 0)
@@ -224,19 +224,19 @@ Manager::make_iors_register (CORBA::Environment &ACE_TRY_ENV)
                 "Here is the culprit \n"));
   // Third Server
   CORBA::Object_var object_tertiary =
-    this->orb_->string_to_object (third_ior,
-                                  ACE_TRY_ENV);
+    this->orb_->string_to_object (third_ior
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA_Object_ptr IORM =
     this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM, ACE_TRY_ENV);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -249,7 +249,7 @@ Manager::make_iors_register (CORBA::Environment &ACE_TRY_ENV)
 
   // Create a merged set 1;
   CORBA_Object_var merged_set1 =
-    iorm->merge_iors (iors, ACE_TRY_ENV);
+    iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (object_secondary.in () == 0)
@@ -268,7 +268,7 @@ Manager::make_iors_register (CORBA::Environment &ACE_TRY_ENV)
 
   // Create merged set 2
   CORBA_Object_var merged_set2 =
-    iorm->merge_iors (iors_again, ACE_TRY_ENV);
+    iorm->merge_iors (iors_again TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::String_var iorref1 =
@@ -293,9 +293,9 @@ Manager::make_iors_register (CORBA::Environment &ACE_TRY_ENV)
 
 
 int
-Manager::run (CORBA::Environment &ACE_TRY_ENV)
+Manager::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run (ACE_TRY_ENV);
+  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h
index c83349cf76e..7c61379f133 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.h
+++ b/TAO/tests/MProfile_Forwarding/Manager.h
@@ -13,20 +13,20 @@ class Manager
   // Ctor
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment & ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
 
   // Initialize the ORB, POA etc.
 
-  int init_register_name_service (CORBA::Environment &ACE_TRY_ENV);
+  int init_register_name_service (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize the Name service, tegister the combined IOR with it
 
-  int activate_servant (CORBA::Environment &ACE_TRY_ENV);
+  int activate_servant (TAO_ENV_SINGLE_ARG_DECL);
   // Activate the servant etc.
 
-  int make_iors_register (CORBA::Environment &);
+  int make_iors_register (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the  ORB event loop..
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index 87751adb169..c3b52c4346b 100755
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -46,7 +46,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::String_var s = PortableServer::ObjectId_to_string (oid);
 
@@ -59,8 +58,8 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
 
   // Combined IOR stuff
   Simple_Server_var server =
-    Simple_Server::_narrow (this->objref_.in (),
-                            ACE_TRY_ENV);
+    Simple_Server::_narrow (this->objref_.in ()
+                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index e52320e373b..10c176b81a7 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -34,18 +34,18 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Simple_Server_ptr server,
-          CORBA::Environment &ACE_TRY_ENV);
+run_test (Simple_Server_ptr server
+          TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) == -1)
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
         }
 
       Simple_Server_var server =
-        Simple_Server::_narrow (objref.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (objref.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
                             -1);
         }
 
-      run_test (server.in (), ACE_TRY_ENV);
+      run_test (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -85,8 +85,8 @@ main (int argc, char *argv[])
   return 0;
 }
 
-void run_test (Simple_Server_ptr server,
-               CORBA::Environment &ACE_TRY_ENV)
+void run_test (Simple_Server_ptr server
+               TAO_ENV_ARG_DECL)
 {
   for (int loop = 0; loop < 10; loop++)
     {
@@ -97,7 +97,7 @@ void run_test (Simple_Server_ptr server,
           ACE_OS::sleep (2);
 
           // Make a remote call
-          server->remote_call (ACE_TRY_ENV);
+          server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           /*ACE_DEBUG ((LM_DEBUG,
@@ -106,7 +106,7 @@ void run_test (Simple_Server_ptr server,
           ACE_DEBUG ((LM_DEBUG, " hope you did\n")); */
           ACE_DEBUG ((LM_DEBUG,
                       "I am going to shutdown \n"));
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (23);
         }
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 47c475b7dd9..1d88b1a6acf 100755
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,15 +51,15 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,35 +68,35 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-
-      orb->run (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index ee57e2b8900..75dbdd84241 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -64,7 +64,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (CORBA::Environment &);
+  void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Validate the connection
 
 private:
@@ -81,18 +81,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -116,11 +116,11 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -144,7 +144,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -153,7 +153,7 @@ Client::validate_connection (CORBA::Environment &ACE_TRY_ENV)
     {
       ACE_TRY
         {
-          this->server_->test_method (ACE_TRY_ENV);
+          this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
@@ -165,12 +165,12 @@ Client::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < this->niterations_; ++i)
         {
-          this->server_->test_method (ACE_TRY_ENV);
+          this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (TAO_debug_level > 0 && i % 100 == 0)
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index d44016f40f1..97b08f0eb11 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -81,11 +81,11 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -133,7 +133,7 @@ Client::Client (int niterations,
 int
 Client::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       for (int i = 0; i < this->niterations_; ++i)
@@ -144,15 +144,15 @@ Client::svc (void)
           CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv");
           char* argv[1] = { argv0.inout () };
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+            CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Object_var object =
-            orb->string_to_object (this->ior_, ACE_TRY_ENV);
+            orb->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           Simple_Server_var server =
-            Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+            Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server.in ()))
@@ -163,7 +163,7 @@ Client::svc (void)
                                 1);
             }
 
-          server->test_method (ACE_TRY_ENV);
+          server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index 83aed347feb..e7a42f825ce 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -64,40 +64,40 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index 0471f96dd5c..b10c633832d 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -9,14 +9,14 @@
 ACE_RCSID(MT_Client, test_i, "$Id$")
 
 void
-Simple_Server_i::test_method (CORBA::Environment&)
+Simple_Server_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index e00aed7b822..8f0642d546b 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -51,18 +51,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
       for (int i = 0; i != niterations; ++i)
         {
           CORBA::Long r =
-            server->test_method (i, ACE_TRY_ENV);
+            server->test_method (i TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (r != i)
@@ -89,7 +89,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 2230b637515..bfc8e14d63f 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -20,18 +20,18 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'n':
-	nthreads = ACE_OS::atoi (get_opts.optarg);
-	break;
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -66,11 +66,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -79,11 +79,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -92,29 +92,29 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker (orb.in ());
@@ -149,10 +149,10 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index c0810d5df9e..cd3bc2abbc3 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&)
+Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -21,8 +21,8 @@ Simple_Server_i::test_method (CORBA::Long x, CORBA::Environment&)
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h
index c49f47c8741..60fdc9a457b 100644
--- a/TAO/tests/MT_Server/test_i.h
+++ b/TAO/tests/MT_Server/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x, CORBA::Environment&)
+  CORBA::Long test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index a397c282a55..5bf38b970dd 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -46,22 +46,22 @@ Client_Task::too_big_difference_calls (void) const
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   int successful_calls = 0;
   int timed_out_calls = 0;
 
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT timeout_period = 10 * this->timeout_;
@@ -73,18 +73,18 @@ Client_Task::svc (void)
       policy_list.length (1);
       policy_list[0] =
         this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                   timeout_as_any,
-                                   ACE_TRY_ENV);
+                                   timeout_as_any
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::ADD_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::ADD_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->iterations_; ++i)
         {
-          int retval = this->one_iteration (ACE_TRY_ENV);
+          int retval = this->one_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (retval == 1)
@@ -118,13 +118,13 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->sleep_service_->go_to_sleep (0, ACE_TRY_ENV);
+          (void) this->sleep_service_->go_to_sleep (0 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -137,14 +137,14 @@ Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Client_Task::one_iteration (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::one_iteration (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
 
-      this->sleep_service_->go_to_sleep (this->sleep_time_,
-                                         ACE_TRY_ENV);
+      this->sleep_service_->go_to_sleep (this->sleep_time_
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value end = ACE_OS::gettimeofday ();
@@ -179,7 +179,7 @@ Client_Task::one_iteration (CORBA::Environment &ACE_TRY_ENV)
               // *way* off, this is an error.
               if (difference > 10)
                 {
-		  this->too_big_difference_++;
+                  this->too_big_difference_++;
                   ACE_ERROR ((LM_ERROR,
                               "(%P|%t) Elapsed time = %d, expected %d\n",
                               elapsed_milliseconds, max_milliseconds));
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index 4a90de6a0e0..34c76abd7bf 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -18,10 +18,10 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (this->running_time_, ACE_TRY_ENV);
+      this->orb_->run (this->running_time_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index bd0aaa8e853..0650e317c9e 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -11,8 +11,8 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb)
 }
 
 void
-Sleep_Service::go_to_sleep (CORBA::ULong microseconds,
-                            CORBA::Environment &)
+Sleep_Service::go_to_sleep (CORBA::ULong microseconds
+                            TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong  secs = microseconds / 1000000;
@@ -23,9 +23,9 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds,
 }
 
 void
-Sleep_Service::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Sleep_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index 11d1561cc74..b25ddd7a66d 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -25,11 +25,11 @@ public:
   Sleep_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void go_to_sleep (CORBA::ULong microseconds,
-                            CORBA::Environment &ACE_TRY_ENV)
+  virtual void go_to_sleep (CORBA::ULong microseconds
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index 4d37ed0605c..ae5308cab04 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -51,18 +51,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Sleep_Service_var sleep_service =
-        Test::Sleep_Service::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Sleep_Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sleep_service.in ()))
@@ -95,13 +95,13 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Get back in sync with the server..
-      sleep_service->go_to_sleep (0, ACE_TRY_ENV);
+      sleep_service->go_to_sleep (0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      sleep_service->shutdown (ACE_TRY_ENV);
+      sleep_service->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -117,24 +117,24 @@ main (int argc, char *argv[])
       // No more than 5 % of the calls are allowed to have a too big
       // difference
       if (task0.too_big_difference_calls () > iterations/20
-	  || task1.too_big_difference_calls () > iterations/20)
-	{
-	  ACE_DEBUG ((LM_DEBUG,
-		      "ERROR: Too many calls have a too big difference between "
-		      "timeout and elapsed time (task0: %d, task1: %d)\n",
-		      task0.too_big_difference_calls (),
-		      task1.too_big_difference_calls ()));
-	}
+          || task1.too_big_difference_calls () > iterations/20)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "ERROR: Too many calls have a too big difference between "
+                      "timeout and elapsed time (task0: %d, task1: %d)\n",
+                      task0.too_big_difference_calls (),
+                      task1.too_big_difference_calls ()));
+        }
       else  if (task0.too_big_difference_calls () != 0
-		|| task1.too_big_difference_calls () != 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Warning: some calls (task0: %d, task1: %d) "
-		      "exceeded their expected elapsed times\n",
-		      task0.too_big_difference_calls (),
-		      task1.too_big_difference_calls ()));
-	}
-	  
+                || task1.too_big_difference_calls () != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Warning: some calls (task0: %d, task1: %d) "
+                      "exceeded their expected elapsed times\n",
+                      task0.too_big_difference_calls (),
+                      task1.too_big_difference_calls ()));
+        }
+
       if (task0.timed_out_calls () == 0)
         {
           ACE_ERROR ((LM_ERROR,
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index efdf1c10f22..91dede3b629 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(sleep_service_impl);
 
       Test::Sleep_Service_var process =
-        sleep_service_impl->_this (ACE_TRY_ENV);
+        sleep_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (process.in (), ACE_TRY_ENV);
+        orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (ACE_Thread_Manager::instance (),
@@ -102,10 +102,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index cfd495b7552..d65dfde3c07 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -20,38 +20,38 @@ Bottom_Impl::~Bottom_Impl (void)
 }
 
 char *
-Bottom_Impl::top_quote (CORBA::Environment & )
+Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::top);
 }
 
 char *
-Bottom_Impl::left_quote (CORBA::Environment & )
+Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::left);
 }
 
 char *
-Bottom_Impl::right_quote (CORBA::Environment & )
+Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::right);
 }
 
 char *
-Bottom_Impl::bottom_quote (CORBA::Environment & )
+Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::bottom);
 }
 
 void
-Bottom_Impl::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 ///////////////////////////////////////////////////////////
@@ -70,64 +70,64 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void)
 }
 
 char *
-Delegated_Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV)
+Delegated_Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <top_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->top_quote (ACE_TRY_ENV);
+    this->delegate_->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::left_quote (CORBA::Environment &ACE_TRY_ENV)
+Delegated_Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <left_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->left_quote (ACE_TRY_ENV);
+    this->delegate_->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::right_quote (CORBA::Environment &ACE_TRY_ENV)
+Delegated_Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <right_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->right_quote (ACE_TRY_ENV);
+    this->delegate_->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::bottom_quote (CORBA::Environment &ACE_TRY_ENV)
+Delegated_Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <bottom_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->bottom_quote (ACE_TRY_ENV);
+    this->delegate_->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 void
-Delegated_Bottom_Impl::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Delegated_Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating Shut-Down.\n")));
-  this->delegate_->shutdown (ACE_TRY_ENV);
-  //this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->delegate_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  //this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 79e171ef16e..796976b3470 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -6,18 +6,18 @@ ACE_RCSID (tests, client, "$Id$")
 
 int main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // ORB Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
 
       // Get The IOR from a file
-      object = orb->string_to_object ("file://s.ior", ACE_TRY_ENV);
+      object = orb->string_to_object ("file://s.ior" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -27,7 +27,7 @@ int main (int argc, char *argv[])
         }
 
       Collocation_Tester tester (object.in ());
-      tester.run (ACE_TRY_ENV);
+      tester.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index 576e662898a..403530d1b21 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -7,24 +7,24 @@ ACE_RCSID (tests, server, "$Id$")
 int main (int argc, char *argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Orb Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
-      object = orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in(), ACE_TRY_ENV);
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // Get the POAManager
-      PortableServer::POAManager_var poa_manager = poa->the_POAManager(ACE_TRY_ENV);
+      PortableServer::POAManager_var poa_manager = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the servant.
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
 
       // Now we stringfy the object reference.
       CORBA::String_var ior =
-        orb->object_to_string (bottom.in (), ACE_TRY_ENV);
+        orb->object_to_string (bottom.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -58,7 +58,7 @@ int main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Activate the POAManager
-      poa_manager->activate(ACE_TRY_ENV);
+      poa_manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run();
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 4618dbcbb18..5f1a4b00dba 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -38,13 +38,13 @@ parse_args (int argc, char **argv)
         ior = get_opts.optarg;
         break;
       case 'f':
-	ior_input_file = get_opts.optarg;
-	break;
+        ior_input_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "\nusage:  %s "
-			   "-i <ior_input_file> "
+                           "-i <ior_input_file> "
                            "-k IOR "
                            "\n",
                            argv [0]),
@@ -54,13 +54,13 @@ parse_args (int argc, char **argv)
   if (ior == 0 && ior_input_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "\nPlease specify the IOR or IOR input file"
-		       " for the servant"),
-		      -1);
+                       " for the servant"),
+                      -1);
   if (ior != 0 && ior_input_file != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "\nPlease specify only an IOR or only an IOR"
-		       " input file but not both"),
-		      -1);
+                       "\nPlease specify only an IOR or only an IOR"
+                       " input file but not both"),
+                      -1);
 
   // Indicates successful parsing of the command line.
   return 0;
@@ -69,12 +69,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0,
-                                            ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
@@ -100,62 +100,62 @@ main (int argc, char **argv)
           ior_buffer.alloc ()-> free (data);
           ACE_OS::close (input_file);
         }
-      
+
       // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (ior, ACE_TRY_ENV);
+      CORBA::Object_var object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var string;
 
       // Narrow the object reference
-      A_var a = A::_narrow (object.in (), ACE_TRY_ENV);
+      A_var a = A::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      B_var b = B::_narrow (a.in (), ACE_TRY_ENV);
+      B_var b = B::_narrow (a.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      C_var c = C::_narrow (a.in (), ACE_TRY_ENV);
+      C_var c = C::_narrow (a.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      D_var d = D::_narrow (c.in (), ACE_TRY_ENV);
+      D_var d = D::_narrow (c.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      string = a->method1 (ACE_TRY_ENV);
+      string = a->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method1 (ACE_TRY_ENV);
+      string = b->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method2 (ACE_TRY_ENV);
+      string = b->method2 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method1 (ACE_TRY_ENV);
+      string = c->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method3 (ACE_TRY_ENV);
+      string = c->method3 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method1 (ACE_TRY_ENV);
+      string = d->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method2 (ACE_TRY_ENV);
+      string = d->method2 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method3 (ACE_TRY_ENV);
+      string = d->method3 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method4 (ACE_TRY_ENV);
+      string = d->method4 (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
     }
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index 43c0343fcb3..42a5d54f11c 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -48,13 +48,13 @@ main (int argc, char **argv)
   TAO_ORB_Manager orb_manager;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       orb_manager.init_child_poa (argc,
                                   argv,
-                                  "child_poa",
-                                  ACE_TRY_ENV);
+                                  "child_poa"
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -62,8 +62,8 @@ main (int argc, char **argv)
 
       CORBA::String_var ior =
         orb_manager.activate_under_child_poa ("my_object",
-                                              &servant,
-                                              ACE_TRY_ENV);
+                                              &servant
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s\n",
@@ -82,7 +82,7 @@ main (int argc, char **argv)
           ACE_OS::fclose (output_file);
         }
 
-      orb_manager.run (ACE_TRY_ENV);
+      orb_manager.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index dccfc7aee2a..52a2ea3a368 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -27,12 +27,12 @@ Client_Task::svc (void)
   for (CORBA::ULong j = 0; j != payload.length (); ++j)
     payload[j] = (j % 256);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
-          this->receiver_->receive_data (payload, ACE_TRY_ENV);
+          this->receiver_->receive_data (payload TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index fb342f25dc3..ddeb77de007 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -23,8 +23,8 @@ Receiver::dump_results ()
 }
 
 void
-Receiver::receive_data (const Test::Payload &payload,
-                        CORBA::Environment &)
+Receiver::receive_data (const Test::Payload &payload
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -33,7 +33,7 @@ Receiver::receive_data (const Test::Payload &payload,
 }
 
 CORBA::Long
-Receiver::get_event_count (CORBA::Environment &)
+Receiver::get_event_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index a18172927f5..227c4c785a7 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -31,10 +31,10 @@ public:
   void dump_results (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &payload,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_data (const Test::Payload &payload
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Long get_event_count (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::Long get_event_count (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index a011605622d..e23e16908a2 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -17,12 +17,12 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // run the test for at most 120 seconds...
       ACE_Time_Value tv (120, 0);
-      this->orb_->run (tv, ACE_TRY_ENV);
+      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index 492dcc1fc77..348025219f9 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior>"
+                           "-k <ior>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,18 +38,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Receiver_var receiver =
-        Test::Receiver::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (receiver.in ()))
@@ -72,13 +72,13 @@ main (int argc, char *argv[])
         }
       ACE_Thread_Manager::instance ()->wait ();
 
-      CORBA::Long count = receiver->get_event_count (ACE_TRY_ENV);
+      CORBA::Long count = receiver->get_event_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
                   count));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index 602f2aea07c..b0481c089ee 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -18,13 +18,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,11 +39,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
       Test::Receiver_var receiver =
-        receiver_impl->_this (ACE_TRY_ENV);
+        receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (receiver.in (), ACE_TRY_ENV);
+        orb->object_to_string (receiver.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,11 +82,11 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in (),
@@ -100,10 +100,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index abd189164d2..14d564729cf 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -9,7 +9,7 @@
 //    MT_Object_i.cpp
 //
 // = DESCRIPTION
-//    This class implements the Object A  of the 
+//    This class implements the Object A  of the
 //    Nested Upcalls - MT Client test.
 //
 // = AUTHORS
@@ -37,8 +37,8 @@ MT_Object_i::~MT_Object_i (void)
 
 CORBA::Long
 MT_Object_i::yadda (CORBA::Long hop_count,
-                       MT_Object_ptr partner,
-                       CORBA::Environment &env)
+                       MT_Object_ptr partner
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -48,7 +48,9 @@ MT_Object_i::yadda (CORBA::Long hop_count,
   if (hop_count < MAX_HOP_COUNT)
   {
     if (partner != 0)
-      return partner->yadda (hop_count + 1, this->_this (env), env) + 1;
+      return partner->yadda (hop_count + 1,
+                             this->_this (TAO_ENV_SINGLE_ARG_PARAMETER)
+                             TAO_ENV_ARG_PARAMETER) + 1;
   }
 
   return 0;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index 2421abb2dea..ccfad73f3ab 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -36,8 +36,8 @@ public:
   // Destructor.
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
-                             MT_Object_ptr partner,
-                             CORBA::Environment &_tao_environment)
+                             MT_Object_ptr partner
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 2ede15e0127..fb2c7d74986 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -146,7 +146,7 @@ MT_Client::parse_args (void)
 int
 MT_Client::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       for (unsigned long i = 0; i < this->iterations_; i++)
@@ -159,8 +159,8 @@ MT_Client::run (void)
           // call the recursive object MT_Object for nested upcalls
           // testing
           this->mT_Object_var_->yadda (0,
-                                       0,
-                                       ACE_TRY_ENV);
+                                       0
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -198,7 +198,7 @@ MT_Client::init (int argc, char **argv,
 
   this->client_number_ = client_number;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       char buf[64];
@@ -207,8 +207,8 @@ MT_Client::init (int argc, char **argv,
       this->orb_var_ =
         CORBA::ORB_init (this->argc_,
                          this->argv_,
-                         buf,
-                         ACE_TRY_ENV);
+                         buf
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -222,8 +222,8 @@ MT_Client::init (int argc, char **argv,
 
 
       CORBA::Object_var object_var =
-        this->orb_var_->string_to_object (this->object_key_,
-                                          ACE_TRY_ENV);
+        this->orb_var_->string_to_object (this->object_key_
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object_var.in()))
@@ -231,8 +231,8 @@ MT_Client::init (int argc, char **argv,
                              "No proper object has been returned.\n"),
                             -1);
 
-      this->mT_Object_var_ = MT_Object::_narrow (object_var.in(),
-                                                 ACE_TRY_ENV);
+      this->mT_Object_var_ = MT_Object::_narrow (object_var.in()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->mT_Object_var_.in()))
@@ -246,7 +246,7 @@ MT_Client::init (int argc, char **argv,
         ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
 
       CORBA::Object_var poa_object =
-        this->orb_var_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        this->orb_var_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -255,14 +255,14 @@ MT_Client::init (int argc, char **argv,
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -282,14 +282,14 @@ MT_Client::init (int argc, char **argv,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       TAO_ORB_Manager orb_manager;
 
       int r = orb_manager.init (argc,
-                                argv,
-                                ACE_TRY_ENV);
+                                argv
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r != 0)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 8c997c45d87..39212cdb3ed 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -142,15 +142,15 @@ MT_Server::init (int argc,
                        "MT_Server::init: ORB_Manager is nil!\n"),
                        -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Call the init of TAO_ORB_Manager to create a child POA
       // under the root POA.
       this->orb_manager_ptr_->init_child_poa (argc,
                                               argv,
-                                              "child_poa",
-                                              ACE_TRY_ENV);
+                                              "child_poa"
+                                              TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -159,8 +159,8 @@ MT_Server::init (int argc,
 
       this->str_  =
         this->orb_manager_ptr_->activate_under_child_poa ("MT",
-                                                          &this->mT_Object_i_,
-                                                          ACE_TRY_ENV);
+                                                          &this->mT_Object_i_
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -184,8 +184,8 @@ MT_Server::init (int argc,
       CORBA::ORB_var orb_var = this->orb_manager_ptr_->orb ();
 
       CORBA::Object_var object_var =
-        orb_var->string_to_object (this->object_key_,
-                                   ACE_TRY_ENV);
+        orb_var->string_to_object (this->object_key_
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object_var.in()))
@@ -193,8 +193,8 @@ MT_Server::init (int argc,
                            "No proper object has been returned.\n"),
                           -1);
 
-      this->mT_Object_var_ = MT_Object::_narrow (object_var.in(),
-                                                 ACE_TRY_ENV);
+      this->mT_Object_var_ = MT_Object::_narrow (object_var.in()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->mT_Object_var_.in()))
@@ -220,10 +220,10 @@ MT_Server::init (int argc,
 int
 MT_Server::run ()
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int r = this->orb_manager_ptr_->run (ACE_TRY_ENV);
+      int r = this->orb_manager_ptr_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
@@ -245,12 +245,12 @@ MT_Server::~MT_Server (void)
   if (this->object_key_ != 0)
     ACE_OS::free (this->object_key_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (this->orb_manager_ptr_)
-        this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in (),
-                                                            ACE_TRY_ENV);
+        this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in ()
+                                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -266,7 +266,7 @@ MT_Server::run_ORB_briefly (void)
 {
   if (this->iterations_ > 0)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -276,12 +276,12 @@ MT_Server::run_ORB_briefly (void)
           for (unsigned int i = 0; i < this->iterations_; i++)
             {
               MT_Object_var tmp =
-                this->mT_Object_i_._this (ACE_TRY_ENV);
+                this->mT_Object_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->mT_Object_var_->yadda (0,
-                                           tmp.in (),
-                                           ACE_TRY_ENV);
+                                           tmp.in ()
+                                           TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index 8fd4340af1d..ec7dbe786a5 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -63,15 +63,15 @@ MT_Object_Server::parse_args (void)
 
 int
 MT_Object_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       char** argv
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa",
-                                     ACE_TRY_ENV);
+                                     "child_poa"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
@@ -82,8 +82,8 @@ MT_Object_Server::init (int argc,
 
   CORBA::String_var str;
   str = this->orb_manager_.activate_under_child_poa ("MT_Object",
-                                                     &this->mT_Object_i_,
-                                                     ACE_TRY_ENV);
+                                                     &this->mT_Object_i_
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -104,9 +104,9 @@ MT_Object_Server::init (int argc,
 
 
 int
-MT_Object_Server::run (CORBA::Environment& env)
+MT_Object_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "NestedUpCalls_Server::run"),
                       -1);
@@ -125,17 +125,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int r = MT_Object_Server.init (argc,argv,ACE_TRY_ENV);
+      int r = MT_Object_Server.init (argc,argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return 1;
       else
         {
-          MT_Object_Server.run (ACE_TRY_ENV);
+          MT_Object_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index b14807e2454..b8d72823b9e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -48,11 +48,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 3330c44b3b0..cf084955ba9 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -49,8 +49,8 @@ Client_Task::svc (void)
 
       // Now, we can invoke an operation on the remote side.
       this->server_->start (this->client_.in (),
-                            call_count,
-                            ACE_TRY_ENV);
+                            call_count
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -120,8 +120,8 @@ main (int argc,
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc,
@@ -129,35 +129,35 @@ main (int argc,
       if (result != 0)
         return result;
 
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA",
-                                                                  ACE_TRY_ENV);
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"
+                                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->string_to_object (ior,
-                                      ACE_TRY_ENV);
+      object = orb->string_to_object (ior
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server_var server = server::_narrow (object.in (),
-                                           ACE_TRY_ENV);
+      server_var server = server::_narrow (object.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an client object to hand to the other side...
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this (ACE_TRY_ENV);
+      client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_tasks (client_object.in (),
@@ -167,13 +167,13 @@ main (int argc,
 
       if (shutdown_server)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp
index 58aed897da2..3e1d975fb28 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp
@@ -10,8 +10,8 @@ client_i::client_i (int quiet,
 }
 
 void
-client_i::ping (CORBA::UShort time_to_live,
-                CORBA::Environment &ACE_TRY_ENV)
+client_i::ping (CORBA::UShort time_to_live
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
@@ -23,8 +23,8 @@ client_i::ping (CORBA::UShort time_to_live,
 
   if (time_to_live > 0)
     {
-      this->server_->ping (time_to_live,
-                           ACE_TRY_ENV);
+      this->server_->ping (time_to_live
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h
index 03ce86be834..d384e305791 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.h
+++ b/TAO/tests/NestedUpcall/Simple/client_i.h
@@ -9,8 +9,8 @@ public:
             server_ptr s);
   // Constructor.
 
-  void ping (CORBA::UShort time_to_live,
-             CORBA::Environment &ACE_TRY_ENV)
+  void ping (CORBA::UShort time_to_live
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 2b9450234cc..d556b0955e6 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -33,10 +33,10 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -120,8 +120,8 @@ main (int argc,
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc,
@@ -129,30 +129,30 @@ main (int argc,
       if (result != 0)
         return result;
 
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA",
-                                                                  ACE_TRY_ENV);
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"
+                                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server_i server_servant (quiet,
                                orb.in ());
 
-      server_var server_object = server_servant._this (ACE_TRY_ENV);
+      server_var server_object = server_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::String_var ior = orb->object_to_string (server_object.in (),
-                                                     ACE_TRY_ENV);
+      CORBA::String_var ior = orb->object_to_string (server_object.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result = write_ior_to_file (ior.in ());
@@ -173,8 +173,8 @@ main (int argc,
         return result;
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 31888a61dc8..9bf81230998 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -11,21 +11,21 @@ server_i::server_i (int quiet,
 
 void
 server_i::start (client_ptr c,
-                 CORBA::UShort time_to_live,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::UShort time_to_live
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
-  this->ping (time_to_live,
-              ACE_TRY_ENV);
+  this->ping (time_to_live
+              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   return;
 }
 
 void
-server_i::ping (CORBA::UShort time_to_live,
-                CORBA::Environment &ACE_TRY_ENV)
+server_i::ping (CORBA::UShort time_to_live
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
@@ -37,17 +37,17 @@ server_i::ping (CORBA::UShort time_to_live,
 
   if (time_to_live > 0)
     {
-      this->client_->ping (time_to_live,
-                           ACE_TRY_ENV);
+      this->client_->ping (time_to_live
+                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-server_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index e1bd4802b1e..805606b8a32 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -8,16 +8,16 @@ public:
   server_i (int quiet,
             CORBA::ORB_ptr orb);
 
-  void ping (CORBA::UShort time_to_live,
-             CORBA::Environment &ACE_TRY_ENV)
+  void ping (CORBA::UShort time_to_live
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void start (client_ptr c,
-              CORBA::UShort time_to_live,
-              CORBA::Environment &ACE_TRY_ENV)
+              CORBA::UShort time_to_live
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index 9bd050ba49c..1ec28af256e 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -52,8 +52,8 @@ Client_Task::svc (void)
 
       // Now, we can invoke an operation on the remote side.
       this->server_->start (this->client_.in (),
-                            call_count,
-                            ACE_TRY_ENV);
+                            call_count
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -129,8 +129,8 @@ main (int argc,
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc,
@@ -138,35 +138,35 @@ main (int argc,
       if (result != 0)
         return result;
 
-      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA",
-                                                                  ACE_TRY_ENV);
+      CORBA::Object_var object = orb->resolve_initial_references ("RootPOA"
+                                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->string_to_object (ior,
-                                      ACE_TRY_ENV);
+      object = orb->string_to_object (ior
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server_var server = server::_narrow (object.in (),
-                                           ACE_TRY_ENV);
+      server_var server = server::_narrow (object.in ()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an client object to hand to the other side...
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this (ACE_TRY_ENV);
+      client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_tasks (client_object.in (),
@@ -177,13 +177,13 @@ main (int argc,
 
       if (shutdown_server)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index 7cc49030b6b..67053270013 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -36,7 +36,7 @@ Initiator_i::~Initiator_i (void)
 }
 
 void
-Initiator_i::foo_object_B (CORBA::Environment &ACE_TRY_ENV)
+Initiator_i::foo_object_B (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -44,8 +44,8 @@ Initiator_i::foo_object_B (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      this->object_B_var_->foo (this->object_A_var_.in (),
-                                ACE_TRY_ENV);
+      this->object_B_var_->foo (this->object_A_var_.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index bdab9cb12af..ec7adc6c3f4 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -38,8 +38,8 @@ Object_A_i::~Object_A_i (void)
 
 
 void
-Object_A_i::foo (Initiator_ptr theInitiator_ptr,
-                    CORBA::Environment &ACE_TRY_ENV)
+Object_A_i::foo (Initiator_ptr theInitiator_ptr
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,7 +47,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr,
 
   ACE_TRY
     {
-      theInitiator_ptr->foo_object_B (ACE_TRY_ENV);
+      theInitiator_ptr->foo_object_B (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       while (!this->finish_two_way_call_)
@@ -64,7 +64,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr,
 }
 
 void
-Object_A_i::finish (CORBA::Environment &)
+Object_A_i::finish (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 3c829cca935..6831a81039b 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -34,11 +34,11 @@ public:
   virtual ~Object_A_i (void);
   // Destructor.
 
-  virtual void foo (Initiator_ptr theInitiator_ptr,
-                    CORBA::Environment &env)
+  virtual void foo (Initiator_ptr theInitiator_ptr
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void finish (CORBA::Environment &env)
+  virtual void finish (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   unsigned long finish_two_way_call_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 49c5912f341..94654d06bd5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -35,8 +35,8 @@ Object_B_i::~Object_B_i (void)
 
 
 void
-Object_B_i::foo (Object_A_ptr theObject_A_ptr,
-                 CORBA::Environment &ACE_TRY_ENV)
+Object_B_i::foo (Object_A_ptr theObject_A_ptr
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -48,7 +48,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr,
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n"));
 
-      theObject_A_ptr->finish (ACE_TRY_ENV);
+      theObject_A_ptr->finish (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start to wait on this variable, it is set to true
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index 9d664fa235d..d4468a9372c 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -34,8 +34,8 @@ public:
   virtual ~Object_B_i (void);
   // Destructor.
 
-  virtual void foo(Object_A_ptr theObject_A_ptr,
-                   CORBA::Environment &env)
+  virtual void foo(Object_A_ptr theObject_A_ptr
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 7db4e889fe6..1f91b27f5ee 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -119,15 +119,15 @@ Initiator_Server::parse_args (void)
 
 int
 Initiator_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       char** argv
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa",
-                                     ACE_TRY_ENV);
+                                     "child_poa"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
@@ -147,12 +147,12 @@ Initiator_Server::init (int argc,
       // Get Object A
 
       CORBA::Object_var object_A_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_A_key_,
-                                                    ACE_TRY_ENV);
+        this->orb_manager_.orb()->string_to_object (this->object_A_key_
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->object_A_var_ =
-        Object_A::_narrow (object_A_obj_var.in(), ACE_TRY_ENV);
+        Object_A::_narrow (object_A_obj_var.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->object_A_var_.in ()))
@@ -169,12 +169,12 @@ Initiator_Server::init (int argc,
       // Get Object B
 
       CORBA::Object_var object_B_obj_var =
-        this->orb_manager_.orb()->string_to_object (this->object_B_key_,
-                                                    ACE_TRY_ENV);
+        this->orb_manager_.orb()->string_to_object (this->object_B_key_
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->object_B_var_ =
-        Object_B::_narrow (object_B_obj_var.in(), ACE_TRY_ENV);
+        Object_B::_narrow (object_B_obj_var.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->object_B_var_.in ()))
@@ -188,7 +188,7 @@ Initiator_Server::init (int argc,
                   this->object_A_key_));
       ACE_DEBUG ((LM_DEBUG, "Object B received OK\n"));
 
-      this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
+      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -209,8 +209,8 @@ Initiator_Server::init (int argc,
                   -1);
 
   this->str_ =
-    this->orb_manager_.activate (this->initiator_i_ptr_,
-                                 ACE_TRY_ENV);
+    this->orb_manager_.activate (this->initiator_i_ptr_
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               this->str_.in ()));
@@ -221,7 +221,7 @@ Initiator_Server::init (int argc,
 
 
 int
-Initiator_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Initiator_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -230,10 +230,10 @@ Initiator_Server::run (CORBA::Environment &ACE_TRY_ENV)
                   "foo on Object A\n"));
 
       Initiator_var initiator =
-        this->initiator_i_ptr_->_this(ACE_TRY_ENV);
+        this->initiator_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->object_A_var_->foo (initiator.in (), ACE_TRY_ENV);
+      this->object_A_var_->foo (initiator.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "Initiator_Server::run: Returned from invoke "
@@ -261,11 +261,11 @@ Initiator_Server::~Initiator_Server (void)
   if (this->object_B_key_ != 0)
     ACE_OS::free (this->object_B_key_);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->orb_manager_.deactivate (this->str_.in (),
-                                     ACE_TRY_ENV);
+      this->orb_manager_.deactivate (this->str_.in ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -285,18 +285,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       int retval =
-        initiator_Server.init (argc, argv, ACE_TRY_ENV);
+        initiator_Server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return 1;
       else
         {
-          initiator_Server.run (ACE_TRY_ENV);
+          initiator_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 8d80cc8f1ea..c67ca955c21 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -51,11 +51,11 @@ public:
   // read in the IOR's for the two objects A and B
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the Initiator_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index aac08ecf309..c48d187544d 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -63,15 +63,15 @@ Object_A_Server::parse_args (void)
 
 int
 Object_A_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       char** argv
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa",
-                                     ACE_TRY_ENV);
+                                     "child_poa"
+                                     TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
@@ -82,8 +82,8 @@ Object_A_Server::init (int argc,
 
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_A",
-                                                 &this->object_A_i_,
-                                                 ACE_TRY_ENV);
+                                                 &this->object_A_i_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -104,9 +104,9 @@ Object_A_Server::init (int argc,
 
 
 int
-Object_A_Server::run (CORBA::Environment& ACE_TRY_ENV)
+Object_A_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  int r = this->orb_manager_.run (ACE_TRY_ENV);
+  int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (r == -1)
@@ -128,18 +128,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       int retval =
-        object_A_Server.init (argc,argv, ACE_TRY_ENV);
+        object_A_Server.init (argc,argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return 1;
       else
         {
-          object_A_Server.run (ACE_TRY_ENV);
+          object_A_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index c7438ef5144..b2722bb822f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -48,11 +48,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index a9d76697392..259f0043db4 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -63,15 +63,15 @@ Object_B_Server::parse_args (void)
 
 int
 Object_B_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& ACE_TRY_ENV)
+                       char** argv
+                       TAO_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
-                                     "child_poa",
-                                     ACE_TRY_ENV);
+                                     "child_poa"
+                                     TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
@@ -82,8 +82,8 @@ Object_B_Server::init (int argc,
 
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_B",
-                                                 &this->object_B_i_,
-                                                 ACE_TRY_ENV);
+                                                 &this->object_B_i_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -103,9 +103,9 @@ Object_B_Server::init (int argc,
 
 
 int
-Object_B_Server::run (CORBA::Environment& env)
+Object_B_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Object_B_Server::run"),
                       -1);
@@ -124,17 +124,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int retval = object_B_Server.init (argc, argv, ACE_TRY_ENV);
+      int retval = object_B_Server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return 1;
       else
         {
-          object_B_Server.run (ACE_TRY_ENV);
+          object_B_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 07ae82c68f9..783eaa652a2 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -48,11 +48,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index 4642532075d..4069909cdcb 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -70,7 +70,7 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -78,8 +78,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -88,49 +88,49 @@ main (int argc, char **argv)
         return parse_args_result;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an object reference from the argument string.
-      object = orb->string_to_object (IOR,
-                                      ACE_TRY_ENV);
+      object = orb->string_to_object (IOR
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <server> reference.
-      server_var server_object = server::_narrow (object.in (),
-                                                  ACE_TRY_ENV);
+      server_var server_object = server::_narrow (object.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client_i servant (server_object.in ());
 
       servant.loop (event_loop_depth,
-                    event_loop_iterations,
-                    ACE_TRY_ENV);
+                    event_loop_iterations
+                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Shutdown server.
       if (shutdown_server)
         {
-          server_object->shutdown (ACE_TRY_ENV);
+          server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index b3617663e24..822c457c159 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -43,22 +43,22 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -67,12 +67,12 @@ main (int argc, char *argv[])
       server_i servant (orb.in ());
 
       server_var server_object =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server_object.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server_object.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -86,17 +86,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index 7e11926ffec..2f1fca6d3e6 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -12,8 +12,8 @@ server_i::server_i (CORBA::ORB_ptr orb)
 void
 server_i::loop (client_ptr remote_partner,
                 CORBA::ULong event_loop_depth,
-                CORBA::ULong event_loop_iterations,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::ULong event_loop_iterations
+                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -22,28 +22,28 @@ server_i::loop (client_ptr remote_partner,
               event_loop_iterations));
 
   this->run_no_ops (remote_partner,
-                    event_loop_iterations / 2,
-                    ACE_TRY_ENV);
+                    event_loop_iterations / 2
+                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (--event_loop_depth != 0)
     {
       remote_partner->loop (event_loop_depth,
-                            event_loop_iterations,
-                            ACE_TRY_ENV);
+                            event_loop_iterations
+                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->run_no_ops (remote_partner,
-                    event_loop_iterations / 2,
-                    ACE_TRY_ENV);
+                    event_loop_iterations / 2
+                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 server_i::run_no_ops (client_ptr remote_partner,
-                      CORBA::ULong iterations,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::ULong iterations
+                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   while (iterations != 0)
@@ -71,13 +71,13 @@ server_i::run_no_ops (client_ptr remote_partner,
                       sizeof_pointer_to_flag);
 
       remote_partner->oneway_no_op (act_for_iterations,
-                                    act_for_flag,
-                                    ACE_TRY_ENV);
+                                    act_for_flag
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       while (!got_reply)
         {
-          this->orb_->perform_work (ACE_TRY_ENV);
+          this->orb_->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -86,8 +86,8 @@ server_i::run_no_ops (client_ptr remote_partner,
 void
 server_i::no_op (client_ptr remote_partner,
                  const act &act_for_iterations,
-                 const act &act_for_flag,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 const act &act_for_flag
+                 TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong *pointer_to_iterations = 0;
@@ -110,16 +110,16 @@ server_i::no_op (client_ptr remote_partner,
 
   *pointer_to_flag = 1;
 
-  remote_partner->twoway_no_op (ACE_TRY_ENV);
+  remote_partner->twoway_no_op (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
 
 client_i::client_i (server_ptr remote_partner)
@@ -129,8 +129,8 @@ client_i::client_i (server_ptr remote_partner)
 
 void
 client_i::loop (CORBA::ULong event_loop_depth,
-                CORBA::ULong event_loop_iterations,
-                CORBA::Environment &)
+                CORBA::ULong event_loop_iterations
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -138,18 +138,18 @@ client_i::loop (CORBA::ULong event_loop_depth,
               event_loop_depth,
               event_loop_iterations));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       client_var self =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->remote_partner_->loop (self.in (),
                                    event_loop_depth,
-                                   event_loop_iterations,
-                                   ACE_TRY_ENV);
+                                   event_loop_iterations
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -162,22 +162,22 @@ client_i::loop (CORBA::ULong event_loop_depth,
 
 void
 client_i::oneway_no_op (const act &act_for_iterations,
-                        const act &act_for_flag,
-                        CORBA::Environment &)
+                        const act &act_for_flag
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       client_var self =
-        this->_this (ACE_TRY_ENV);
+        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->remote_partner_->no_op (self.in (),
                                     act_for_iterations,
-                                    act_for_flag,
-                                    ACE_TRY_ENV);
+                                    act_for_flag
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -189,7 +189,7 @@ client_i::oneway_no_op (const act &act_for_iterations,
 }
 
 void
-client_i::twoway_no_op (CORBA::Environment &)
+client_i::twoway_no_op (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index bcf3b1188db..6a4f6afef7c 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -9,22 +9,22 @@ public:
 
   void loop (client_ptr remote_partner,
              CORBA::ULong event_loop_depth,
-             CORBA::ULong event_loop_iterations,
-             CORBA::Environment &ACE_TRY_ENV)
+             CORBA::ULong event_loop_iterations
+             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void run_no_ops (client_ptr remote_partner,
-                   CORBA::ULong iterations,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   CORBA::ULong iterations
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void no_op (client_ptr remote_partner,
               const act &act_for_iterations,
-              const act &act_for_flag,
-              CORBA::Environment &)
+              const act &act_for_flag
+              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -37,16 +37,16 @@ public:
   client_i (server_ptr remote_partner);
 
   void loop (CORBA::ULong event_loop_depth,
-             CORBA::ULong event_loop_iterations,
-             CORBA::Environment &)
+             CORBA::ULong event_loop_iterations
+             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_no_op (const act &act_for_iterations,
-                     const act &act_for_flag,
-                     CORBA::Environment &)
+                     const act &act_for_flag
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_no_op (CORBA::Environment &)
+  void twoway_no_op (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index 83b251c32ca..40cfa51f3b0 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -28,39 +28,39 @@ test_with_regular_poa_manager (int argc,
                                int destroy_orb,
                                int destroy_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (destroy_poa)
         {
-          root_poa->destroy (1, 1, ACE_TRY_ENV);
+          root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (destroy_orb)
         {
-          orb->destroy (ACE_TRY_ENV);
+          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -83,42 +83,42 @@ test_with_funky_poa_manager (int argc,
                              int destroy_poa,
                              int funky_poa_manager)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (funky_poa_manager)
         {
           PortableServer::POAManager_var poa_manager =
-            root_poa->the_POAManager (ACE_TRY_ENV);
+            root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          poa_manager->activate (ACE_TRY_ENV);
+          poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (destroy_poa)
         {
-          root_poa->destroy (1, 1, ACE_TRY_ENV);
+          root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (destroy_orb)
         {
-          orb->destroy (ACE_TRY_ENV);
+          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index 5dce9d5de6e..77814057eb1 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -17,7 +17,7 @@ main (int argc, char *argv[])
 {
   CORBA::ORB_var orb;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       const char orbid[] = "mighty_orb";
@@ -25,7 +25,7 @@ main (int argc, char *argv[])
       CORBA::ORB_ptr my_orb = CORBA::ORB::_nil();
 
       {
-        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid, ACE_TRY_ENV);
+        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         my_orb = orb.in ();
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
       // used in that scope.
       // -------------------------------------------------------------
 
-      orb = CORBA::ORB_init (argc, argv, orbid, ACE_TRY_ENV);
+      orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This isn't portable, but TAO implements an ORB_ptr as a
@@ -77,10 +77,10 @@ main (int argc, char *argv[])
       // attempt to initialize a new ORB with the same ORBid.
       // -------------------------------------------------------------
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb = CORBA::ORB_init (argc, argv, orbid, ACE_TRY_ENV);
+      orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This isn't portable, but TAO implements an ORB_ptr as a
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
       // -------------------------------------------------------------
 
       CORBA::Object_var object =
-        orb->string_to_object (IOR, ACE_TRY_ENV);
+        orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // -------------------------------------------------------------
@@ -125,11 +125,11 @@ main (int argc, char *argv[])
       // clean-up.
       // -------------------------------------------------------------
       CORBA::ORB_var orb2 =
-        CORBA::ORB_init (argc, argv, "ORB number 2", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "ORB number 2" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb3 =
-        CORBA::ORB_init (argc, argv, "ORB number 3", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "ORB number 3" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // -------------------------------------------------------------
@@ -139,11 +139,11 @@ main (int argc, char *argv[])
       // ORB itself break when the last ORB is released.
       // -------------------------------------------------------------
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If we get here, then something went wrong.  A
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 6937a20cdf1..8c2f2c62553 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -16,25 +16,25 @@ Loader::Loader (void)
 CORBA::Object_ptr
 Loader::create_object (CORBA::ORB_ptr orb,
                        int,
-                       char * [],
-                       CORBA::Environment &ACE_TRY_ENV)
+                       char * []
+                       TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (ACE_TRY_ENV);
+      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i *test;
@@ -42,7 +42,7 @@ Loader::create_object (CORBA::ORB_ptr orb,
                       CORBA::Object::_nil ());
 
       PortableServer::ServantBase_var tmp = test;
-      obj = test->_this (ACE_TRY_ENV);
+      obj = test->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return obj._retn ();
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index f6675712f20..7dbcbed351d 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -32,8 +32,8 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv [],
-                                           CORBA::Environment &)
+                                           char *argv []
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Create a new instance
 };
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 5f4ed5a86e1..2bdf3980984 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -18,28 +18,28 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 }
 
 CORBA::Long
-Test_i::instance_count (CORBA::Environment &)
+Test_i::instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test_i::instance_count_;
 }
 
 void
-Test_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+Test_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
+    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-Test_i::_default_POA (CORBA::Environment &)
+Test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index b16afaa9f27..5cf0f232ce8 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -22,20 +22,20 @@ main (int, char *[])
 
               int argc = 0;
               CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, buf, ACE_TRY_ENV);
+                CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Object_var object =
-                orb->string_to_object ("DLL:Test_Object",
-                                       ACE_TRY_ENV);
+                orb->string_to_object ("DLL:Test_Object"
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               Test_var test =
-                Test::_narrow (object.in (), ACE_TRY_ENV);
+                Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Long count =
-                test->instance_count (ACE_TRY_ENV);
+                test->instance_count (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (count != norbs*i + j + 1)
@@ -45,7 +45,7 @@ main (int, char *[])
                               "(%d != %d)\n",
                               count, norbs * i + j + 1));
                 }
-              test->destroy (ACE_TRY_ENV);
+              test->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -57,22 +57,22 @@ main (int, char *[])
 
           int argc = 0;
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, 0, buf, ACE_TRY_ENV);
+            CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Object_var obj =
-            orb->resolve_initial_references ("RootPOA",
-                                             ACE_TRY_ENV);
+            orb->resolve_initial_references ("RootPOA"
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           PortableServer::POA_var poa =
-            PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+            PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          poa->destroy (1, 1, ACE_TRY_ENV);
+          poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          orb->destroy (ACE_TRY_ENV);
+          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index 51768cfc050..4aa340c639e 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -161,13 +161,13 @@ run (char* buf, size_t bufsize,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int n = 64;
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index ed806604edd..881ee8b3a7a 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -57,18 +57,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Database_var server =
-        Test::Database::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Database::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -112,8 +112,8 @@ main (int argc, char *argv[])
                   server->set (Test::Index (j),
                                elements[j],
                                token,
-                               returned_token,
-                               ACE_TRY_ENV);
+                               returned_token
+                               TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (token != returned_token)
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
             }
 
           CORBA::ULong crc_remote =
-            server->get_crc (idx, ACE_TRY_ENV);
+            server->get_crc (idx TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULong crc_local =
@@ -149,16 +149,16 @@ main (int argc, char *argv[])
 
         }
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 3c6009fb55c..cfad7fffd81 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -66,11 +66,11 @@ main (int argc, char *argv[])
                                 128); // @@ TODO
 
         Test::Database_var server =
-          server_impl._this (ACE_TRY_ENV);
+          server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         CORBA::String_var ior =
-          orb->object_to_string (server.in (), ACE_TRY_ENV);
+          orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -88,25 +88,25 @@ main (int argc, char *argv[])
             ACE_OS::fclose (output_file);
           }
 
-        poa_manager->activate (ACE_TRY_ENV);
+        poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        orb->run (ACE_TRY_ENV);
+        orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-        root_poa->destroy (1, 1, ACE_TRY_ENV);
+        root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index 64dd349d241..29614b938e3 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -17,8 +17,8 @@ void
 Database_i::set (Test::Index i,
                  const Test::OctetSeq& seq,
                  CORBA::Double verification_token,
-                 CORBA::Double_out returned_token,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::Double_out returned_token
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -44,8 +44,8 @@ Database_i::set (Test::Index i,
 }
 
 Test::OctetSeq*
-Database_i::get (Test::Index i,
-                 CORBA::Environment &ACE_TRY_ENV)
+Database_i::get (Test::Index i
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -60,8 +60,8 @@ Database_i::get (Test::Index i,
 }
 
 CORBA::ULong
-Database_i::get_crc (Test::Index i,
-                     CORBA::Environment &ACE_TRY_ENV)
+Database_i::get_crc (Test::Index i
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -73,7 +73,7 @@ Database_i::get_crc (Test::Index i,
 }
 
 void
-Database_i::shutdown (CORBA::Environment&)
+Database_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index 12205072e0a..08843c32828 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -35,19 +35,19 @@ public:
   void set (Test::Index i,
             const Test::OctetSeq& seq,
             CORBA::Double verification_token,
-            CORBA::Double_out returned_token,
-            CORBA::Environment&)
+            CORBA::Double_out returned_token
+            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((Test::OutOfRange));
 
-  Test::OctetSeq* get (Test::Index i,
-                       CORBA::Environment&)
+  Test::OctetSeq* get (Test::Index i
+                       TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
-  CORBA::ULong get_crc (Test::Index i,
-                        CORBA::Environment&)
+  CORBA::ULong get_crc (Test::Index i
+                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index 3e539d45dd1..f12cbec55dd 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -13,29 +13,29 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
 }
 
 void
-Oneway_Buffering::receive_data (const Test::Payload &the_payload,
-                                CORBA::Environment &ACE_TRY_ENV)
+Oneway_Buffering::receive_data (const Test::Payload &the_payload
+                                TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->request_received (the_payload.length (), ACE_TRY_ENV);
+  this->admin_->request_received (the_payload.length () TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Oneway_Buffering::flush (CORBA::Environment &)
+Oneway_Buffering::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Oneway_Buffering::sync (CORBA::Environment &ACE_TRY_ENV)
+Oneway_Buffering::sync (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->flush (ACE_TRY_ENV);
+  this->admin_->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Oneway_Buffering::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Oneway_Buffering::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index 302ea846f43..4ea1dd52b64 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -26,17 +26,17 @@ public:
                     Test::Oneway_Buffering_Admin_ptr admin);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Payload &the_payload,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_data (const Test::Payload &the_payload
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (CORBA::Environment &ACE_TRY_ENV)
+  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (CORBA::Environment &ACE_TRY_ENV)
+  virtual void sync (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index 3512584b812..bf3413506f7 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -13,22 +13,22 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-Oneway_Buffering_Admin::request_count (CORBA::Environment &)
+Oneway_Buffering_Admin::request_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-Oneway_Buffering_Admin::bytes_received_count (CORBA::Environment &)
+Oneway_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
 }
 
 void
-Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length,
-                                          CORBA::Environment &)
+Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length
+                                          TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
@@ -36,14 +36,14 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length,
 }
 
 void
-Oneway_Buffering_Admin::flush (CORBA::Environment &)
+Oneway_Buffering_Admin::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Oneway_Buffering_Admin::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Oneway_Buffering_Admin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index 56b2088e965..bce8067204a 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -25,20 +25,20 @@ public:
   Oneway_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong request_count (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong bytes_received_count (CORBA::Environment &ACE_TRY_ENV)
+  virtual CORBA::ULong bytes_received_count (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void request_received (CORBA::ULong payload_length,
-                                 CORBA::Environment &ACE_TRY_ENV)
+  virtual void request_received (CORBA::ULong payload_length
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (CORBA::Environment &ACE_TRY_ENV)
+  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 0b4ac68af67..f2e44e5ede2 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_admin_impl);
 
       Test::Oneway_Buffering_Admin_var oneway_buffering_admin =
-        oneway_buffering_admin_impl->_this (ACE_TRY_ENV);
+        oneway_buffering_admin_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (oneway_buffering_admin.in (), ACE_TRY_ENV);
+        orb->object_to_string (oneway_buffering_admin.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) admin - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 5cd6dafec55..388ddeafcf7 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -87,26 +87,26 @@ parse_args (int argc, char *argv[])
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::Oneway_Buffering_ptr oneway_buffering,
-                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+                   TAO_ENV_ARG_DECL);
 
 int
 run_timeout (CORBA::ORB_ptr orb,
              Test::Oneway_Buffering_ptr oneway_buffering,
-             Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-             CORBA::Environment &ACE_TRY_ENV);
+             Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+             TAO_ENV_ARG_DECL);
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::Oneway_Buffering_ptr oneway_buffering,
-                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+                      TAO_ENV_ARG_DECL);
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::Oneway_Buffering_ptr oneway_buffering,
-                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+                 TAO_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
@@ -115,18 +115,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(server_ior, ACE_TRY_ENV);
+        orb->string_to_object(server_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Buffering_var oneway_buffering =
-        Test::Oneway_Buffering::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Oneway_Buffering::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_buffering.in ()))
@@ -138,11 +138,11 @@ main (int argc, char *argv[])
         }
 
       tmp =
-        orb->string_to_object(admin_ior, ACE_TRY_ENV);
+        orb->string_to_object(admin_ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Buffering_Admin_var oneway_buffering_admin =
-        Test::Oneway_Buffering_Admin::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Oneway_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_buffering_admin.in ()))
@@ -160,8 +160,8 @@ main (int argc, char *argv[])
           test_failed =
             run_message_count (orb.in (),
                                oneway_buffering.in (),
-                               oneway_buffering_admin.in (),
-                               ACE_TRY_ENV);
+                               oneway_buffering_admin.in ()
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_test)
@@ -171,8 +171,8 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout (orb.in (),
                          oneway_buffering.in (),
-                         oneway_buffering_admin.in (),
-                         ACE_TRY_ENV);
+                         oneway_buffering_admin.in ()
+                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_reactive_test)
@@ -182,8 +182,8 @@ main (int argc, char *argv[])
           test_failed =
             run_timeout_reactive (orb.in (),
                                   oneway_buffering.in (),
-                                  oneway_buffering_admin.in (),
-                                  ACE_TRY_ENV);
+                                  oneway_buffering_admin.in ()
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_buffer_size_test)
@@ -193,8 +193,8 @@ main (int argc, char *argv[])
           test_failed =
             run_buffer_size (orb.in (),
                              oneway_buffering.in (),
-                             oneway_buffering_admin.in (),
-                             ACE_TRY_ENV);
+                             oneway_buffering_admin.in ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -203,13 +203,13 @@ main (int argc, char *argv[])
                       "ERROR: No test was configured\n"));
         }
 
-      oneway_buffering->shutdown (ACE_TRY_ENV);
+      oneway_buffering->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      oneway_buffering_admin->shutdown (ACE_TRY_ENV);
+      oneway_buffering_admin->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -227,15 +227,15 @@ int
 configure_policies (CORBA::ORB_ptr orb,
                     const TAO::BufferingConstraint &buffering_constraint,
                     Test::Oneway_Buffering_ptr oneway_buffering,
-                    Test::Oneway_Buffering_out flusher,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    Test::Oneway_Buffering_out flusher
+                    TAO_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV);
+    orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+    CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (policy_current.in ()))
@@ -252,22 +252,22 @@ configure_policies (CORBA::ORB_ptr orb,
   CORBA::PolicyList policies (2); policies.length (2);
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        scope_as_any,
-                        ACE_TRY_ENV);
+                        scope_as_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   policies[1] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any,
-                        ACE_TRY_ENV);
+                        buffering_as_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (ACE_TRY_ENV);
+  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  policies[1]->destroy (ACE_TRY_ENV);
+  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO::BufferingConstraint flush_constraint;
@@ -280,51 +280,51 @@ configure_policies (CORBA::ORB_ptr orb,
   policies.length (1);
   policies[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_as_any,
-                        ACE_TRY_ENV);
+                        buffering_as_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   object =
     oneway_buffering->_set_policy_overrides (policies,
-                                             CORBA::ADD_OVERRIDE,
-                                             ACE_TRY_ENV);
+                                             CORBA::ADD_OVERRIDE
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (ACE_TRY_ENV);
+  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   flusher =
-    Test::Oneway_Buffering::_narrow (object.in (), ACE_TRY_ENV);
+    Test::Oneway_Buffering::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 void
-sync_server (Test::Oneway_Buffering_ptr flusher,
-             CORBA::Environment &ACE_TRY_ENV)
+sync_server (Test::Oneway_Buffering_ptr flusher
+             TAO_ENV_ARG_DECL)
 {
   // Get back in sync with the server...
-  flusher->flush (ACE_TRY_ENV);
+  flusher->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  flusher->sync (ACE_TRY_ENV);
+  flusher->sync (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering,
                    Test::Oneway_Buffering_ptr flusher,
-                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+                   TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n"));
   int test_failed = 0;
 
-  sync_server (flusher, ACE_TRY_ENV);
+  sync_server (flusher TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count =
-    oneway_buffering_admin->request_count (ACE_TRY_ENV);
+    oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int liveness_test_iterations = int(send_count);
@@ -337,12 +337,12 @@ run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering,
   int depth = 0;
   for (int i = 0; i != liveness_test_iterations; ++i)
     {
-      oneway_buffering->receive_data (payload, ACE_TRY_ENV);
+      oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       send_count++;
 
       CORBA::ULong receive_count =
-        oneway_buffering_admin->request_count (ACE_TRY_ENV);
+        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // Once the system has sent enough messages we don't
@@ -360,13 +360,13 @@ run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering,
                       "expected %u\n",
                       i, receive_count, expected));
 
-          sync_server (flusher, ACE_TRY_ENV);
+          sync_server (flusher TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
 
       if (depth++ == LIVENESS_MAX_DEPTH)
         {
-          sync_server (flusher, ACE_TRY_ENV);
+          sync_server (flusher TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           depth = 0;
@@ -380,8 +380,8 @@ run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering,
 int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::Oneway_Buffering_ptr oneway_buffering,
-                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+                   TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT;
@@ -392,8 +392,8 @@ run_message_count (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        oneway_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -407,11 +407,11 @@ run_message_count (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in (), ACE_TRY_ENV);
+      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (ACE_TRY_ENV);
+        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -424,12 +424,12 @@ run_message_count (CORBA::ORB_ptr orb,
 
       while (1)
         {
-          oneway_buffering->receive_data (payload, ACE_TRY_ENV);
+          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (ACE_TRY_ENV);
+            oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong iteration_count =
@@ -466,8 +466,8 @@ run_message_count (CORBA::ORB_ptr orb,
   int liveness_test_failed =
     run_liveness_test (oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin,
-                       ACE_TRY_ENV);
+                       oneway_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -479,8 +479,8 @@ run_message_count (CORBA::ORB_ptr orb,
 int
 run_timeout (CORBA::ORB_ptr orb,
               Test::Oneway_Buffering_ptr oneway_buffering,
-              Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-              CORBA::Environment &ACE_TRY_ENV)
+              Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+              TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -491,8 +491,8 @@ run_timeout (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        oneway_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -506,11 +506,11 @@ run_timeout (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in (), ACE_TRY_ENV);
+      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (ACE_TRY_ENV);
+        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -524,12 +524,12 @@ run_timeout (CORBA::ORB_ptr orb,
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       while (1)
         {
-          oneway_buffering->receive_data (payload, ACE_TRY_ENV);
+          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (ACE_TRY_ENV);
+            oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -566,8 +566,8 @@ run_timeout (CORBA::ORB_ptr orb,
   int liveness_test_failed =
     run_liveness_test (oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin,
-                       ACE_TRY_ENV);
+                       oneway_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -580,8 +580,8 @@ run_timeout (CORBA::ORB_ptr orb,
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::Oneway_Buffering_ptr oneway_buffering,
-                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+                      TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -592,8 +592,8 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        oneway_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -607,11 +607,11 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in (), ACE_TRY_ENV);
+      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (ACE_TRY_ENV);
+        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -625,18 +625,18 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       for (int j = 0; j != 20; ++j)
         {
-          oneway_buffering->receive_data (payload, ACE_TRY_ENV);
+          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
         }
       while (1)
         {
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (ACE_TRY_ENV);
+            oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value sleep (0, 10000);
-          orb->run (sleep, ACE_TRY_ENV);
+          orb->run (sleep TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -673,8 +673,8 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   int liveness_test_failed =
     run_liveness_test (oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin,
-                       ACE_TRY_ENV);
+                       oneway_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -687,8 +687,8 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::Oneway_Buffering_ptr oneway_buffering,
-                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
+                 TAO_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES;
@@ -699,8 +699,8 @@ run_buffer_size (CORBA::ORB_ptr orb,
   Test::Oneway_Buffering_var flusher;
   int test_failed =
     configure_policies (orb, buffering_constraint,
-                        oneway_buffering, flusher.out (),
-                        ACE_TRY_ENV);
+                        oneway_buffering, flusher.out ()
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -714,11 +714,11 @@ run_buffer_size (CORBA::ORB_ptr orb,
   CORBA::ULong bytes_sent = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in (), ACE_TRY_ENV);
+      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_bytes_received =
-        oneway_buffering_admin->bytes_received_count (ACE_TRY_ENV);
+        oneway_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_bytes_received != bytes_sent)
@@ -731,12 +731,12 @@ run_buffer_size (CORBA::ORB_ptr orb,
 
       while (1)
         {
-          oneway_buffering->receive_data (payload, ACE_TRY_ENV);
+          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           bytes_sent += PAYLOAD_LENGTH;
 
           CORBA::ULong bytes_received =
-            oneway_buffering_admin->bytes_received_count (ACE_TRY_ENV);
+            oneway_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong payload_delta =
@@ -778,8 +778,8 @@ run_buffer_size (CORBA::ORB_ptr orb,
   int liveness_test_failed =
     run_liveness_test (oneway_buffering,
                        flusher.in (),
-                       oneway_buffering_admin,
-                       ACE_TRY_ENV);
+                       oneway_buffering_admin
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index 707890bdf9c..bc92d73ca4c 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -18,19 +18,19 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile> "
-			   "-k <ior> "
+                           "-o <iorfile> "
+                           "-k <ior> "
                            "\n",
                            argv [0]),
                           -1);
@@ -45,15 +45,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -62,18 +62,18 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Buffering_Admin_var admin =
-        Test::Oneway_Buffering_Admin::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Oneway_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (admin.in ()))
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_impl);
 
       Test::Oneway_Buffering_var oneway_buffering =
-        oneway_buffering_impl->_this (ACE_TRY_ENV);
+        oneway_buffering_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (oneway_buffering.in (), ACE_TRY_ENV);
+        orb->object_to_string (oneway_buffering.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -109,18 +109,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 1a546611b1e..60599eb6d4c 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -21,7 +21,7 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       for (int i = 0; i != 1; ++i)
@@ -29,8 +29,8 @@ Client_Task::svc (void)
           ACE_DEBUG ((LM_DEBUG,
                       "TAO (%P|%t) sending oneways...\n"));
 
-          this->sender_->send_ready_message (this->us_.in (),
-                                             ACE_TRY_ENV);
+          this->sender_->send_ready_message (this->us_.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 035dae27f42..43f09655404 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -15,8 +15,8 @@ Sender_i::~Sender_i (void)
 }
 
 void
-Sender_i::active_objects (CORBA::Short no_threads,
-                          CORBA::Environment & /*ACE_TRY_ENV */ )
+Sender_i::active_objects (CORBA::Short no_threads
+                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER */ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->active_objects_ = no_threads;
@@ -24,8 +24,8 @@ Sender_i::active_objects (CORBA::Short no_threads,
 
 
 void
-Sender_i::send_ready_message (Test::Receiver_ptr receiver,
-                              CORBA::Environment &ACE_TRY_ENV)
+Sender_i::send_ready_message (Test::Receiver_ptr receiver
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -38,14 +38,14 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver,
        i < this->number_;
        ++i)
     {
-      receiver->receive_call (ACE_TRY_ENV);
+      receiver->receive_call (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
 }
 
 void
-Sender_i::ping (CORBA::Environment & /*ACE_TRY_ENV*/)
+Sender_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
index 6b51ce92b1c..b878806fb08 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
@@ -41,15 +41,15 @@ public:
   virtual ~Sender_i (void);
 
   // = The skeleton methods
-  virtual void active_objects (CORBA::Short ao,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void active_objects (CORBA::Short ao
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void send_ready_message (Test::Receiver_ptr receiver,
-                                   CORBA::Environment &ACE_TRY_ENV)
+  virtual void send_ready_message (Test::Receiver_ptr receiver
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (CORBA::Environment &ACE_TRY_ENV)
+  virtual void ping (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
index 0b96b4f366f..1338704fc0d 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
@@ -17,12 +17,12 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // run the test for at most 60 seconds...
       ACE_Time_Value tv (60, 0);
-      this->orb_->run (tv, ACE_TRY_ENV);
+      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index 3428a3604f7..49526d4786c 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -40,11 +40,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -53,11 +53,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -65,11 +65,11 @@ main (int argc, char *argv[])
 
       // Get the sender reference..
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Sender_var sender =
-        Test::Sender::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Sender::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sender.in ()))
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
       Test::Receiver_var receiver =
-        receiver_impl->_this (ACE_TRY_ENV);
+        receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate poa manager
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_task (sender.in (),
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
 
       // Before creating threads we will let the sender know that we
       // will have two threads that would make invocations..
-      sender->active_objects ((CORBA::Short) 2, ACE_TRY_ENV);
+      sender->active_objects ((CORBA::Short) 2 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 2,1) == -1)
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Event Loop finished \n"));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index 7a24398d2ff..c69f94b9103 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -39,11 +39,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
       Test::Sender_var sender =
-        sender_impl->_this (ACE_TRY_ENV);
+        sender_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (sender.in (), ACE_TRY_ENV);
+        orb->object_to_string (sender.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in (),
@@ -101,10 +101,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index f7f173311e0..4a171233145 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -22,7 +22,7 @@
 class test_i : public POA_test
 {
 public:
-  void method (CORBA::Environment & /*ACE_TRY_ENV*/)
+  void method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -37,7 +37,7 @@ class test_i_with_reference_counting : public virtual PortableServer::RefCountSe
                                        public virtual POA_test
 {
 public:
-  void method (CORBA::Environment &)
+  void method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -114,32 +114,32 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (3);
@@ -147,30 +147,30 @@ main (int argc, char **argv)
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER,
-                                                    ACE_TRY_ENV);
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create servant activator.
@@ -178,8 +178,8 @@ main (int argc, char **argv)
         new Servant_Activator;
 
       // Set servant_activator as the servant_manager of child POA.
-      child_poa->set_servant_manager (servant_manager.in (),
-                                      ACE_TRY_ENV);
+      child_poa->set_servant_manager (servant_manager.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       {
@@ -190,20 +190,20 @@ main (int argc, char **argv)
 
         object =
           child_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0",
-                                               ACE_TRY_ENV);
+                                               "IDL:test:1.0"
+                                               TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         test_var test =
-          test::_narrow (object.in (),
-                         ACE_TRY_ENV);
+          test::_narrow (object.in ()
+                         TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        test->method (ACE_TRY_ENV);
+        test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        child_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
+        child_poa->deactivate_object (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -215,20 +215,20 @@ main (int argc, char **argv)
 
         object =
           child_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0",
-                                               ACE_TRY_ENV);
+                                               "IDL:test:1.0"
+                                               TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         test_var test =
-          test::_narrow (object.in (),
-                         ACE_TRY_ENV);
+          test::_narrow (object.in ()
+                         TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        test->method (ACE_TRY_ENV);
+        test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        child_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
+        child_poa->deactivate_object (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index f447dab8b42..127ae92a099 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -24,10 +24,10 @@
 class test_i : public POA_test
 {
 public:
-  void deactivate_self (CORBA::Environment &ACE_TRY_ENV)
+  void deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
   PortableServer::POA_var poa_;
 
@@ -35,17 +35,17 @@ public:
 };
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment & /*ACE_TRY_ENV*/)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV)
+test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->poa_->deactivate_object (this->id_,
-                                 ACE_TRY_ENV);
+  this->poa_->deactivate_object (this->id_
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Exception flag
@@ -53,8 +53,8 @@ test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      this->poa_->deactivate_object (this->id_,
-                                     ACE_TRY_ENV);
+      this->poa_->deactivate_object (this->id_
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
@@ -78,8 +78,8 @@ test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV)
 
 void
 test_object_deactivation (PortableServer::POA_ptr poa,
-                          const PortableServer::ObjectId &id,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          const PortableServer::ObjectId &id
+                          TAO_ENV_ARG_DECL)
 {
   test_i servant;
   int expected_exception_raised = 0;
@@ -89,8 +89,8 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
   ACE_TRY_EX (invalid_id)
     {
-      poa->deactivate_object (invalid_id.in (),
-                              ACE_TRY_ENV);
+      poa->deactivate_object (invalid_id.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (invalid_id);
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
@@ -113,12 +113,12 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
 
   poa->activate_object_with_id (id,
-                                &servant,
-                                ACE_TRY_ENV);
+                                &servant
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id,
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Reset flag
@@ -126,8 +126,8 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
   ACE_TRY_EX (double_deactivate)
     {
-      poa->deactivate_object (id,
-                              ACE_TRY_ENV);
+      poa->deactivate_object (id
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (double_deactivate);
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
@@ -148,8 +148,8 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   ACE_ASSERT (expected_exception_raised);
 
   poa->activate_object_with_id (id,
-                                &servant,
-                                ACE_TRY_ENV);
+                                &servant
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   servant.poa_ =
@@ -158,10 +158,10 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   servant.id_ = id;
 
   test_var test =
-    servant._this (ACE_TRY_ENV);
+    servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  test->deactivate_self (ACE_TRY_ENV);
+  test->deactivate_self (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ACE_ASSERT dissappears in non-debug builds
@@ -172,65 +172,65 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList empty_policies;
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              empty_policies,
-                              ACE_TRY_ENV);
+                              empty_policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       obj =
-        root_poa->create_reference ("IDL:test:1.0",
-                                    ACE_TRY_ENV);
+        root_poa->create_reference ("IDL:test:1.0"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        root_poa->reference_to_id (obj.in (),
-                                   ACE_TRY_ENV);
+        root_poa->reference_to_id (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_object_deactivation (root_poa.in (),
-                                id.in (),
-                                ACE_TRY_ENV);
+                                id.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       id = PortableServer::string_to_ObjectId ("good id");
 
       test_object_deactivation (child_poa.in (),
-                                id.in (),
-                                ACE_TRY_ENV);
+                                id.in ()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index e1a949eda57..4a9fec96cce 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -30,7 +30,7 @@ public:
     {
     }
 
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &)
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
@@ -46,76 +46,76 @@ create_poas (PortableServer::POA_ptr root_poa,
              PortableServer::POA_out first_poa,
              PortableServer::POA_out second_poa,
              PortableServer::POA_out third_poa,
-             PortableServer::POA_out forth_poa,
-             CORBA::Environment &ACE_TRY_ENV)
+             PortableServer::POA_out forth_poa
+             TAO_ENV_ARG_DECL)
 {
   // Policies for the new POAs
   CORBA::PolicyList policies (3);
   policies.length (3);
 
-  policies[0] = root_poa->create_lifespan_policy (lifespan_policy,
-                                                  ACE_TRY_ENV);
+  policies[0] = root_poa->create_lifespan_policy (lifespan_policy
+                                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
-                                                       ACE_TRY_ENV);
+  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID,
-                                                       ACE_TRY_ENV);
+  policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the firstPOA
   ACE_CString name = "firstPOA";
   first_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
-                                    policies,
-                                    ACE_TRY_ENV);
+                                    policies
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[1]->destroy (ACE_TRY_ENV);
+  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID,
-                                                       ACE_TRY_ENV);
+  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the secondPOA
   name = "secondPOA";
   second_poa = root_poa->create_POA (name.c_str (),
                                      PortableServer::POAManager::_nil (),
-                                     policies,
-                                     ACE_TRY_ENV);
+                                     policies
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[2]->destroy (ACE_TRY_ENV);
+  policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                                       ACE_TRY_ENV);
+  policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the thirdPOA
   name = "thirdPOA";
   third_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
-                                    policies,
-                                    ACE_TRY_ENV);
+                                    policies
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[1]->destroy (ACE_TRY_ENV);
+  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
-                                                       ACE_TRY_ENV);
+  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the forthPOA
   name = "forthPOA";
   forth_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
-                                    policies,
-                                    ACE_TRY_ENV);
+                                    policies
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the new POAs over, so destroy the policies
@@ -123,7 +123,7 @@ create_poas (PortableServer::POA_ptr root_poa,
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_TRY_ENV);
+      policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -135,49 +135,49 @@ test_poas (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr second_poa,
            PortableServer::POA_ptr third_poa,
            PortableServer::POA_ptr forth_poa,
-           int perform_deactivation_test,
-           CORBA::Environment &ACE_TRY_ENV)
+           int perform_deactivation_test
+           TAO_ENV_ARG_DECL)
 {
   {
     test_i servant (root_poa);
 
-    CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0",
-                                                        ACE_TRY_ENV);
+    CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0"
+                                                        TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in (),
-                                                                 ACE_TRY_ENV);
+    PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in ()
+                                                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     root_poa->activate_object_with_id (id.in (),
-                                       &servant,
-                                       ACE_TRY_ENV);
+                                       &servant
+                                       TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    obj = root_poa->id_to_reference (id.in (),
-                                     ACE_TRY_ENV);
+    obj = root_poa->id_to_reference (id.in ()
+                                     TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
-      root_poa->reference_to_servant (obj.in (),
-                                      ACE_TRY_ENV);
+      root_poa->reference_to_servant (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
-      root_poa->id_to_servant (id.in (),
-                               ACE_TRY_ENV);
+      root_poa->id_to_servant (id.in ()
+                               TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -188,50 +188,50 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    obj = root_poa->servant_to_reference (&servant,
-                                          ACE_TRY_ENV);
+    obj = root_poa->servant_to_reference (&servant
+                                          TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (ACE_TRY_ENV);
+    obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant,
-                                                                            ACE_TRY_ENV);
+    PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant
+                                                                            TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
-    root_poa->deactivate_object (id.in (),
-                                 ACE_TRY_ENV);
+    root_poa->deactivate_object (id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         root_poa->activate_object_with_id (id.in (),
-                                           &servant,
-                                           ACE_TRY_ENV);
+                                           &servant
+                                           TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        servant_from_reference = root_poa->reference_to_servant (obj.in (),
-                                                                 ACE_TRY_ENV);
+        servant_from_reference = root_poa->reference_to_servant (obj.in ()
+                                                                 TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
-        root_poa->deactivate_object (id.in (),
-                                     ACE_TRY_ENV);
+        root_poa->deactivate_object (id.in ()
+                                     TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -239,76 +239,76 @@ test_poas (CORBA::ORB_ptr orb,
   {
     test_i servant (root_poa);
 
-    PortableServer::ObjectId_var id = root_poa->activate_object (&servant,
-                                                                 ACE_TRY_ENV);
+    PortableServer::ObjectId_var id = root_poa->activate_object (&servant
+                                                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::Object_var obj = root_poa->id_to_reference (id.in (),
-                                                       ACE_TRY_ENV);
+    CORBA::Object_var obj = root_poa->id_to_reference (id.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = root_poa->create_reference_with_id (id.in (),
-                                              "IDL:test:1.0",
-                                              ACE_TRY_ENV);
+                                              "IDL:test:1.0"
+                                              TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    root_poa->deactivate_object (id.in (),
-                                 ACE_TRY_ENV);
+    root_poa->deactivate_object (id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   {
     test_i servant (first_poa);
 
-    CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0",
-                                                         ACE_TRY_ENV);
+    CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0"
+                                                         TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in (),
-                                                                  ACE_TRY_ENV);
+    PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in ()
+                                                                  TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     first_poa->activate_object_with_id (id.in (),
-                                        &servant,
-                                        ACE_TRY_ENV);
+                                        &servant
+                                        TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    obj = first_poa->id_to_reference (id.in (),
-                                      ACE_TRY_ENV);
+    obj = first_poa->id_to_reference (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
-      first_poa->reference_to_servant (obj.in (),
-                                       ACE_TRY_ENV);
+      first_poa->reference_to_servant (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
-      first_poa->id_to_servant (id.in (),
-                                ACE_TRY_ENV);
+      first_poa->id_to_servant (id.in ()
+                                TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -319,25 +319,25 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    first_poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
+    first_poa->deactivate_object (id.in ()
+                                  TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         first_poa->activate_object_with_id (id.in (),
-                                            &servant,
-                                            ACE_TRY_ENV);
+                                            &servant
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        servant_from_reference = first_poa->reference_to_servant (obj.in (),
-                                                                  ACE_TRY_ENV);
+        servant_from_reference = first_poa->reference_to_servant (obj.in ()
+                                                                  TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
-        first_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
+        first_poa->deactivate_object (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -345,76 +345,76 @@ test_poas (CORBA::ORB_ptr orb,
   {
     test_i servant (first_poa);
 
-    PortableServer::ObjectId_var id = first_poa->activate_object (&servant,
-                                                                  ACE_TRY_ENV);
+    PortableServer::ObjectId_var id = first_poa->activate_object (&servant
+                                                                  TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::Object_var obj = first_poa->id_to_reference (id.in (),
-                                                        ACE_TRY_ENV);
+    CORBA::Object_var obj = first_poa->id_to_reference (id.in ()
+                                                        TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = first_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0",
-                                               ACE_TRY_ENV);
+                                               "IDL:test:1.0"
+                                               TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    first_poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
+    first_poa->deactivate_object (id.in ()
+                                  TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   {
     test_i servant (second_poa);
 
-    CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0",
-                                                          ACE_TRY_ENV);
+    CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0"
+                                                          TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in (),
-                                                                   ACE_TRY_ENV);
+    PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in ()
+                                                                   TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     second_poa->activate_object_with_id (id.in (),
-                                         &servant,
-                                         ACE_TRY_ENV);
+                                         &servant
+                                         TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    obj = second_poa->id_to_reference (id.in (),
-                                       ACE_TRY_ENV);
+    obj = second_poa->id_to_reference (id.in ()
+                                       TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
-      second_poa->reference_to_servant (obj.in (),
-                                        ACE_TRY_ENV);
+      second_poa->reference_to_servant (obj.in ()
+                                        TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
-      second_poa->id_to_servant (id.in (),
-                                 ACE_TRY_ENV);
+      second_poa->id_to_servant (id.in ()
+                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -425,50 +425,50 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    obj = second_poa->servant_to_reference (&servant,
-                                            ACE_TRY_ENV);
+    obj = second_poa->servant_to_reference (&servant
+                                            TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (ACE_TRY_ENV);
+    obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant,
-                                                                              ACE_TRY_ENV);
+    PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant
+                                                                              TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
-    second_poa->deactivate_object (id.in (),
-                                   ACE_TRY_ENV);
+    second_poa->deactivate_object (id.in ()
+                                   TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         second_poa->activate_object_with_id (id.in (),
-                                             &servant,
-                                             ACE_TRY_ENV);
+                                             &servant
+                                             TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        servant_from_reference = second_poa->reference_to_servant (obj.in (),
-                                                                   ACE_TRY_ENV);
+        servant_from_reference = second_poa->reference_to_servant (obj.in ()
+                                                                   TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
-        second_poa->deactivate_object (id.in (),
-                                       ACE_TRY_ENV);
+        second_poa->deactivate_object (id.in ()
+                                       TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -476,33 +476,33 @@ test_poas (CORBA::ORB_ptr orb,
   {
     test_i servant (second_poa);
 
-    PortableServer::ObjectId_var id = second_poa->activate_object (&servant,
-                                                                   ACE_TRY_ENV);
+    PortableServer::ObjectId_var id = second_poa->activate_object (&servant
+                                                                   TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::Object_var obj = second_poa->id_to_reference (id.in (),
-                                                         ACE_TRY_ENV);
+    CORBA::Object_var obj = second_poa->id_to_reference (id.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = second_poa->create_reference_with_id (id.in (),
-                                                "IDL:test:1.0",
-                                                ACE_TRY_ENV);
+                                                "IDL:test:1.0"
+                                                TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    second_poa->deactivate_object (id.in (),
-                                   ACE_TRY_ENV);
+    second_poa->deactivate_object (id.in ()
+                                   TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -511,18 +511,18 @@ test_poas (CORBA::ORB_ptr orb,
     PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello");
 
     CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (),
-                                                                 "IDL:test:1.0",
-                                                                 ACE_TRY_ENV);
+                                                                 "IDL:test:1.0"
+                                                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in (),
-                                                                                 ACE_TRY_ENV);
+    PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in ()
+                                                                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
@@ -531,28 +531,28 @@ test_poas (CORBA::ORB_ptr orb,
     ACE_ASSERT (id_from_reference.in () == id.in ());
 
     third_poa->activate_object_with_id (id.in (),
-                                        &servant,
-                                        ACE_TRY_ENV);
+                                        &servant
+                                        TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    obj = third_poa->id_to_reference (id.in (),
-                                      ACE_TRY_ENV);
+    obj = third_poa->id_to_reference (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
-      third_poa->reference_to_servant (obj.in (),
-                                       ACE_TRY_ENV);
+      third_poa->reference_to_servant (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
-      third_poa->id_to_servant (id.in (),
-                                ACE_TRY_ENV);
+      third_poa->id_to_servant (id.in ()
+                                TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -563,27 +563,27 @@ test_poas (CORBA::ORB_ptr orb,
                     "servant_from_id and &servant\n"));
       }
 
-    obj = third_poa->servant_to_reference (&servant,
-                                           ACE_TRY_ENV);
+    obj = third_poa->servant_to_reference (&servant
+                                           TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (ACE_TRY_ENV);
+    obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant,
-                                                                             ACE_TRY_ENV);
+    PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant
+                                                                             TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_servant.in ());
@@ -591,25 +591,25 @@ test_poas (CORBA::ORB_ptr orb,
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
-    third_poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
+    third_poa->deactivate_object (id.in ()
+                                  TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         third_poa->activate_object_with_id (id.in (),
-                                            &servant,
-                                            ACE_TRY_ENV);
+                                            &servant
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        servant_from_reference = third_poa->reference_to_servant (obj.in (),
-                                                                  ACE_TRY_ENV);
+        servant_from_reference = third_poa->reference_to_servant (obj.in ()
+                                                                  TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
-        third_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
+        third_poa->deactivate_object (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -619,18 +619,18 @@ test_poas (CORBA::ORB_ptr orb,
     PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello");
 
     CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (),
-                                                                 "IDL:test:1.0",
-                                                                 ACE_TRY_ENV);
+                                                                 "IDL:test:1.0"
+                                                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
+    CORBA::String_var string = orb->object_to_string (obj.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in (),
-                                                                                 ACE_TRY_ENV);
+    PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in ()
+                                                                                 TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
@@ -639,28 +639,28 @@ test_poas (CORBA::ORB_ptr orb,
     ACE_ASSERT (id_from_reference.in () == id.in ());
 
     forth_poa->activate_object_with_id (id.in (),
-                                        &servant,
-                                        ACE_TRY_ENV);
+                                        &servant
+                                        TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    obj = forth_poa->id_to_reference (id.in (),
-                                      ACE_TRY_ENV);
+    obj = forth_poa->id_to_reference (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
+    string = orb->object_to_string (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
-      forth_poa->reference_to_servant (obj.in (),
-                                       ACE_TRY_ENV);
+      forth_poa->reference_to_servant (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
-      forth_poa->id_to_servant (id.in (),
-                                ACE_TRY_ENV);
+      forth_poa->id_to_servant (id.in ()
+                                TAO_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -676,18 +676,18 @@ test_poas (CORBA::ORB_ptr orb,
     if (perform_deactivation_test)
       {
         forth_poa->activate_object_with_id (id.in (),
-                                            &servant,
-                                            ACE_TRY_ENV);
+                                            &servant
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        servant_from_reference = forth_poa->reference_to_servant (obj.in (),
-                                                                  ACE_TRY_ENV);
+        servant_from_reference = forth_poa->reference_to_servant (obj.in ()
+                                                                  TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
-        forth_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
+        forth_poa->deactivate_object (id.in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -696,22 +696,22 @@ test_poas (CORBA::ORB_ptr orb,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0,
-                                            ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
-                                                                       ACE_TRY_ENV);
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ()
+                                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
@@ -729,8 +729,8 @@ main (int argc, char **argv)
                    first_poa.out (),
                    second_poa.out (),
                    third_poa.out (),
-                   forth_poa.out (),
-                   ACE_TRY_ENV);
+                   forth_poa.out ()
+                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_poas (orb.in (),
@@ -739,28 +739,28 @@ main (int argc, char **argv)
                  second_poa.in (),
                  third_poa.in (),
                  forth_poa.in (),
-                 perform_deactivation_test,
-                 ACE_TRY_ENV);
+                 perform_deactivation_test
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       first_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
+                          1
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       second_poa->destroy (1,
-                           1,
-                           ACE_TRY_ENV);
+                           1
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       third_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
+                          1
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       forth_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
+                          1
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poas (root_poa.in (),
@@ -768,8 +768,8 @@ main (int argc, char **argv)
                    first_poa.out (),
                    second_poa.out (),
                    third_poa.out (),
-                   forth_poa.out (),
-                   ACE_TRY_ENV);
+                   forth_poa.out ()
+                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_poas (orb.in (),
@@ -778,13 +778,13 @@ main (int argc, char **argv)
                  second_poa.in (),
                  third_poa.in (),
                  forth_poa.in (),
-                 perform_deactivation_test,
-                 ACE_TRY_ENV);
+                 perform_deactivation_test
+                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index 431ca90b91b..1507a34bb43 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -51,17 +51,17 @@ test_i::~test_i (void)
     {
       ACE_TRY_NEW_ENV
         {
-          PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+          PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          PortableServer::ObjectId_var id = poa->servant_to_id (this->other_,
-                                                                ACE_TRY_ENV);
+          PortableServer::ObjectId_var id = poa->servant_to_id (this->other_
+                                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating other servant\n"));
 
-          poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
+          poa->deactivate_object (id.in ()
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -81,56 +81,56 @@ main (int argc, char **argv)
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i *servant1 = new test_i (0);
       test_i *servant2 = new test_i (servant1);
 
       PortableServer::ObjectId_var id1 =
-        root_poa->activate_object (servant1,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (servant1
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give ownership to POA.
       servant1->_remove_ref ();
 
       PortableServer::ObjectId_var id2 =
-        root_poa->activate_object (servant2,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (servant2
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give ownership to POA.
       servant2->_remove_ref ();
 
-      root_poa->deactivate_object (id2.in (),
-                                   ACE_TRY_ENV);
+      root_poa->deactivate_object (id2.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 09f99b4856a..454cd4c1d5c 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -25,7 +25,7 @@ class test_i : public POA_test
 public:
   test_i (ACE_Auto_Event &event);
 
-  void deactivate_self (CORBA::Environment &ACE_TRY_ENV)
+  void deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -38,19 +38,19 @@ test_i::test_i (ACE_Auto_Event &event)
 }
 
 void
-test_i::deactivate_self (CORBA::Environment &ACE_TRY_ENV)
+test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
+  PortableServer::ObjectId_var id = poa->servant_to_id (this
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n"));
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
+  poa->deactivate_object (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n"));
@@ -113,15 +113,15 @@ Activator::svc (void)
       if (this->task_id_ == "first thread")
         {
           PortableServer::ObjectId_var id =
-            this->poa_->activate_object (this->servant_,
-                                         ACE_TRY_ENV);
+            this->poa_->activate_object (this->servant_
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
           this->poa_->activate_object_with_id (this->id_,
-                                               this->servant_,
-                                               ACE_TRY_ENV);
+                                               this->servant_
+                                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -157,7 +157,7 @@ Deactivator::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->test_->deactivate_self (ACE_TRY_ENV);
+      this->test_->deactivate_self (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -173,35 +173,35 @@ Deactivator::svc (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Auto_Event event1;
@@ -210,10 +210,10 @@ main (int argc, char **argv)
       ACE_Auto_Event event2;
       test_i servant2 (event2);
 
-      test_var test_object1 = servant1._this (ACE_TRY_ENV);
+      test_var test_object1 = servant1._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_var test_object2 = servant2._this (ACE_TRY_ENV);
+      test_var test_object2 = servant2._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id1 =
@@ -254,8 +254,8 @@ main (int argc, char **argv)
         return result;
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index ac5b10b626c..36800f959a1 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -22,65 +22,65 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (CORBA::Environment &ACE_TRY_ENV)
+  void destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 void
-test_i::destroy_poa (CORBA::Environment &ACE_TRY_ENV)
+test_i::destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 0;
   poa->destroy (etherealize_objects,
-                wait_for_completion,
-                ACE_TRY_ENV);
+                wait_for_completion
+                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i servant;
 
-      test_var test_object = servant._this (ACE_TRY_ENV);
+      test_var test_object = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_object->destroy_poa (ACE_TRY_ENV);
+      test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index b6a0439899a..ecee66581cc 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -27,10 +27,10 @@ class test_i : public virtual POA_test
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  void method (CORBA::Environment &ACE_TRY_ENV)
+  void method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   PortableServer::POA_var poa_;
@@ -44,7 +44,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (CORBA::Environment &ACE_TRY_ENV)
+test_i::method (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -62,16 +62,16 @@ test_i::method (CORBA::Environment &ACE_TRY_ENV)
       ACE_DEBUG ((LM_DEBUG,
                   "Calling self from %t\n"));
 
-      test_var self = this->_this (ACE_TRY_ENV);
+      test_var self = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      self->method (ACE_TRY_ENV);
+      self->method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -96,7 +96,7 @@ Worker::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->test_->method (ACE_TRY_ENV);
+      this->test_->method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -117,23 +117,23 @@ main (int argc, char **argv)
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
+                                                               TAO_ENV_ARG_PARAMETER);
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the new POA.
@@ -141,21 +141,21 @@ main (int argc, char **argv)
       policies.length (2);
 
       policies[0] =
-        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                     ACE_TRY_ENV);
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
-        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL,
-                                        ACE_TRY_ENV);
+        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the child POA.
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the policies
@@ -163,20 +163,20 @@ main (int argc, char **argv)
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (ACE_TRY_ENV);
+          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i servant1 (child_poa.in ());
       test_i servant2 (child_poa.in ());
 
-      test_var object1 = servant1._this (ACE_TRY_ENV);
+      test_var object1 = servant1._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_var object2 = servant2._this (ACE_TRY_ENV);
+      test_var object2 = servant2._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker1 (object1.in ());
@@ -194,8 +194,8 @@ main (int argc, char **argv)
       ACE_UNUSED_ARG (result);
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index 8cfb4941945..a6e778470ab 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -21,7 +21,7 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (CORBA::Environment &ACE_TRY_ENV)
+  void destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void test_poa (PortableServer::POA_ptr poa);
@@ -36,48 +36,48 @@ test_i::test_poa (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::destroy_poa (CORBA::Environment &ACE_TRY_ENV)
+test_i::destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 1;
   this->poa_->destroy (etherealize_objects,
-                       wait_for_completion,
-                       ACE_TRY_ENV);
+                       wait_for_completion
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
 init_orb (int argc,
           char **argv,
-          const char *orb_name,
-          CORBA::Environment &ACE_TRY_ENV)
+          const char *orb_name
+          TAO_ENV_ARG_DECL)
 {
   // Initialize the ORB first.
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        orb_name,
-                                        ACE_TRY_ENV);
+                                        orb_name
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Obtain the RootPOA.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA",
-                                     ACE_TRY_ENV);
+    orb->resolve_initial_references ("RootPOA"
+                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+    PortableServer::POA::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_TRY_ENV);
+    root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return root_poa._retn ();
@@ -87,26 +87,26 @@ int
 main (int argc,
       char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       PortableServer::POA_var first_poa =
         init_orb (argc,
                   argv,
-                  "first ORB",
-                  ACE_TRY_ENV);
+                  "first ORB"
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var second_poa =
         init_orb (argc,
                   argv,
-                  "second ORB",
-                  ACE_TRY_ENV);
+                  "second ORB"
+                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i servant;
-      test_var test_object = servant._this (ACE_TRY_ENV);
+      test_var test_object = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int expected_exception_raised = 0;
@@ -115,7 +115,7 @@ main (int argc,
         {
           servant.test_poa (first_poa.in ());
 
-          test_object->destroy_poa (ACE_TRY_ENV);
+          test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (first_poa);
         }
       ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
@@ -140,10 +140,10 @@ main (int argc,
 
       servant.test_poa (second_poa.in ());
 
-      test_object->destroy_poa (ACE_TRY_ENV);
+      test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      first_poa->destroy (1, 1, ACE_TRY_ENV);
+      first_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 045c618c27c..e12c722c98f 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -48,7 +48,7 @@ Test_Any::opname (void) const
 }
 
 void
-Test_Any::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV)
+Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("o1") <<= this->in_;
   req->add_inout_arg ("o2") <<= this->inout_;
@@ -56,7 +56,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV)
 
   req->set_return_type (CORBA::_tc_any);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const CORBA::Any *tmp;
@@ -64,13 +64,13 @@ Test_Any::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV)
   this->ret_ = new CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new CORBA::Any (*tmp);
@@ -92,13 +92,13 @@ static const CORBA::TypeCode_ptr any_table [] =
 #endif /* any_table isn't currently used */
 
 int
-Test_Any::init_parameters (Param_Test_ptr objref,
-                           CORBA::Environment &ACE_TRY_ENV)
+Test_Any::init_parameters (Param_Test_ptr objref
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_TRY_ENV);
+      this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->reset_parameters ();
@@ -269,15 +269,15 @@ Test_Any::reset_parameters (void)
 }
 
 int
-Test_Any::run_sii_test (Param_Test_ptr objref,
-                        CORBA::Environment &ACE_TRY_ENV)
+Test_Any::run_sii_test (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_any (this->in_,
                                      this->inout_,
-                                     this->out_.out (),
-                                     ACE_TRY_ENV);
+                                     this->out_.out ()
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index 921aa359526..713b16b4193 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -47,15 +47,15 @@ public:
     ANY_LAST_TEST_ITEM
   };
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -70,7 +70,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index 5f142364b7a..ea71d452ae1 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -32,8 +32,8 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Get_Opt get_opt (argc, argv, "dn:l:");
@@ -90,13 +90,13 @@ main (int argc, char *argv[])
 
           {
             CORBA::Object_var obj =
-              orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar",
-                                     ACE_TRY_ENV);
+              orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar"
+                                     TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             Param_Test_var param_test =
-              Param_Test::_unchecked_narrow (obj.in (),
-                                             ACE_TRY_ENV);
+              Param_Test::_unchecked_narrow (obj.in ()
+                                             TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
             TAO_Stub *stub = param_test->_stubobj ();
             stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0");
@@ -110,7 +110,7 @@ main (int argc, char *argv[])
                             "Cannot extract Param_Test (oh the horror)\n"));
               }
             CORBA::Boolean equiv =
-              param_test->_is_equivalent (o, ACE_TRY_ENV);
+              param_test->_is_equivalent (o TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (!equiv)
               {
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index c19db80d81b..1b7edb51d8e 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -48,15 +48,15 @@ Test_Bounded_Array_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req,
-                                             CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
+                                             TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_ArraySeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Bounded_ArraySeq *tmp;
@@ -64,21 +64,21 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_ArraySeq (*tmp);
 }
 
 int
-Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr,
-                                              CORBA::Environment &)
+Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr
+                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -123,8 +123,8 @@ Test_Bounded_Array_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref,
-                                           CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref
+                                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -133,8 +133,8 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref,
       this->ret_ =
         objref->test_bounded_array_sequence (this->in_,
                                              this->inout_.inout (),
-                                             out,
-                                             ACE_TRY_ENV);
+                                             out
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h
index 411cf0ec1e1..23d342214a9 100644
--- a/TAO/tests/Param_Test/bd_array_seq.h
+++ b/TAO/tests/Param_Test/bd_array_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Bounded_Array_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +57,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index eea7c524c9c..a32c2d50f10 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -47,15 +47,15 @@ Test_Bounded_Long_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req,
-                                            CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req
+                                            TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_Long_Seq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const Param_Test::Bounded_Long_Seq *tmp;
@@ -63,21 +63,21 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Bounded_Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_Long_Seq (*tmp);
 }
 
 int
-Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr,
-                                             CORBA::Environment &)
+Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr
+                                             TAO_ENV_ARG_DECL_NOT_USED)
 {
   // get some sequence length (32 in this case)
   CORBA::ULong len = this->in_->maximum ();
@@ -114,16 +114,16 @@ Test_Bounded_Long_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref,
-                                          CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref
+                                          TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       Param_Test::Bounded_Long_Seq_out out (this->out_.out ());
       this->ret_ = objref->test_bounded_long_sequence (this->in_.in (),
                                                        this->inout_.inout (),
-                                                       out,
-                                                       ACE_TRY_ENV);
+                                                       out
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index 5dda51d2268..0809eb53f40 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Bounded_Long_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 8d585809a4a..21836ba0f74 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -47,15 +47,15 @@ Test_Bounded_Short_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req,
-                                             CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req
+                                             TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_Short_Seq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Bounded_Short_Seq *tmp;
@@ -63,24 +63,23 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Bounded_Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_Short_Seq (*tmp);
 }
 
 int
-Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/,
-                                              CORBA::Environment  & /*env*/)
+Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/
+                                              TAO_ENV_ARG_DECL_NOT_USED /*env*/)
 {
   // ACE_UNUSED_ARG (objref);
-  // ACE_UNUSED_ARG (env);
 
   // get some sequence length (32 in this case)
   CORBA::ULong len = this->in_->maximum ();
@@ -119,8 +118,8 @@ Test_Bounded_Short_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref,
-                                           CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref
+                                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -128,8 +127,8 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_bounded_short_sequence (this->in_.in (),
                                                         this->inout_.inout (),
-                                                        out,
-                                                        ACE_TRY_ENV);
+                                                        out
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index 5efe29e22a6..54831453981 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Bounded_Short_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index bd9aae472bd..3df97b029d1 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -47,8 +47,8 @@ Test_Bounded_String_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req,
-                                              CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
+                                              TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Bounded_StrSeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const Param_Test::Bounded_StrSeq *tmp;
@@ -64,21 +64,21 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Bounded_StrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_StrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_StrSeq (*tmp);
 }
 
 int
-Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr ,
-                                               CORBA::Environment &)
+Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr
+                                               TAO_ENV_ARG_DECL_NOT_USED)
 {
   const char *choiceList[] =
   {
@@ -111,8 +111,8 @@ Test_Bounded_String_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref,
-                                            CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref
+                                            TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -120,8 +120,8 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_bounded_strseq (this->in_.in (),
                                                 this->inout_.inout (),
-                                                out,
-                                                ACE_TRY_ENV);
+                                                out
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index 48b60f9366b..9b6d776d2d0 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Bounded_String_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index aa2a1418189..88bce95539d 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -55,8 +55,8 @@ Test_Bounded_String::opname (void) const
 }
 
 void
-Test_Bounded_String::dii_req_invoke (CORBA::Request *req,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_String::dii_req_invoke (CORBA::Request *req
+                                     TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= CORBA::Any::from_string (this->in_, 128);
   req->add_inout_arg ("s2") <<= CORBA::Any::from_string (this->inout_, 128);
@@ -67,7 +67,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_short_string);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   char *tmp;
@@ -75,21 +75,21 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req,
   this->ret_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= CORBA::Any::to_string (tmp, 128);
   this->inout_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= CORBA::Any::to_string (tmp, 128);
   this->out_ = CORBA::string_dup (tmp);
 }
 
 int
-Test_Bounded_String::init_parameters (Param_Test_ptr,
-                                                              CORBA::Environment &)
+Test_Bounded_String::init_parameters (Param_Test_ptr
+                                                              TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -124,8 +124,8 @@ Test_Bounded_String::reset_parameters (void)
 }
 
 int
-Test_Bounded_String::run_sii_test (Param_Test_ptr objref,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_String::run_sii_test (Param_Test_ptr objref
+                                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -133,8 +133,8 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_bounded_string (this->in_,
                                                 this->inout_,
-                                                str_out,
-                                                ACE_TRY_ENV);
+                                                str_out
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index 46291917900..444ec8df45a 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -33,15 +33,15 @@ public:
   ~Test_Bounded_String (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 4671053d08f..3666187016c 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -50,15 +50,15 @@ Test_Bounded_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
-                                              CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
+                                              TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_StructSeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Bounded_StructSeq *tmp;
@@ -66,21 +66,21 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Bounded_StructSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_StructSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_StructSeq (*tmp);
 }
 
 int
-Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */,
-                                               CORBA::Environment & /* env */)
+Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */
+                                               TAO_ENV_ARG_DECL_NOT_USED /* env */)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -116,8 +116,8 @@ Test_Bounded_Struct_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
-                                            CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
+                                            TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -125,8 +125,8 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_bounded_struct_sequence (this->in_,
                                                          this->inout_.inout (),
-                                                         out,
-                                                         ACE_TRY_ENV);
+                                                         out
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index a8ce07bd760..d06ff51c1c8 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Bounded_Struct_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 2ba77400d20..a0b9ae9d756 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -47,8 +47,8 @@ Test_Bounded_WString_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req,
-                                               CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
+                                               TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Bounded_WStrSeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const Param_Test::Bounded_WStrSeq *tmp;
@@ -64,21 +64,21 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Bounded_WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_WStrSeq (*tmp);
 }
 
 int
-Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr ,
-                                                CORBA::Environment &)
+Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr
+                                                TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -93,7 +93,7 @@ Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr ,
     {
       this->in_[i] = gen->gen_wstring ();
 
-	  // different from in_
+          // different from in_
       this->inout_[i] = gen->gen_wstring ();
     }
 
@@ -110,8 +110,8 @@ Test_Bounded_WString_Sequence::reset_parameters (void)
 }
 
 int
-Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref,
-                                             CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref
+                                             TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -119,8 +119,8 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_bounded_wstrseq (this->in_.in (),
                                                  this->inout_.inout (),
-                                                 out,
-                                                 ACE_TRY_ENV);
+                                                 out
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h
index 108d53a4057..83c00d2f8a5 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.h
+++ b/TAO/tests/Param_Test/bd_wstr_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Bounded_WString_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +57,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index 5c02052a481..3100895a2b7 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -55,8 +55,8 @@ Test_Bounded_WString::opname (void) const
 }
 
 void
-Test_Bounded_WString::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
+                                      TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= CORBA::Any::from_wstring (this->in_, 128);
   req->add_inout_arg ("s2") <<= CORBA::Any::from_wstring (this->inout_, 128);
@@ -67,7 +67,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_short_wstring);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::WChar *tmp;
@@ -75,21 +75,21 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req,
   this->ret_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= CORBA::Any::to_wstring (tmp, 128);
   this->inout_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128);
   this->out_ = CORBA::wstring_dup (tmp);
 }
 
 int
-Test_Bounded_WString::init_parameters (Param_Test_ptr,
-                                                               CORBA::Environment &)
+Test_Bounded_WString::init_parameters (Param_Test_ptr
+                                                               TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -124,8 +124,8 @@ Test_Bounded_WString::reset_parameters (void)
 }
 
 int
-Test_Bounded_WString::run_sii_test (Param_Test_ptr objref,
-                                                            CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_WString::run_sii_test (Param_Test_ptr objref
+                                                            TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -133,8 +133,8 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_bounded_wstring (this->in_,
                                                  this->inout_,
-                                                 str_out,
-                                                 ACE_TRY_ENV);
+                                                 str_out
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h
index 8e864ce6f32..8a54c8df633 100644
--- a/TAO/tests/Param_Test/bd_wstring.h
+++ b/TAO/tests/Param_Test/bd_wstring.h
@@ -33,15 +33,15 @@ public:
   ~Test_Bounded_WString (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,8 +56,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index c91ebfdb755..0cb0f5589af 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -45,8 +45,8 @@ Test_Big_Union::opname (void) const
 }
 
 void
-Test_Big_Union::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Big_Union::dii_req_invoke (CORBA::Request *req
+                                TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -54,7 +54,7 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Big_Union);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Big_Union *tmp;
@@ -62,26 +62,26 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Big_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Big_Union (*tmp);
 }
 
 int
-Test_Big_Union::init_parameters (Param_Test_ptr objref,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Test_Big_Union::init_parameters (Param_Test_ptr objref
+                                 TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_TRY_ENV);
+      this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->reset_parameters ();
@@ -228,15 +228,15 @@ Test_Big_Union::reset_parameters (void)
 }
 
 int
-Test_Big_Union::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+Test_Big_Union::run_sii_test (Param_Test_ptr objref
+                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_big_union (this->in_,
                                            this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
+                                           this->out_
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -286,7 +286,7 @@ Test_Big_Union::check_validity (void)
       break;
     case 1:
       {
-        ACE_DECLARE_NEW_CORBA_ENV;
+        TAO_ENV_DECLARE_NEW_ENV;
         ACE_TRY
           {
             Coffee_ptr in    = this->in_.the_interface ();
@@ -301,16 +301,16 @@ Test_Big_Union::check_validity (void)
               return 0;
 
             Coffee::Desc_var in_desc =
-              in->description (ACE_TRY_ENV);
+              in->description (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             Coffee::Desc_var inout_desc =
-              inout->description (ACE_TRY_ENV);
+              inout->description (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             Coffee::Desc_var out_desc =
-              out->description (ACE_TRY_ENV);
+              out->description (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             Coffee::Desc_var ret_desc =
-              ret->description (ACE_TRY_ENV);
+              ret->description (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (ACE_OS::strcmp (in_desc->name.in (),
diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h
index e92b00b0046..08e5a702396 100644
--- a/TAO/tests/Param_Test/big_union.h
+++ b/TAO/tests/Param_Test/big_union.h
@@ -37,15 +37,15 @@ public:
     BIG_UNION_N_BRANCHES = 12
   };
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -60,7 +60,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 1b62f5ffd33..3fe60d6cd70 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -65,10 +65,10 @@ Param_Test_Client<T>::run_sii_test (void)
   this->results_.iterations (opt->loop_count ());
 
   // Declare the Env
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   // Initialize parameters for the test.
-  int check = this->test_object_->init_parameters (this->param_test_,
-                                                   ACE_TRY_ENV);
+  int check = this->test_object_->init_parameters (this->param_test_
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (check == -1)
@@ -97,8 +97,8 @@ Param_Test_Client<T>::run_sii_test (void)
           this->results_.start_timer ();
 
           // make the call
-          this->test_object_->run_sii_test (this->param_test_,
-                                            ACE_TRY_ENV);
+          this->test_object_->run_sii_test (this->param_test_
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // stop the timer.
@@ -178,10 +178,10 @@ Param_Test_Client<T>::run_dii_test (void)
   this->results_.iterations (opt->loop_count ());
 
   // Environment variable
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   // initialize parameters for the test
-  int check = this->test_object_->init_parameters (this->param_test_,
-                                                   ACE_TRY_ENV);
+  int check = this->test_object_->init_parameters (this->param_test_
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (check == -1)
@@ -207,8 +207,8 @@ Param_Test_Client<T>::run_dii_test (void)
 
       ACE_TRY
         {
-          req = this->param_test_->_request (opname,
-                                             ACE_TRY_ENV);
+          req = this->param_test_->_request (opname
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (opt->debug ())
@@ -218,8 +218,8 @@ Param_Test_Client<T>::run_dii_test (void)
             }
 
           // Make the invocation, verify the result.
-          this->test_object_->dii_req_invoke (req.in (),
-                                              ACE_TRY_ENV);
+          this->test_object_->dii_req_invoke (req.in ()
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index d3050e2852e..d3d621880fe 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -51,8 +51,8 @@ Test_Complex_Any::opname (void) const
 }
 
 void
-Test_Complex_Any::dii_req_invoke (CORBA::Request *req,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Test_Complex_Any::dii_req_invoke (CORBA::Request *req
+                                  TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -60,7 +60,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (CORBA::_tc_any);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const CORBA::Any *tmp;
@@ -68,21 +68,21 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new CORBA::Any (*tmp);
 }
 
 int
-Test_Complex_Any::init_parameters (Param_Test_ptr,
-                                   CORBA::Environment &)
+Test_Complex_Any::init_parameters (Param_Test_ptr
+                                   TAO_ENV_ARG_DECL_NOT_USED)
 {
   return this->reset_parameters ();
 }
@@ -167,15 +167,15 @@ Test_Complex_Any::reset_parameters (void)
 }
 
 int
-Test_Complex_Any::run_sii_test (Param_Test_ptr objref,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Complex_Any::run_sii_test (Param_Test_ptr objref
+                                TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_complex_any (this->in_,
                                              this->inout_,
-                                             this->out_.out (),
-                                             ACE_TRY_ENV);
+                                             this->out_.out ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h
index 026d441ab22..088e9fdeea7 100644
--- a/TAO/tests/Param_Test/complex_any.h
+++ b/TAO/tests/Param_Test/complex_any.h
@@ -33,15 +33,15 @@ public:
   ~Test_Complex_Any (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 645cf856148..cac0b11e525 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -61,8 +61,7 @@ int
 Driver::init (int argc, char **argv)
 {
   // environment to track exceptions
-  ACE_DECLARE_NEW_CORBA_ENV;
-  //CORBA::Environment env;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   // retrieve the instance of Options
   Options *opt = OPTIONS::instance ();
@@ -76,8 +75,8 @@ Driver::init (int argc, char **argv)
       // Retrieve the underlying ORB
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -90,7 +89,7 @@ Driver::init (int argc, char **argv)
       ACE_OS::strcpy (exception_string,"ORB::string_to_object() failed.");
 
       CORBA::Object_var temp =
-        this->orb_->string_to_object (opt->param_test_ior (), ACE_TRY_ENV);
+        this->orb_->string_to_object (opt->param_test_ior () TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -103,7 +102,7 @@ Driver::init (int argc, char **argv)
       // Get the object reference
       ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
 
-      this->objref_ = Param_Test::_narrow (temp.in(), ACE_TRY_ENV);
+      this->objref_ = Param_Test::_narrow (temp.in() TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -614,12 +613,12 @@ Driver::run (void)
     }
 
   // Get in a new environment variable
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (opt->shutdown ())
         {
-          this->objref_->shutdown (ACE_TRY_ENV);
+          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index eec0aa7823f..5d2b8a77165 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -47,8 +47,8 @@ Test_Exception::opname (void) const
 }
 
 void
-Test_Exception::dii_req_invoke (CORBA::Request_ptr req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Exception::dii_req_invoke (CORBA::Request_ptr req
+                                TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -61,18 +61,18 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req,
 
       req->exceptions ()->add (CORBA::TypeCode::_duplicate (Param_Test::_tc_Ooops));
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       req->return_value () >>= this->ret_;
 
       CORBA::NamedValue_ptr o2 =
-        req->arguments ()->item (1, ACE_TRY_ENV);
+        req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       *o2->value () >>= this->inout_;
 
       CORBA::NamedValue_ptr o3 =
-        req->arguments ()->item (2, ACE_TRY_ENV);
+        req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
       *o3->value () >>= this->out_;
     }
@@ -131,8 +131,8 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req,
 }
 
 int
-Test_Exception::init_parameters (Param_Test_ptr,
-                                 CORBA::Environment &)
+Test_Exception::init_parameters (Param_Test_ptr
+                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -151,16 +151,16 @@ Test_Exception::reset_parameters (void)
 }
 
 int
-Test_Exception::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+Test_Exception::run_sii_test (Param_Test_ptr objref
+                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->in_++;
       this->ret_ = objref->test_exception (this->in_,
                                            this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
+                                           this->out_
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Param_Test::Ooops, ex)
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index fb85e1d71cc..ba7c1d9260a 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -30,15 +30,15 @@ public:
   ~Test_Exception (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -53,7 +53,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index cad9afe1d72..b34cdbd5e46 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -44,15 +44,15 @@ Test_Fixed_Array::opname (void) const
 }
 
 void
-Test_Fixed_Array::dii_req_invoke (CORBA::Request *req,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
+                                  TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= Param_Test::Fixed_Array_forany (this->in_);
   req->add_inout_arg ("s2") <<= Param_Test::Fixed_Array_forany (this->inout_);
   req->add_out_arg ("s3") <<= Param_Test::Fixed_Array_forany (this->out_);
   req->set_return_type (Param_Test::_tc_Fixed_Array);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Fixed_Array_forany forany;
@@ -60,13 +60,13 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req,
   Param_Test::Fixed_Array_copy (this->ret_, forany.in ());
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= forany;
   Param_Test::Fixed_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   Param_Test::Fixed_Array_forany out_any (this->out_);
   *arg3->value () >>= forany;
@@ -74,13 +74,12 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req,
 }
 
 int
-Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/,
-                                   CORBA::Environment &/*env*/)
+Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/
+                                   TAO_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
   //ACE_UNUSED_ARG (objref);
-  //ACE_UNUSED_ARG (env);
 
   for (CORBA::ULong i=0; i < Param_Test::DIM1; i++)
     {
@@ -107,15 +106,15 @@ Test_Fixed_Array::reset_parameters (void)
 }
 
 int
-Test_Fixed_Array::run_sii_test (Param_Test_ptr objref,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Fixed_Array::run_sii_test (Param_Test_ptr objref
+                                TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_fixed_array (this->in_,
                                              this->inout_,
-                                             this->out_,
-                                             ACE_TRY_ENV);
+                                             this->out_
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index 51cb8d1753d..c885b66f58e 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -33,15 +33,15 @@ public:
   ~Test_Fixed_Array (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index d185f868fe0..46e87cc5b66 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -43,15 +43,15 @@ Test_Fixed_Struct::opname (void) const
 }
 
 void
-Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req
+                                   TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
   req->add_out_arg ("s3") <<= this->out_;
   req->set_return_type (Param_Test::_tc_Fixed_Struct);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Fixed_Struct *tmp;
@@ -59,26 +59,25 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req,
   this->ret_ = *tmp;
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = *tmp;
 }
 
 int
-Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/,
-                                    CORBA::Environment &/*env*/)
+Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/
+                                    TAO_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
   //ACE_UNUSED_ARG (objref);
-  //ACE_UNUSED_ARG (env);
 
   this->in_ = gen->gen_fixed_struct ();
   ACE_OS::memset (&this->inout_,
@@ -106,15 +105,15 @@ Test_Fixed_Struct::reset_parameters (void)
 }
 
 int
-Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref
+                                 TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_fixed_struct (this->in_,
                                               this->inout_,
-                                              this->out_,
-                                              ACE_TRY_ENV);
+                                              this->out_
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index 81ec824b4a7..aeef44761a5 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -33,15 +33,15 @@ public:
   ~Test_Fixed_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index b17e6e302b2..6dd783bf1e5 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -46,8 +46,8 @@ Test_Multdim_Array::opname (void) const
 }
 
 void
-Test_Multdim_Array::dii_req_invoke (CORBA::Request *req,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
+                                    TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= Param_Test::Multdim_Array_forany (this->in_.inout ());
   req->add_inout_arg ("s2") <<= Param_Test::Multdim_Array_forany (this->inout_.inout ());
@@ -55,7 +55,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Multdim_Array);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -64,21 +64,21 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req,
   Param_Test::Multdim_Array_copy (this->ret_, forany.in ());
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= forany;
   Param_Test::Multdim_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= forany;
   Param_Test::Multdim_Array_copy (this->out_, forany.in ());
 }
 
 int
-Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/,
-                                     CORBA::Environment &/*env*/)
+Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/
+                                     TAO_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -133,14 +133,25 @@ Test_Multdim_Array::reset_parameters (void)
 }
 
 int
-Test_Multdim_Array::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Test_Multdim_Array::run_sii_test (Param_Test_ptr objref
+                                  TAO_ENV_ARG_DECL)
 {
-  this->ret_ = objref->test_multdim_array (this->in_.in (),
-                                           this->inout_.inout (),
-                                           this->out_.inout (),
-                                           ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+  ACE_TRY
+    {
+      this->ret_ = objref->test_multdim_array (this->in_.in (),
+                                               this->inout_.inout (),
+                                               this->out_.inout ()
+                                               TAO_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      return 0;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Test_Multdim_Array::run_sii_test\n");
+    }
+  ACE_ENDTRY;
+  return -1;
 }
 
 CORBA::Boolean
diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h
index 2f8afdce885..65f04d5b2f5 100644
--- a/TAO/tests/Param_Test/multdim_array.h
+++ b/TAO/tests/Param_Test/multdim_array.h
@@ -33,15 +33,15 @@ public:
   ~Test_Multdim_Array (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 0bb1ad2adba..022c4fb538f 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -48,14 +48,14 @@ Test_Nested_Struct::opname (void) const
 }
 
 void
-Test_Nested_Struct::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV)
+Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Nested_Struct);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Nested_Struct *tmp;
@@ -63,21 +63,21 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE
   this->ret_ = new Param_Test::Nested_Struct (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Nested_Struct (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Nested_Struct (*tmp);
 }
 
 int
-Test_Nested_Struct::init_parameters (Param_Test_ptr,
-                                     CORBA::Environment &)
+Test_Nested_Struct::init_parameters (Param_Test_ptr
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -130,16 +130,16 @@ Test_Nested_Struct::reset_parameters (void)
 }
 
 int
-Test_Nested_Struct::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Test_Nested_Struct::run_sii_test (Param_Test_ptr objref
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       Param_Test::Nested_Struct_out out (this->out_.out ());
       this->ret_ = objref->test_nested_struct (this->in_,
                                                this->inout_.inout (),
-                                               out,
-                                               ACE_TRY_ENV);
+                                               out
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index cbd260906ab..c90edc3a437 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -34,15 +34,15 @@ public:
   ~Test_Nested_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 9ef81ab4216..128959dfed3 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -43,8 +43,8 @@ Test_ObjRef::opname (void) const
 }
 
 void
-Test_ObjRef::dii_req_invoke (CORBA::Request *req,
-                             CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef::dii_req_invoke (CORBA::Request *req
+                             TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -52,7 +52,7 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (_tc_Coffee);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Coffee_ptr tmp;
@@ -60,13 +60,13 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req,
   this->ret_ = Coffee::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = Coffee::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = Coffee::_duplicate (tmp);
@@ -82,13 +82,12 @@ static const char *Coffee_Flavor [] = {
 };
 
 int
-Test_ObjRef::init_parameters (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef::init_parameters (Param_Test_ptr objref
+                              TAO_ENV_ARG_DECL)
 {
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
 
-  // New environment variable
   char msg_str[256] = "";
 
   ACE_TRY
@@ -96,7 +95,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref,
       ACE_OS::strcpy (msg_str, "make_cofee");
 
       // first get a Coffee object
-      this->in_ = objref->make_coffee (ACE_TRY_ENV);
+      this->in_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get some index into Coffee_Flavor [].
@@ -105,7 +104,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref,
 
       // set the attribute of the object
       ACE_OS::strcpy (msg_str, "set coffee attribute");
-      this->in_->description (desc, ACE_TRY_ENV); // set the attribute for the in object
+      this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object
       ACE_TRY_CHECK;
 
       this->inout_ = Coffee::_nil ();
@@ -126,8 +125,7 @@ int
 Test_ObjRef::reset_parameters (void)
 {
   // Environemnt variable
-  ACE_DECLARE_NEW_CORBA_ENV;
-  //CORBA::Environment env;
+  TAO_ENV_DECLARE_NEW_ENV;
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -138,7 +136,7 @@ Test_ObjRef::reset_parameters (void)
   ACE_TRY
     {
       // set the attribute of the object
-      this->in_->description (desc, ACE_TRY_ENV); // set the attribute for the in object
+      this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -156,8 +154,8 @@ Test_ObjRef::reset_parameters (void)
 }
 
 int
-Test_ObjRef::run_sii_test (Param_Test_ptr objref,
-                           CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef::run_sii_test (Param_Test_ptr objref
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -165,8 +163,8 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_objref (this->in_.in (),
                                         this->inout_.inout (),
-                                        out,
-                                        ACE_TRY_ENV);
+                                        out
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -185,7 +183,7 @@ CORBA::Boolean
 Test_ObjRef::check_validity (void)
 {
   // Environemnt variable
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -195,24 +193,24 @@ Test_ObjRef::check_validity (void)
           || CORBA::is_nil (this->ret_.in ()))
         return 0;
       Coffee::Desc_var in_desc =
-        this->in_->description (ACE_TRY_ENV);
+        this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *in = in_desc->name.in ();
 
       Coffee::Desc_var inout_desc =
-        this->inout_->description (ACE_TRY_ENV);
+        this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *inout = inout_desc->name.in ();
 
       Coffee::Desc_var out_desc =
-        this->out_->description (ACE_TRY_ENV);
+        this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *out = out_desc->name.in ();
 
-      Coffee::Desc_var ret_desc = this->out_->description (ACE_TRY_ENV);
+      Coffee::Desc_var ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char* ret = ret_desc->name.in ();
@@ -242,10 +240,8 @@ Test_ObjRef::check_validity (CORBA::Request_ptr)
 void
 Test_ObjRef::print_values (void)
 {
-  //  CORBA::Environment env;
-
   // Env. variable
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   Coffee::Desc_var ret_desc;
   const char *in = 0;
@@ -254,23 +250,23 @@ Test_ObjRef::print_values (void)
   ACE_TRY
     {
       Coffee::Desc_var in_desc =
-        this->in_->description (ACE_TRY_ENV);
+        this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       in = in_desc->name.in ();
 
       Coffee::Desc_var inout_desc =
-        this->inout_->description (ACE_TRY_ENV);
+        this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       inout = inout_desc->name.in ();
 
       Coffee::Desc_var out_desc =
-        this->out_->description (ACE_TRY_ENV);
+        this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       out = out_desc->name.in ();
 
-      ret_desc = this->out_->description (ACE_TRY_ENV);
+      ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index 459f26a1ecc..77e9c0baa68 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -33,15 +33,15 @@ public:
   ~Test_ObjRef (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index ef38d4054f4..4489417361f 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -48,8 +48,8 @@ Test_Objref_Struct::opname (void) const
 }
 
 void
-Test_Objref_Struct::dii_req_invoke (CORBA::Request *req,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
+                                    TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -57,7 +57,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Objref_Struct);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Objref_Struct *tmp;
@@ -65,21 +65,21 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Objref_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Objref_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Objref_Struct (*tmp);
 }
 
 int
-Test_Objref_Struct::init_parameters (Param_Test_ptr objref,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Objref_Struct::init_parameters (Param_Test_ptr objref
+                                     TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -88,22 +88,22 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref,
       // Set the long member.
       this->in_.x = gen->gen_long ();
 
-      this->in_.y = objref->make_coffee (ACE_TRY_ENV);
+      this->in_.y = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Coffee::Desc d;
       d.name = gen->gen_string ();
 
-      this->in_.y->description (d,
-                                ACE_TRY_ENV);
+      this->in_.y->description (d
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-	    this->inout_->x = 0;
+            this->inout_->x = 0;
 
-	    this->inout_->y = Coffee::_nil ();
+            this->inout_->y = Coffee::_nil ();
 
       Coffee::Desc dd;
-	    dd.name = CORBA::string_dup ("");
+            dd.name = CORBA::string_dup ("");
 
       return 0;
     }
@@ -124,19 +124,19 @@ Test_Objref_Struct::reset_parameters (void)
   this->out_ = new Param_Test::Objref_Struct;
   this->ret_ = new Param_Test::Objref_Struct;
 
-	this->inout_->x = 0;
+        this->inout_->x = 0;
 
-	this->inout_->y = Coffee::_nil ();
+        this->inout_->y = Coffee::_nil ();
 
   Coffee::Desc dd;
-	dd.name = CORBA::string_dup ("");
+        dd.name = CORBA::string_dup ("");
 
   return 0;
 }
 
 int
-Test_Objref_Struct::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Test_Objref_Struct::run_sii_test (Param_Test_ptr objref
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -144,8 +144,8 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_objref_struct (this->in_,
                                                this->inout_.inout (),
-                                               out,
-                                               ACE_TRY_ENV);
+                                               out
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -168,7 +168,7 @@ Test_Objref_Struct::check_validity (void)
       || this->in_.x != this->ret_->x)
     return 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -180,16 +180,16 @@ Test_Objref_Struct::check_validity (void)
           return 0;
         }
 
-      Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
@@ -231,21 +231,21 @@ Test_Objref_Struct::print_values (void)
               this->out_->x,
               this->ret_->x ));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
 
-      Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
+      Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index 5ded88f67c5..e1c684a39c6 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -34,15 +34,15 @@ public:
   ~Test_Objref_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 0ffcbd5365d..689e66c5c81 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -35,7 +35,7 @@ Coffee_i::~Coffee_i (void)
 
 // get attribute
 Coffee::Desc *
-Coffee_i::description (CORBA::Environment & /*env*/)
+Coffee_i::description (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee::Desc *desc = new Coffee::Desc;
@@ -45,8 +45,8 @@ Coffee_i::description (CORBA::Environment & /*env*/)
 
 // set attribute
 void
-Coffee_i::description (const Coffee::Desc &description,
-                       CORBA::Environment & /*env*/)
+Coffee_i::description (const Coffee::Desc &description
+                       TAO_ENV_ARG_DECL_NOT_USED /*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (description.name);
@@ -74,8 +74,8 @@ Param_Test_i::~Param_Test_i (void)
 CORBA::Short
 Param_Test_i::test_short (CORBA::Short s1,
                           CORBA::Short &s2,
-                          CORBA::Short_out s3,
-                          CORBA::Environment &)
+                          CORBA::Short_out s3
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = (CORBA::Short) (s1 * 2);
@@ -93,8 +93,8 @@ Param_Test_i::test_short (CORBA::Short s1,
 CORBA::ULongLong
 Param_Test_i::test_ulonglong (CORBA::ULongLong s1,
                               CORBA::ULongLong &s2,
-                              CORBA::ULongLong_out s3,
-                              CORBA::Environment &)
+                              CORBA::ULongLong_out s3
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1 * 2;
@@ -108,8 +108,8 @@ Param_Test_i::test_ulonglong (CORBA::ULongLong s1,
 char *
 Param_Test_i::test_unbounded_string (const char *s1,
                                      char *&s2,
-                                     CORBA::String_out s3,
-                                     CORBA::Environment &)
+                                     CORBA::String_out s3
+                                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
@@ -127,8 +127,8 @@ Param_Test_i::test_unbounded_string (const char *s1,
 char *
 Param_Test_i::test_bounded_string (const char *s1,
                                    char *&s2,
-                                   CORBA::String_out s3,
-                                   CORBA::Environment &)
+                                   CORBA::String_out s3
+                                   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
@@ -146,8 +146,8 @@ Param_Test_i::test_bounded_string (const char *s1,
 CORBA::WChar *
 Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1,
                                       CORBA::WChar *&ws2,
-                                      CORBA::WString_out ws3,
-                                      CORBA::Environment &)
+                                      CORBA::WString_out ws3
+                                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
@@ -169,8 +169,8 @@ Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1,
 CORBA::WChar *
 Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1,
                                     CORBA::WChar *&ws2,
-                                    CORBA::WString_out ws3,
-                                    CORBA::Environment &)
+                                    CORBA::WString_out ws3
+                                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
@@ -190,8 +190,8 @@ Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1,
 Param_Test::Fixed_Struct
 Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                                  Param_Test::Fixed_Struct &s2,
-                                 Param_Test::Fixed_Struct_out s3,
-                                 CORBA::Environment &)
+                                 Param_Test::Fixed_Struct_out s3
+                                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1;
@@ -204,8 +204,8 @@ Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
 Param_Test::Long_Seq *
 Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1,
                                   Param_Test::Long_Seq & s2,
-                                  Param_Test::Long_Seq_out s3,
-                                  CORBA::Environment &)
+                                  Param_Test::Long_Seq_out s3
+                                  TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Long_Seq
@@ -222,8 +222,8 @@ Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1,
 Param_Test::Short_Seq *
 Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1,
                                    Param_Test::Short_Seq & s2,
-                                   Param_Test::Short_Seq_out s3,
-                                   CORBA::Environment &)
+                                   Param_Test::Short_Seq_out s3
+                                   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Short_Seq
@@ -240,8 +240,8 @@ Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1,
 Param_Test::Bounded_Short_Seq *
 Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1,
                                            Param_Test::Bounded_Short_Seq & s2,
-                                           Param_Test::Bounded_Short_Seq_out s3,
-                                           CORBA::Environment &)
+                                           Param_Test::Bounded_Short_Seq_out s3
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Short_Seq
@@ -258,8 +258,8 @@ Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq &
 Param_Test::Bounded_Long_Seq *
 Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1,
                                           Param_Test::Bounded_Long_Seq & s2,
-                                          Param_Test::Bounded_Long_Seq_out s3,
-                                          CORBA::Environment &)
+                                          Param_Test::Bounded_Long_Seq_out s3
+                                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Long_Seq
@@ -276,8 +276,8 @@ Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s
 Param_Test::StrSeq *
 Param_Test_i::test_strseq (const Param_Test::StrSeq &s1,
                            Param_Test::StrSeq &s2,
-                           Param_Test::StrSeq_out s3,
-                           CORBA::Environment &)
+                           Param_Test::StrSeq_out s3
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -312,8 +312,8 @@ Param_Test_i::test_strseq (const Param_Test::StrSeq &s1,
 Param_Test::Bounded_StrSeq *
 Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1,
                                    Param_Test::Bounded_StrSeq & s2,
-                                   Param_Test::Bounded_StrSeq_out s3,
-                                   CORBA::Environment &)
+                                   Param_Test::Bounded_StrSeq_out s3
+                                   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -333,8 +333,8 @@ Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1,
 Param_Test::WStrSeq *
 Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1,
                             Param_Test::WStrSeq &ws2,
-                            Param_Test::WStrSeq_out ws3,
-                            CORBA::Environment &)
+                            Param_Test::WStrSeq_out ws3
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -354,8 +354,8 @@ Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1,
 Param_Test::Bounded_WStrSeq *
 Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1,
                                     Param_Test::Bounded_WStrSeq & ws2,
-                                    Param_Test::Bounded_WStrSeq_out ws3,
-                                    CORBA::Environment &)
+                                    Param_Test::Bounded_WStrSeq_out ws3
+                                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -376,8 +376,8 @@ Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1,
 Param_Test::StructSeq *
 Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
                                     Param_Test::StructSeq &s2,
-                                    Param_Test::StructSeq_out s3,
-                                    CORBA::Environment &)
+                                    Param_Test::StructSeq_out s3
+                                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -399,8 +399,8 @@ Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
 Param_Test::Bounded_StructSeq *
 Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1,
                                             Param_Test::Bounded_StructSeq & s2,
-                                            Param_Test::Bounded_StructSeq_out s3,
-                                            CORBA::Environment &)
+                                            Param_Test::Bounded_StructSeq_out s3
+                                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_StructSeq
@@ -418,8 +418,8 @@ Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq
 Param_Test::PathSpec *
 Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
                                               Param_Test::PathSpec & s2,
-                                              Param_Test::PathSpec_out s3,
-                                              CORBA::Environment &)
+                                              Param_Test::PathSpec_out s3
+                                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::PathSpec
@@ -451,8 +451,8 @@ Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
 Param_Test::ArraySeq *
 Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1,
                                    Param_Test::ArraySeq &s2,
-                                   Param_Test::ArraySeq_out s3,
-                                   CORBA::Environment &)
+                                   Param_Test::ArraySeq_out s3
+                                   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -474,8 +474,8 @@ Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1,
 Param_Test::Bounded_ArraySeq *
 Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & s1,
                                            Param_Test::Bounded_ArraySeq & s2,
-                                           Param_Test::Bounded_ArraySeq_out s3,
-                                           CORBA::Environment &)
+                                           Param_Test::Bounded_ArraySeq_out s3
+                                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_ArraySeq
@@ -492,8 +492,8 @@ Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq &
 Param_Test::Coffee_Mix *
 Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
                               Param_Test::Coffee_Mix & s2,
-                              Param_Test::Coffee_Mix_out s3,
-                              CORBA::Environment &)
+                              Param_Test::Coffee_Mix_out s3
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Coffee_Mix
@@ -535,8 +535,8 @@ Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
 Param_Test::Bounded_Coffee_Mix *
 Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1,
                                       Param_Test::Bounded_Coffee_Mix & s2,
-                                      Param_Test::Bounded_Coffee_Mix_out s3,
-                                      CORBA::Environment &)
+                                      Param_Test::Bounded_Coffee_Mix_out s3
+                                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Coffee_Mix
@@ -578,8 +578,8 @@ Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1,
 Param_Test::AnySeq *
 Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1,
                            Param_Test::AnySeq &s2,
-                           Param_Test::AnySeq_out s3,
-                           CORBA::Environment &)
+                           Param_Test::AnySeq_out s3
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -602,8 +602,8 @@ Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1,
 Param_Test::Var_Struct *
 Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
                                Param_Test::Var_Struct &s2,
-                               Param_Test::Var_Struct_out s3,
-                               CORBA::Environment &)
+                               Param_Test::Var_Struct_out s3
+                               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -624,8 +624,8 @@ Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
 Param_Test::Nested_Struct *
 Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
                                   Param_Test::Nested_Struct &s2,
-                                  Param_Test::Nested_Struct_out s3,
-                                  CORBA::Environment &)
+                                  Param_Test::Nested_Struct_out s3
+                                  TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -646,8 +646,8 @@ Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
 Param_Test::Recursive_Struct *
 Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1,
                                      Param_Test::Recursive_Struct &s2,
-                                     Param_Test::Recursive_Struct_out s3,
-                                     CORBA::Environment &)
+                                     Param_Test::Recursive_Struct_out s3
+                                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" structs into all the inout, out and return sequences.
@@ -667,8 +667,8 @@ Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1,
 Param_Test::Objref_Struct *
 Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
                                   Param_Test::Objref_Struct &s2,
-                                  Param_Test::Objref_Struct_out s3,
-                                  CORBA::Environment &)
+                                  Param_Test::Objref_Struct_out s3
+                                  TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -687,32 +687,32 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 
 // make a Coffee object
 Coffee_ptr
-Param_Test_i::make_coffee (CORBA::Environment &ACE_TRY_ENV)
+Param_Test_i::make_coffee (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obj_._this (ACE_TRY_ENV);
+  return this->obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // test for object references
 Coffee_ptr
 Param_Test_i::test_objref (Coffee_ptr o1,
                            Coffee_ptr &o2,
-                           Coffee_out o3,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           Coffee_out o3
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee_ptr ret = Coffee::_nil ();
 
   ACE_TRY
     {
-      Coffee_var myobj = obj_._this (ACE_TRY_ENV);
+      Coffee_var myobj = obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (o2))
         CORBA::release (o2);
 
-      CORBA::Boolean equiv = myobj->_is_equivalent (o1,
-                                                    ACE_TRY_ENV);
+      CORBA::Boolean equiv = myobj->_is_equivalent (o1
+                                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (equiv)
@@ -746,8 +746,8 @@ Param_Test_i::test_objref (Coffee_ptr o1,
 CORBA::TypeCode_ptr
 Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
                              CORBA::TypeCode_ptr &t2,
-                             CORBA::TypeCode_out t3,
-                             CORBA::Environment &/*env*/)
+                             CORBA::TypeCode_out t3
+                             TAO_ENV_ARG_DECL_NOT_USED/*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we simply assign t1 to the others
@@ -761,8 +761,8 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
 CORBA::Any *
 Param_Test_i::test_any (const CORBA::Any &a1,
                         CORBA::Any &a2,
-                        CORBA::Any_out a3,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Any_out a3
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any *ret;
@@ -784,7 +784,7 @@ Param_Test_i::test_any (const CORBA::Any &a1,
   if (TAO_debug_level > 0)
     {
       CORBA::TypeCode_var tc = a1.type ();
-      int kind = tc->kind (ACE_TRY_ENV);
+      int kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_DEBUG ((LM_DEBUG,
@@ -928,8 +928,8 @@ Param_Test_i::test_any (const CORBA::Any &a1,
 Param_Test::Fixed_Array_slice *
 Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
                                 Param_Test::Fixed_Array a2,
-                                Param_Test::Fixed_Array_out a3,
-                                CORBA::Environment &)
+                                Param_Test::Fixed_Array_out a3
+                                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Fixed_Array_slice *ret;
@@ -944,8 +944,8 @@ Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
 Param_Test::Var_Array_slice *
 Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
                               Param_Test::Var_Array a2,
-                              Param_Test::Var_Array_out a3,
-                              CORBA::Environment &)
+                              Param_Test::Var_Array_out a3
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Var_Array_slice *ret;
@@ -959,8 +959,8 @@ Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
 CORBA::ULong
 Param_Test_i::test_exception (CORBA::ULong s1,
                               CORBA::ULong& s2,
-                              CORBA::ULong_out s3,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::ULong_out s3
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Param_Test::Ooops))
 {
@@ -981,7 +981,7 @@ Param_Test_i::test_exception (CORBA::ULong s1,
   // warning that test_exception is throwing an exception
   // not in its THROW_SPEC, but still test TAO's
   // conversion of such an exception to UNKNOWN.
-  this->throw_badboy (ACE_TRY_ENV);
+  this->throw_badboy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return 0;
@@ -990,8 +990,8 @@ Param_Test_i::test_exception (CORBA::ULong s1,
 Param_Test::Big_Union*
 Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
                               Param_Test::Big_Union& u2,
-                              Param_Test::Big_Union_out u3,
-                              CORBA::Environment &)
+                              Param_Test::Big_Union_out u3
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1));
@@ -1003,8 +1003,8 @@ Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
 Param_Test::Small_Union
 Param_Test_i::test_small_union (const Param_Test::Small_Union& u1,
                                 Param_Test::Small_Union& u2,
-                                Param_Test::Small_Union_out u3,
-                                CORBA::Environment &)
+                                Param_Test::Small_Union_out u3
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u2 = u1;
@@ -1015,8 +1015,8 @@ Param_Test_i::test_small_union (const Param_Test::Small_Union& u1,
 Param_Test::Recursive_Union*
 Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1,
                                     Param_Test::Recursive_Union& ru2,
-                                    Param_Test::Recursive_Union_out ru3,
-                                    CORBA::Environment &)
+                                    Param_Test::Recursive_Union_out ru3
+                                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1));
@@ -1028,8 +1028,8 @@ Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1,
 CORBA::Any*
 Param_Test_i::test_complex_any (const CORBA::Any &a1,
                                 CORBA::Any &a2,
-                                CORBA::Any_out a3,
-                                CORBA::Environment &)
+                                CORBA::Any_out a3
+                                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_var ret (new CORBA::Any (a1));
@@ -1041,8 +1041,8 @@ Param_Test_i::test_complex_any (const CORBA::Any &a1,
 Param_Test::Multdim_Array_slice *
 Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
                                   Param_Test::Multdim_Array a2,
-                                  Param_Test::Multdim_Array_out a3,
-                                  CORBA::Environment &)
+                                  Param_Test::Multdim_Array_out a3
+                                  TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Multdim_Array_slice *ret;
@@ -1054,14 +1054,14 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
 }
 
 void
-Param_Test_i::shutdown (CORBA::Environment &)
+Param_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
 
 void
-Param_Test_i::throw_badboy (CORBA::Environment &ACE_TRY_ENV)
+Param_Test_i::throw_badboy (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW (Param_Test::BadBoy ());
 }
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index e523a86d71b..4e4cd6f371d 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -31,12 +31,12 @@ public:
 
   // =methods for the attribute
 
-  virtual Coffee::Desc * description (CORBA::Environment &env)
+  virtual Coffee::Desc * description (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // get attribute
 
-  virtual void description (const Coffee::Desc &description,
-                            CORBA::Environment &env)
+  virtual void description (const Coffee::Desc &description
+                            TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // set attribute
 
@@ -62,51 +62,51 @@ public:
 
   virtual CORBA::Short test_short (CORBA::Short s1,
                                    CORBA::Short &s2,
-                                   CORBA::Short_out s3,
-                                   CORBA::Environment &env)
+                                   CORBA::Short_out s3
+                                   TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for shorts
 
   virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1,
                                            CORBA::ULongLong &s2,
-                                           CORBA::ULongLong_out s3,
-                                           CORBA::Environment &env)
+                                           CORBA::ULongLong_out s3
+                                           TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unsigned long long
 
   virtual char *test_unbounded_string (const char *s1,
                                        char *&s2,
-                                       CORBA::String_out s3,
-                                       CORBA::Environment &env)
+                                       CORBA::String_out s3
+                                       TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded strings
 
   virtual char *test_bounded_string (const char *s1,
                                      char *&s2,
-                                     CORBA::String_out s3,
-                                     CORBA::Environment &env)
+                                     CORBA::String_out s3
+                                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded strings
 
   virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1,
                                                 CORBA::WChar *&ws2,
-                                                CORBA::WString_out ws3,
-                                                CORBA::Environment &env)
+                                                CORBA::WString_out ws3
+                                                TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded wstrings
 
   virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1,
                                               CORBA::WChar *&ws2,
-                                              CORBA::WString_out ws3,
-                                              CORBA::Environment &env)
+                                              CORBA::WString_out ws3
+                                              TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded wstrings
 
   virtual Param_Test::Fixed_Struct
   test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                      Param_Test::Fixed_Struct &s2,
-                     Param_Test::Fixed_Struct_out s3,
-                     CORBA::Environment &env)
+                     Param_Test::Fixed_Struct_out s3
+                     TAO_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for fixed structures
 
@@ -114,221 +114,221 @@ public:
   virtual Param_Test::Long_Seq * test_long_sequence (
       const Param_Test::Long_Seq & s1,
       Param_Test::Long_Seq & s2,
-      Param_Test::Long_Seq_out s3,
-      CORBA::Environment &env)
+      Param_Test::Long_Seq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence (
       const Param_Test::Bounded_Long_Seq & s1,
       Param_Test::Bounded_Long_Seq & s2,
-      Param_Test::Bounded_Long_Seq_out s3,
-      CORBA::Environment &env)
+      Param_Test::Bounded_Long_Seq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Short_Seq * test_short_sequence (
       const Param_Test::Short_Seq & s1,
       Param_Test::Short_Seq & s2,
-      Param_Test::Short_Seq_out s3,
-      CORBA::Environment &env)
+      Param_Test::Short_Seq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence (
           const Param_Test::Bounded_Short_Seq & s1,
       Param_Test::Bounded_Short_Seq & s2,
-      Param_Test::Bounded_Short_Seq_out s3,
-      CORBA::Environment &env)
+      Param_Test::Bounded_Short_Seq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::StrSeq * test_strseq (
       const Param_Test::StrSeq & s1,
       Param_Test::StrSeq & s2,
-      Param_Test::StrSeq_out s3,
-      CORBA::Environment &env)
+      Param_Test::StrSeq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_StrSeq * test_bounded_strseq (
       const Param_Test::Bounded_StrSeq & s1,
       Param_Test::Bounded_StrSeq & s2,
-      Param_Test::Bounded_StrSeq_out s3,
-      CORBA::Environment &env)
+      Param_Test::Bounded_StrSeq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::WStrSeq * test_wstrseq (
       const Param_Test::WStrSeq & ws1,
       Param_Test::WStrSeq & ws2,
-      Param_Test::WStrSeq_out ws3,
-      CORBA::Environment &env)
+      Param_Test::WStrSeq_out ws3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq (
       const Param_Test::Bounded_WStrSeq & ws1,
       Param_Test::Bounded_WStrSeq & ws2,
-      Param_Test::Bounded_WStrSeq_out ws3,
-      CORBA::Environment &env)
+      Param_Test::Bounded_WStrSeq_out ws3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::StructSeq * test_struct_sequence (
       const Param_Test::StructSeq & s1,
       Param_Test::StructSeq & s2,
-      Param_Test::StructSeq_out s3,
-      CORBA::Environment &env)
+      Param_Test::StructSeq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::PathSpec * test_unbounded_struct_sequence (
       const Param_Test::PathSpec & s1,
       Param_Test::PathSpec & s2,
-      Param_Test::PathSpec_out s3,
-      CORBA::Environment &env)
+      Param_Test::PathSpec_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence (
       const Param_Test::Bounded_StructSeq & s1,
       Param_Test::Bounded_StructSeq & s2,
-      Param_Test::Bounded_StructSeq_out s3,
-      CORBA::Environment &env)
+      Param_Test::Bounded_StructSeq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::ArraySeq * test_array_sequence (
       const Param_Test::ArraySeq & s1,
       Param_Test::ArraySeq & s2,
-      Param_Test::ArraySeq_out s3,
-      CORBA::Environment &env)
+      Param_Test::ArraySeq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_ArraySeq * test_bounded_array_sequence (
       const Param_Test::Bounded_ArraySeq & s1,
       Param_Test::Bounded_ArraySeq & s2,
-      Param_Test::Bounded_ArraySeq_out s3,
-      CORBA::Environment &env)
+      Param_Test::Bounded_ArraySeq_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Coffee_Mix * test_coffe_mix (
       const Param_Test::Coffee_Mix & s1,
       Param_Test::Coffee_Mix & s2,
-      Param_Test::Coffee_Mix_out s3,
-      CORBA::Environment &env)
+      Param_Test::Coffee_Mix_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix (
       const Param_Test::Bounded_Coffee_Mix & s1,
       Param_Test::Bounded_Coffee_Mix & s2,
-      Param_Test::Bounded_Coffee_Mix_out s3,
-      CORBA::Environment &env)
+      Param_Test::Bounded_Coffee_Mix_out s3
+      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::AnySeq * test_anyseq (
           const Param_Test::AnySeq & s1,
           Param_Test::AnySeq & s2,
-          Param_Test::AnySeq_out s3,
-          CORBA::Environment &env)
+          Param_Test::AnySeq_out s3
+          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // = End of sequences tests....
 
   virtual Param_Test::Var_Struct *
   test_var_struct (const Param_Test::Var_Struct &s1,
                    Param_Test::Var_Struct &s2,
-                   Param_Test::Var_Struct_out s3,
-                   CORBA::Environment &env)
+                   Param_Test::Var_Struct_out s3
+                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for variable structs
 
   virtual Param_Test::Nested_Struct *
   test_nested_struct (const Param_Test::Nested_Struct &s1,
                       Param_Test::Nested_Struct &s2,
-                      Param_Test::Nested_Struct_out s3,
-                      CORBA::Environment &env)
+                      Param_Test::Nested_Struct_out s3
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for nested structs
 
   virtual Param_Test::Recursive_Struct *
     test_recursive_struct (const Param_Test::Recursive_Struct &rs1,
                            Param_Test::Recursive_Struct &rs2,
-                           Param_Test::Recursive_Struct_out rs3,
-                           CORBA::Environment &env)
+                           Param_Test::Recursive_Struct_out rs3
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for recursive structs
 
   virtual Param_Test::Objref_Struct *
   test_objref_struct (const Param_Test::Objref_Struct &s1,
                       Param_Test::Objref_Struct &s2,
-                      Param_Test::Objref_Struct_out s3,
-                      CORBA::Environment &env)
+                      Param_Test::Objref_Struct_out s3
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Coffee_ptr
-  make_coffee (CORBA::Environment &env)
+  make_coffee (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // make a coffee object
 
   virtual Coffee_ptr
   test_objref (Coffee_ptr o1,
                Coffee_ptr &o2,
-               Coffee_out o3,
-               CORBA::Environment &env)
+               Coffee_out o3
+               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for object references
 
   virtual CORBA::TypeCode_ptr
   test_typecode (CORBA::TypeCode_ptr t1,
                  CORBA::TypeCode_ptr &o2,
-                 CORBA::TypeCode_out o3,
-                 CORBA::Environment &env)
+                 CORBA::TypeCode_out o3
+                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for typecodes
 
   virtual CORBA::Any *
   test_any (const CORBA::Any &a1,
             CORBA::Any &a2,
-            CORBA::Any_out a3,
-            CORBA::Environment &env)
+            CORBA::Any_out a3
+            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for Anys
 
   virtual Param_Test::Fixed_Array_slice *
   test_fixed_array (const Param_Test::Fixed_Array a1,
                     Param_Test::Fixed_Array a2,
-                    Param_Test::Fixed_Array_out a3,
-                    CORBA::Environment &env)
+                    Param_Test::Fixed_Array_out a3
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for fixed size arrays
 
   virtual Param_Test::Var_Array_slice *
   test_var_array (const Param_Test::Var_Array a1,
                   Param_Test::Var_Array a2,
-                  Param_Test::Var_Array_out a3,
-                  CORBA::Environment &env)
+                  Param_Test::Var_Array_out a3
+                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for arrays of variable types
 
   virtual CORBA::ULong test_exception (CORBA::ULong s1,
                                        CORBA::ULong& s2,
-                                       CORBA::ULong_out s3,
-                                       CORBA::Environment &env)
+                                       CORBA::ULong_out s3
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Param_Test::Ooops));
 
   virtual Param_Test::Big_Union*
     test_big_union (const Param_Test::Big_Union& u1,
                     Param_Test::Big_Union& u2,
-                    Param_Test::Big_Union_out u3,
-                    CORBA::Environment &env)
+                    Param_Test::Big_Union_out u3
+                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Param_Test::Small_Union
     test_small_union (const Param_Test::Small_Union& u1,
                       Param_Test::Small_Union& u2,
-                      Param_Test::Small_Union_out u3,
-                      CORBA::Environment &env)
+                      Param_Test::Small_Union_out u3
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Param_Test::Recursive_Union*
     test_recursive_union (const Param_Test::Recursive_Union& ru1,
                           Param_Test::Recursive_Union& ru2,
-                          Param_Test::Recursive_Union_out ru3,
-                          CORBA::Environment &env)
+                          Param_Test::Recursive_Union_out ru3
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any*
     test_complex_any (const CORBA::Any &a1,
                       CORBA::Any &a2,
-                      CORBA::Any_out a3,
-                      CORBA::Environment &env)
+                      CORBA::Any_out a3
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Test for multi dimensional arrays
   virtual Param_Test::Multdim_Array_slice *
   test_multdim_array (const Param_Test::Multdim_Array,
                       Param_Test::Multdim_Array ,
-                      Param_Test::Multdim_Array_out ,
-                      CORBA::Environment &)
+                      Param_Test::Multdim_Array_out
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &env)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -339,7 +339,7 @@ private:
   Coffee_i obj_;
   // the coffee object reference we maintain
 
-  void throw_badboy (CORBA::Environment &ACE_TRY_ENV);
+  void throw_badboy (TAO_ENV_SINGLE_ARG_DECL);
   // Called by test_exception. This will avoid the compiler
   // warning that test_exception is throwing an exception
   // not in its THROW_SPEC, but still test TAO's
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 3f868f8aefb..cbe8190640b 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -47,8 +47,8 @@ Test_Recursive_Struct::opname (void) const
 }
 
 void
-Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req,
-                                       CORBA::Environment &ACE_TRY_ENV)
+Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
+                                       TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Recursive_Struct);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Recursive_Struct *tmp;
@@ -64,21 +64,21 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Recursive_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Recursive_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Recursive_Struct (*tmp);
 }
 
 int
-Test_Recursive_Struct::init_parameters (Param_Test_ptr ,
-                                        CORBA::Environment &)
+Test_Recursive_Struct::init_parameters (Param_Test_ptr
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   // The client calls init_parameters() before the first
   // call and reset_parameters() after each call. For this
@@ -116,8 +116,8 @@ Test_Recursive_Struct::reset_parameters (void)
 }
 
 int
-Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref
+                                     TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -125,8 +125,8 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_recursive_struct (this->in_,
                                                   this->inout_.inout (),
-                                                  out,
-                                                  ACE_TRY_ENV);
+                                                  out
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h
index cb84b23be28..8e5af6b8d62 100644
--- a/TAO/tests/Param_Test/recursive_struct.h
+++ b/TAO/tests/Param_Test/recursive_struct.h
@@ -35,15 +35,15 @@ public:
   ~Test_Recursive_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,8 +58,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index fa8ede8eed0..1c9ec710040 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -47,8 +47,8 @@ Test_Recursive_Union::opname (void) const
 }
 
 void
-Test_Recursive_Union::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
+                                      TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Recursive_Union);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Recursive_Union *tmp;
@@ -64,21 +64,21 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Recursive_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Recursive_Union (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Recursive_Union (*tmp);
 }
 
 int
-Test_Recursive_Union::init_parameters (Param_Test_ptr ,
-                                       CORBA::Environment &)
+Test_Recursive_Union::init_parameters (Param_Test_ptr
+                                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   // The client calls init_parameters() before the first
   // call and reset_parameters() after each call. For this
@@ -118,8 +118,8 @@ Test_Recursive_Union::reset_parameters (void)
 }
 
 int
-Test_Recursive_Union::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_Recursive_Union::run_sii_test (Param_Test_ptr objref
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -127,8 +127,8 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_recursive_union (this->in_,
                                                  this->inout_.inout (),
-                                                 out,
-                                                 ACE_TRY_ENV);
+                                                 out
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h
index 3dad5de6eaf..d7faea6fef3 100644
--- a/TAO/tests/Param_Test/recursive_union.h
+++ b/TAO/tests/Param_Test/recursive_union.h
@@ -35,15 +35,15 @@ public:
   ~Test_Recursive_Union (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,8 +58,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 8187d3ad3c1..23ce8f75a3e 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -102,8 +102,8 @@ Results::print_stats (void)
 }
 
 void
-Results::print_exception (const char * /* call_name */,
-                          CORBA::Environment &)
+Results::print_exception (const char * /* call_name */
+                          TAO_ENV_ARG_DECL_NOT_USED)
 {
   //ACE_PRINT_EXCEPTION (call_name);
 }
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index 5f8139f655b..81225cd2d01 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -38,8 +38,8 @@ public:
   void print_stats (void);
   // prints the time stats
 
-  void print_exception (const char *call_name,
-                        CORBA::Environment &);
+  void print_exception (const char *call_name
+                        TAO_ENV_ARG_DECL_NOT_USED);
   // print the exception
 
   void start_timer (void);
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 738a343337e..c1ed50851ec 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
   PortableServer::POA_var oa_ptr;
   Param_Test_i *param_test = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       const char *orb_name = "";
       CORBA::ORB_var orb_ptr =
-        CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var temp; // holder for the myriad of times we get
@@ -74,8 +74,8 @@ main (int argc, char *argv[])
 
       // Get the Root POA
 
-      temp = orb_ptr->resolve_initial_references ("RootPOA",
-                                                  ACE_TRY_ENV);
+      temp = orb_ptr->resolve_initial_references ("RootPOA"
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (temp.in()))
@@ -83,29 +83,29 @@ main (int argc, char *argv[])
                            "(%P|%t) Unable to get root poa reference.\n"),
                           1);
 
-      oa_ptr = PortableServer::POA::_narrow (temp.in(), ACE_TRY_ENV);
+      oa_ptr = PortableServer::POA::_narrow (temp.in() TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        oa_ptr->the_POAManager (ACE_TRY_ENV);
+        oa_ptr->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (2);
       policies.length (2);
       policies[0] =
-        oa_ptr->create_id_assignment_policy (PortableServer::USER_ID,
-                                             ACE_TRY_ENV);
+        oa_ptr->create_id_assignment_policy (PortableServer::USER_ID
+                                             TAO_ENV_ARG_PARAMETER);
       policies[1] =
-        oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT,
-                                        ACE_TRY_ENV);
+        oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT
+                                        TAO_ENV_ARG_PARAMETER);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
       PortableServer::POA_var good_poa =
         oa_ptr->create_POA ("child_poa",
                             poa_manager.in (),
-                            policies,
-                            ACE_TRY_ENV);
+                            policies
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse remaining command line and verify parameters.
@@ -123,20 +123,20 @@ main (int argc, char *argv[])
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("param_test");
       good_poa->activate_object_with_id (id.in (),
-                                         param_test,
-                                         ACE_TRY_ENV);
+                                         param_test
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
 
-      temp = good_poa->id_to_reference (id.in (), ACE_TRY_ENV);
+      temp = good_poa->id_to_reference (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb_ptr->object_to_string (temp.in (),
-                                   ACE_TRY_ENV);
+        orb_ptr->object_to_string (temp.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -149,20 +149,20 @@ main (int argc, char *argv[])
 
 
       // Make the POAs controlled by this manager active
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb_ptr->run (ACE_TRY_ENV);
+      orb_ptr->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       good_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       oa_ptr->destroy (1,
-                       1,
-                       ACE_TRY_ENV);
+                       1
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index f8d8bd3a5f0..6c906cbbadd 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -43,8 +43,8 @@ Test_Short::opname (void) const
 }
 
 void
-Test_Short::dii_req_invoke (CORBA::Request *req,
-                            CORBA::Environment &ACE_TRY_ENV)
+Test_Short::dii_req_invoke (CORBA::Request *req
+                            TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -52,25 +52,25 @@ Test_Short::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (CORBA::_tc_short);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   req->return_value () >>= this->ret_;
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= this->inout_;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= this->out_;
 }
 
 int
-Test_Short::init_parameters (Param_Test_ptr /*objref*/,
-                             CORBA::Environment &)
+Test_Short::init_parameters (Param_Test_ptr /*objref*/
+                             TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -89,15 +89,15 @@ Test_Short::reset_parameters (void)
 }
 
 int
-Test_Short::run_sii_test (Param_Test_ptr objref,
-                          CORBA::Environment &ACE_TRY_ENV)
+Test_Short::run_sii_test (Param_Test_ptr objref
+                          TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_short (this->in_,
                                        this->inout_,
-                                       this->out_,
-                                       ACE_TRY_ENV);
+                                       this->out_
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index 285bd3ec428..035f428d59d 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -33,15 +33,15 @@ public:
   ~Test_Short (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index d2036b5cb41..555e42c38c8 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -45,8 +45,8 @@ Test_Small_Union::opname (void) const
 }
 
 void
-Test_Small_Union::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Small_Union::dii_req_invoke (CORBA::Request *req
+                                TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -54,7 +54,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Small_Union);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Small_Union *tmp;
@@ -62,26 +62,26 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Small_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Small_Union (*tmp);
 }
 
 int
-Test_Small_Union::init_parameters (Param_Test_ptr objref,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Test_Small_Union::init_parameters (Param_Test_ptr objref
+                                 TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_TRY_ENV);
+      this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->reset_parameters ();
@@ -129,15 +129,15 @@ Test_Small_Union::reset_parameters (void)
 }
 
 int
-Test_Small_Union::run_sii_test (Param_Test_ptr objref,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Small_Union::run_sii_test (Param_Test_ptr objref
+                                TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_small_union (this->in_,
                                            this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
+                                           this->out_
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h
index f4b3bc22981..6e6a39025ab 100644
--- a/TAO/tests/Param_Test/small_union.h
+++ b/TAO/tests/Param_Test/small_union.h
@@ -33,15 +33,15 @@ public:
   ~Test_Small_Union (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index ca4807dab86..23972a2ef3f 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -43,8 +43,8 @@ Test_TypeCode::opname (void) const
 }
 
 void
-Test_TypeCode::dii_req_invoke (CORBA::Request *req,
-                               CORBA::Environment &ACE_TRY_ENV)
+Test_TypeCode::dii_req_invoke (CORBA::Request *req
+                               TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -52,7 +52,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (CORBA::_tc_TypeCode);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_ptr tmp;
@@ -60,21 +60,21 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req,
   this->ret_ = CORBA::TypeCode::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::TypeCode::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = CORBA::TypeCode::_duplicate (tmp);
 }
 
 int
-Test_TypeCode::init_parameters (Param_Test_ptr,
-                                CORBA::Environment &)
+Test_TypeCode::init_parameters (Param_Test_ptr
+                                TAO_ENV_ARG_DECL_NOT_USED)
 {
   static CORBA::TypeCode_ptr tc_table [] =
     {
@@ -115,20 +115,20 @@ Test_TypeCode::reset_parameters (void)
 }
 
 int
-Test_TypeCode::run_sii_test (Param_Test_ptr objref,
-                             CORBA::Environment &ACE_TRY_ENV)
+Test_TypeCode::run_sii_test (Param_Test_ptr objref
+                             TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->init_parameters (objref, ACE_TRY_ENV);
+      this->init_parameters (objref TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_out out (this->out_);
 
       this->ret_ = objref->test_typecode (this->in_.in (),
                                           this->inout_.inout (),
-                                          out,
-                                          ACE_TRY_ENV);
+                                          out
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -146,22 +146,22 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref,
 CORBA::Boolean
 Test_TypeCode::check_validity (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean one, two, three;
 
-      one = this->in_.in ()->equal (this->inout_.in (),
-                                    ACE_TRY_ENV);
+      one = this->in_.in ()->equal (this->inout_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      two = this->in_.in ()->equal (this->out_.in (),
-                                    ACE_TRY_ENV);
+      two = this->in_.in ()->equal (this->out_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      three = this->in_.in ()->equal (this->ret_.in (),
-                                      ACE_TRY_ENV);
+      three = this->in_.in ()->equal (this->ret_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (one && two && three)
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index cde6cfb1c2a..75d2ac358a3 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -33,15 +33,15 @@ public:
   ~Test_TypeCode (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index 035ed312b29..a05bc294abc 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -51,8 +51,8 @@ Test_AnySeq::opname (void) const
 }
 
 void
-Test_AnySeq::dii_req_invoke (CORBA::Request *req,
-                             CORBA::Environment &ACE_TRY_ENV)
+Test_AnySeq::dii_req_invoke (CORBA::Request *req
+                             TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -60,7 +60,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_AnySeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::AnySeq* tmp;
@@ -68,21 +68,21 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::AnySeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::AnySeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::AnySeq (*tmp);
 }
 
 int
-Test_AnySeq::init_parameters (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+Test_AnySeq::init_parameters (Param_Test_ptr objref
+                              TAO_ENV_ARG_DECL)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -124,7 +124,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref,
             ACE_TRY
               {
                 // get access to a Coffee Object
-                Coffee_var cobj = objref->make_coffee (ACE_TRY_ENV);
+                Coffee_var cobj = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 // insert the coffee object into the Any
@@ -197,8 +197,8 @@ Test_AnySeq::reset_parameters (void)
 
 
 int
-Test_AnySeq::run_sii_test (Param_Test_ptr objref,
-                           CORBA::Environment &ACE_TRY_ENV)
+Test_AnySeq::run_sii_test (Param_Test_ptr objref
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -206,8 +206,8 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_anyseq (this->in_.in (),
                                         this->inout_.inout (),
-                                        out,
-                                        ACE_TRY_ENV);
+                                        out
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index 832921be5d0..5d610cc85c5 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -33,15 +33,15 @@ public:
   ~Test_AnySeq (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index c21ca596b33..a4534a5129a 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -46,8 +46,8 @@ Test_Array_Sequence::opname (void) const
 }
 
 void
-Test_Array_Sequence::dii_req_invoke (CORBA::Request *req,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
+                                     TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -55,7 +55,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_ArraySeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::ArraySeq *tmp;
@@ -63,21 +63,21 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::ArraySeq (*tmp);
 }
 
 int
-Test_Array_Sequence::init_parameters (Param_Test_ptr ,
-                                      CORBA::Environment &)
+Test_Array_Sequence::init_parameters (Param_Test_ptr
+                                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -125,8 +125,8 @@ Test_Array_Sequence::reset_parameters (void)
 }
 
 int
-Test_Array_Sequence::run_sii_test (Param_Test_ptr objref,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Test_Array_Sequence::run_sii_test (Param_Test_ptr objref
+                                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -134,8 +134,8 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_array_sequence (this->in_,
                                                 this->inout_.inout (),
-                                                out,
-                                                ACE_TRY_ENV);
+                                                out
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h
index 0f7a0060dbf..aec3e9cc1a8 100644
--- a/TAO/tests/Param_Test/ub_array_seq.h
+++ b/TAO/tests/Param_Test/ub_array_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Array_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +57,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 87b7211e33c..eeae63f57e9 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -47,8 +47,8 @@ Test_Long_Sequence::opname (void) const
 }
 
 void
-Test_Long_Sequence::dii_req_invoke (CORBA::Request *req,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
+                                    TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Long_Seq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Long_Seq *tmp;
@@ -64,21 +64,21 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = Param_Test::Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = Param_Test::Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = Param_Test::Long_Seq (*tmp);
 }
 
 int
-Test_Long_Sequence::init_parameters (Param_Test_ptr ,
-                                     CORBA::Environment &)
+Test_Long_Sequence::init_parameters (Param_Test_ptr
+                                     TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -107,8 +107,8 @@ Test_Long_Sequence::reset_parameters (void)
 }
 
 int
-Test_Long_Sequence::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Test_Long_Sequence::run_sii_test (Param_Test_ptr objref
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -116,8 +116,8 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_long_sequence (this->in_.in (),
                                                this->inout_.inout (),
-                                               out,
-                                               ACE_TRY_ENV);
+                                               out
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index 0a57a526d38..bf1dff7b476 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Long_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index 7c540d19e52..99a8e7f0761 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -57,8 +57,8 @@ Test_ObjRef_Sequence::opname (void) const
 }
 
 void
-Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
+                                      TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -66,7 +66,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Coffee_Mix);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Coffee_Mix *tmp;
@@ -74,21 +74,21 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Coffee_Mix (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Coffee_Mix (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Coffee_Mix (*tmp);
 }
 
 int
-Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref,
-                                       CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
+                                       TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -106,7 +106,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref,
         {
           // generate some arbitrary string to be filled into the ith location in
           // the sequence
-          this->in_[i] = objref->make_coffee (ACE_TRY_ENV);
+          this->in_[i] = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // select a Coffee flavor at random
@@ -116,8 +116,8 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref,
           // set the attribute for the in object
           Coffee_ptr tmp = this->in_[i];
 
-          tmp->description (desc,
-                            ACE_TRY_ENV);
+          tmp->description (desc
+                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -143,8 +143,8 @@ Test_ObjRef_Sequence::reset_parameters (void)
 }
 
 int
-Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -152,8 +152,8 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_coffe_mix (this->in_,
                                            this->inout_.inout (),
-                                           out,
-                                           ACE_TRY_ENV);
+                                           out
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -171,23 +171,23 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref,
 CORBA::Boolean
 Test_ObjRef_Sequence::check_validity (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       this->compare (this->in_,
-                     this->inout_.in (),
-                     ACE_TRY_ENV);
+                     this->inout_.in ()
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->compare (this->in_,
-                     this->out_.in (),
-                     ACE_TRY_ENV);
+                     this->out_.in ()
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->compare (this->in_,
-                     this->ret_.in (),
-                     ACE_TRY_ENV);
+                     this->ret_.in ()
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 1;
@@ -232,8 +232,8 @@ Test_ObjRef_Sequence::print_values (void)
 
 CORBA::Boolean
 Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
-                               const Param_Test::Coffee_Mix &s2,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const Param_Test::Coffee_Mix &s2
+                               TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -261,12 +261,12 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
               return 0;
             }
 
-          Coffee::Desc_var desc1 = vs1->description (ACE_TRY_ENV);
+          Coffee::Desc_var desc1 = vs1->description (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::String_var n1 = desc1->name.in ();
 
-          Coffee::Desc_var desc2 = vs2->description (ACE_TRY_ENV);
+          Coffee::Desc_var desc2 = vs2->description (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::String_var n2 = desc2->name.in ();
diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index b1736c89fd7..fe9ad8e0ff3 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_ObjRef_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,13 +57,13 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
   CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1,
-                          const Param_Test::Coffee_Mix &s2,
-                          CORBA::Environment& env);
+                          const Param_Test::Coffee_Mix &s2
+                          TAO_ENV_ARG_DECL);
   // compare
 
   void print_sequence (const Param_Test::Coffee_Mix &s);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index bc7d7632a8c..b6d97bb5af4 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -47,8 +47,8 @@ Test_Short_Sequence::opname (void) const
 }
 
 void
-Test_Short_Sequence::dii_req_invoke (CORBA::Request *req,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
+                                     TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Short_Seq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Short_Seq *tmp;
@@ -64,21 +64,21 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Short_Seq (*tmp);
 }
 
 int
-Test_Short_Sequence::init_parameters (Param_Test_ptr,
-                                      CORBA::Environment &)
+Test_Short_Sequence::init_parameters (Param_Test_ptr
+                                      TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -109,8 +109,8 @@ Test_Short_Sequence::reset_parameters (void)
 }
 
 int
-Test_Short_Sequence::run_sii_test (Param_Test_ptr objref,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Test_Short_Sequence::run_sii_test (Param_Test_ptr objref
+                                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -118,8 +118,8 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_short_sequence (this->in_.in (),
                                                 this->inout_.inout (),
-                                                out,
-                                                ACE_TRY_ENV);
+                                                out
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index 9aa38e21a8e..556f82606ec 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Short_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 301a40ce27c..a7bb6108914 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -47,8 +47,8 @@ Test_String_Sequence::opname (void) const
 }
 
 void
-Test_String_Sequence::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_String_Sequence::dii_req_invoke (CORBA::Request *req
+                                      TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_StrSeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::StrSeq *tmp;
@@ -64,21 +64,21 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::StrSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::StrSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::StrSeq (*tmp);
 }
 
 int
-Test_String_Sequence::init_parameters (Param_Test_ptr ,
-                                       CORBA::Environment &)
+Test_String_Sequence::init_parameters (Param_Test_ptr
+                                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   const char *choiceList[] =
   {
@@ -113,8 +113,8 @@ Test_String_Sequence::reset_parameters (void)
 }
 
 int
-Test_String_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_String_Sequence::run_sii_test (Param_Test_ptr objref
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -122,8 +122,8 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_strseq (this->in_.in (),
                                         this->inout_.inout (),
-                                        out,
-                                        ACE_TRY_ENV);
+                                        out
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index 24f438c84b7..25cc75e3dc8 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_String_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index 06c8ef2fde4..ff695b3e18e 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -55,8 +55,8 @@ Test_Unbounded_String::opname (void) const
 }
 
 void
-Test_Unbounded_String::dii_req_invoke (CORBA::Request *req,
-                                       CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
+                                       TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -67,7 +67,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (CORBA::_tc_string);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *tmp;
@@ -75,21 +75,21 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req,
   this->ret_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = CORBA::string_dup (tmp);
 }
 
 int
-Test_Unbounded_String::init_parameters (Param_Test_ptr ,
-                                        CORBA::Environment &)
+Test_Unbounded_String::init_parameters (Param_Test_ptr
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -125,8 +125,8 @@ Test_Unbounded_String::reset_parameters (void)
 }
 
 int
-Test_Unbounded_String::run_sii_test (Param_Test_ptr objref,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_String::run_sii_test (Param_Test_ptr objref
+                                     TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -134,8 +134,8 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_unbounded_string (this->in_,
                                                   this->inout_,
-                                                  str_out,
-                                                  ACE_TRY_ENV);
+                                                  str_out
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index f20176a3e98..00491ae399c 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -33,15 +33,15 @@ public:
   ~Test_Unbounded_String (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 0b6cbc779e7..be2efce2d3d 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -48,8 +48,8 @@ Test_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
+                                      TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -57,7 +57,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_StructSeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::StructSeq *tmp;
@@ -65,21 +65,21 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::StructSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::StructSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::StructSeq (*tmp);
 }
 
 int
-Test_Struct_Sequence::init_parameters (Param_Test_ptr,
-                                       CORBA::Environment &)
+Test_Struct_Sequence::init_parameters (Param_Test_ptr
+                                       TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -110,8 +110,8 @@ Test_Struct_Sequence::reset_parameters (void)
 }
 
 int
-Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref
+                                    TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -119,8 +119,8 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_struct_sequence (this->in_,
                                                  this->inout_.inout (),
-                                                 out,
-                                                 ACE_TRY_ENV);
+                                                 out
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -255,8 +255,8 @@ Test_Unbounded_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
-                                                CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
+                                                TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -264,7 +264,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_PathSpec);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::PathSpec *tmp;
@@ -272,21 +272,21 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::PathSpec (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::PathSpec (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::PathSpec (*tmp);
 }
 
 int
-Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr ,
-                                                 CORBA::Environment &)
+Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr
+                                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -318,14 +318,14 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void)
 }
 
 int
-Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
-                                              CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
+                                              TAO_ENV_ARG_DECL)
 {
   Param_Test::PathSpec_out out (this->out_.out ());
   this->ret_ = objref->test_unbounded_struct_sequence (this->in_,
                                                        this->inout_.inout (),
-                                                       out,
-                                                       ACE_TRY_ENV);
+                                                       out
+                                                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index 465b6b5574d..9fae482e77b 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_Struct_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
@@ -97,15 +97,15 @@ public:
   ~Test_Unbounded_Struct_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                        CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                        TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -120,7 +120,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index c609165f1d1..15852c15044 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -47,8 +47,8 @@ Test_WString_Sequence::opname (void) const
 }
 
 void
-Test_WString_Sequence::dii_req_invoke (CORBA::Request *req,
-                                       CORBA::Environment &ACE_TRY_ENV)
+Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
+                                       TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_WStrSeq);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::WStrSeq *tmp;
@@ -64,21 +64,21 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::WStrSeq (*tmp);
 }
 
 int
-Test_WString_Sequence::init_parameters (Param_Test_ptr ,
-                                        CORBA::Environment &)
+Test_WString_Sequence::init_parameters (Param_Test_ptr
+                                        TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -108,8 +108,8 @@ Test_WString_Sequence::reset_parameters (void)
 }
 
 int
-Test_WString_Sequence::run_sii_test (Param_Test_ptr objref,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_WString_Sequence::run_sii_test (Param_Test_ptr objref
+                                     TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -117,8 +117,8 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_wstrseq (this->in_.in (),
                                          this->inout_.inout (),
-                                         out,
-                                         ACE_TRY_ENV);
+                                         out
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h
index fee0572fb65..31e426c263f 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.h
+++ b/TAO/tests/Param_Test/ub_wstr_seq.h
@@ -34,15 +34,15 @@ public:
   ~Test_WString_Sequence (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,8 +57,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 93318ed53fd..255e49b96b0 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -55,8 +55,8 @@ Test_Unbounded_WString::opname (void) const
 }
 
 void
-Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req,
-                                        CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
+                                        TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -67,7 +67,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (CORBA::_tc_wstring);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const CORBA::WChar *tmp;
@@ -75,21 +75,21 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req,
   this->ret_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = CORBA::wstring_dup (tmp);
 }
 
 int
-Test_Unbounded_WString::init_parameters (Param_Test_ptr,
-                                         CORBA::Environment &)
+Test_Unbounded_WString::init_parameters (Param_Test_ptr
+                                         TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -124,8 +124,8 @@ Test_Unbounded_WString::reset_parameters (void)
 }
 
 int
-Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref
+                                      TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -133,8 +133,8 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref,
 
       this->ret_ = objref->test_unbounded_wstring (this->in_,
                                                    this->inout_,
-                                                   str_out,
-                                                   ACE_TRY_ENV);
+                                                   str_out
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h
index e2509254885..54b98554916 100644
--- a/TAO/tests/Param_Test/ub_wstring.h
+++ b/TAO/tests/Param_Test/ub_wstring.h
@@ -33,15 +33,15 @@ public:
   ~Test_Unbounded_WString (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,8 +56,8 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,
-                       CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *
+                       TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 5f92783911d..05360195cb3 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -39,8 +39,8 @@ Test_ULongLong::opname (void) const
 }
 
 void
-Test_ULongLong::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_ULongLong::dii_req_invoke (CORBA::Request *req
+                                TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -48,25 +48,25 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (CORBA::_tc_ulonglong);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   req->return_value () >>= this->ret_;
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= this->inout_;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= this->out_;
 }
 
 int
-Test_ULongLong::init_parameters (Param_Test_ptr ,
-                                 CORBA::Environment &)
+Test_ULongLong::init_parameters (Param_Test_ptr
+                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -85,15 +85,15 @@ Test_ULongLong::reset_parameters (void)
 }
 
 int
-Test_ULongLong::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+Test_ULongLong::run_sii_test (Param_Test_ptr objref
+                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_ulonglong (this->in_,
                                            this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
+                                           this->out_
+                                           TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index 452f9721aa6..630fd839570 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -30,15 +30,15 @@ public:
   ~Test_ULongLong (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -53,7 +53,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index ea7a29e70f9..7a429a50a7e 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -45,8 +45,8 @@ Test_Var_Array::opname (void) const
 }
 
 void
-Test_Var_Array::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Var_Array::dii_req_invoke (CORBA::Request *req
+                                TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= Param_Test::Var_Array_forany (this->in_);
   req->add_inout_arg ("s2") <<= Param_Test::Var_Array_forany (this->inout_);
@@ -54,7 +54,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Var_Array);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Var_Array_forany forany;
@@ -63,21 +63,21 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req,
   this->ret_ = Param_Test::Var_Array_dup (forany.in ());
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= forany;
   Param_Test::Var_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= forany;
   this->out_ = Param_Test::Var_Array_dup (forany.in ());
 }
 
 int
-Test_Var_Array::init_parameters (Param_Test_ptr ,
-                                 CORBA::Environment &)
+Test_Var_Array::init_parameters (Param_Test_ptr
+                                 TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -103,16 +103,16 @@ Test_Var_Array::reset_parameters (void)
 }
 
 int
-Test_Var_Array::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+Test_Var_Array::run_sii_test (Param_Test_ptr objref
+                              TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       Param_Test::Var_Array_out out_arr (this->out_.out ());
       this->ret_ = objref->test_var_array (this->in_,
                                            this->inout_,
-                                           out_arr,
-                                           ACE_TRY_ENV);
+                                           out_arr
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index f281f8dc558..f964a09a1a3 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -33,15 +33,15 @@ public:
   ~Test_Var_Array (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index ce87174a3b2..849d80bcb16 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -48,8 +48,8 @@ Test_Var_Struct::opname (void) const
 }
 
 void
-Test_Var_Struct::dii_req_invoke (CORBA::Request *req,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Test_Var_Struct::dii_req_invoke (CORBA::Request *req
+                                 TAO_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -57,7 +57,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req,
 
   req->set_return_type (Param_Test::_tc_Var_Struct);
 
-  req->invoke (ACE_TRY_ENV);
+  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Var_Struct *tmp;
@@ -65,21 +65,21 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req,
   this->ret_ = new Param_Test::Var_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1, ACE_TRY_ENV);
+    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Var_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2, ACE_TRY_ENV);
+    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Var_Struct (*tmp);
 }
 
 int
-Test_Var_Struct::init_parameters (Param_Test_ptr,
-                                  CORBA::Environment &)
+Test_Var_Struct::init_parameters (Param_Test_ptr
+                                  TAO_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -133,16 +133,16 @@ Test_Var_Struct::reset_parameters (void)
 }
 
 int
-Test_Var_Struct::run_sii_test (Param_Test_ptr objref,
-                               CORBA::Environment &ACE_TRY_ENV)
+Test_Var_Struct::run_sii_test (Param_Test_ptr objref
+                               TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       Param_Test::Var_Struct_out out (this->out_.out ());
       this->ret_ = objref->test_var_struct (this->in_,
                                             this->inout_.inout (),
-                                            out,
-                                            ACE_TRY_ENV);
+                                            out
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index de08ee37c24..b9fea7c0028 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -34,15 +34,15 @@ public:
   ~Test_Var_Struct (void);
   // dtor
 
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
+  int run_sii_test (Param_Test_ptr objref
+                    TAO_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
+  int init_parameters (Param_Test_ptr objref
+                       TAO_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index 35e6907b42b..4993239c92d 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -62,8 +62,8 @@ private:
   void perform_iteration (ACE_RANDR_TYPE &seed,
                           CORBA::PolicyList_var &policies,
                           CORBA::PolicyManager_ptr policy_manager,
-                          CORBA::PolicyCurrent_ptr policy_current,
-                          CORBA::Environment &ACE_TRY_ENV);
+                          CORBA::PolicyCurrent_ptr policy_current
+                          TAO_ENV_ARG_DECL);
 
 private:
   CORBA::ORB_var orb_;
@@ -82,19 +82,19 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR",
-                               ACE_TRY_ENV);
+        orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR"
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var test =
-        Test::_unchecked_narrow (object.in (), ACE_TRY_ENV);
+        Test::_unchecked_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
@@ -144,8 +144,8 @@ void
 Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
                                  CORBA::PolicyList_var &policies,
                                  CORBA::PolicyManager_ptr policy_manager,
-                                 CORBA::PolicyCurrent_ptr policy_current,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::PolicyCurrent_ptr policy_current
+                                 TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -205,8 +205,8 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
             }
 
           policy = this->orb_->create_policy (policy_type,
-                                              any,
-                                              ACE_TRY_ENV);
+                                              any
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::SetOverrideType override_type = CORBA::SET_OVERRIDE;
@@ -226,16 +226,16 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
             {
               CORBA::Object_var tmp =
                 this->test_->_set_policy_overrides (policy_list,
-                                                    override_type,
-                                                    ACE_TRY_ENV);
+                                                    override_type
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (operation == ADD_CURRENT_POLICY
                    || operation == SET_CURRENT_POLICY)
             {
               policy_current->set_policy_overrides (policy_list,
-                                                    override_type,
-                                                    ACE_TRY_ENV);
+                                                    override_type
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -243,25 +243,25 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
               // operation == ADD_CURRENT_POLICY
               // || operation == SET_CURRENT_POLICY)
               policy_manager->set_policy_overrides (policy_list,
-                                                    override_type,
-                                                    ACE_TRY_ENV);
+                                                    override_type
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          policy_list[0]->destroy (ACE_TRY_ENV);
+          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (operation == SAVE_CURRENT_POLICIES)
         {
           CORBA::PolicyTypeSeq types;
           policies =
-            policy_current->get_policy_overrides (types, ACE_TRY_ENV);
+            policy_current->get_policy_overrides (types TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (operation == SAVE_MANAGER_POLICIES)
         {
           CORBA::PolicyTypeSeq types;
           policies =
-            policy_manager->get_policy_overrides (types, ACE_TRY_ENV);
+            policy_manager->get_policy_overrides (types TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (operation == RESTORE_CURRENT_POLICIES)
@@ -269,8 +269,8 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
           if (policies.ptr () != 0)
             {
               policy_current->set_policy_overrides (policies.in (),
-                                                    CORBA::SET_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::SET_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -279,8 +279,8 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
           if (policies.ptr () != 0)
             {
               policy_manager->set_policy_overrides (policies.in (),
-                                                    CORBA::SET_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::SET_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -306,21 +306,21 @@ Manipulation::svc (void)
         ACE_static_cast (ACE_RANDR_TYPE, ACE_OS::gethrtime().lo());
 #endif
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("ORBPolicyManager",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("ORBPolicyManager"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -330,8 +330,8 @@ Manipulation::svc (void)
           this->perform_iteration (seed,
                                    policies,
                                    policy_manager.in (),
-                                   policy_current.in (),
-                                   ACE_TRY_ENV);
+                                   policy_current.in ()
+                                   TAO_ENV_ARG_PARAMETER);
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index 7a1d81fa95e..2e59b25ca5c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -28,7 +28,6 @@ Client_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   PortableInterceptor::ClientRequestInterceptor_ptr tmp =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
@@ -68,7 +67,7 @@ Client_ORBInitializer::post_init (
 
   PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp;
 
-  info->add_client_request_interceptor (interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_client_request_interceptor (interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index 7c0e609f4a5..c1cabcaa2d4 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -30,7 +30,6 @@ Server_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   PortableInterceptor::ServerRequestInterceptor_ptr tmp =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
@@ -70,7 +69,7 @@ Server_ORBInitializer::post_init (
 
   PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp;
 
-  info->add_server_request_interceptor (interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index dba57b7a213..32370917a2d 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -49,8 +49,8 @@ parse_args (int argc, char *argv[])
 
 
 void
-run_test (Test_Interceptors::Secure_Vault_ptr server,
-          CORBA::Environment &ACE_TRY_ENV)
+run_test (Test_Interceptors::Secure_Vault_ptr server
+          TAO_ENV_ARG_DECL)
 {
   int i = 0;
   const char user[] = "root";
@@ -68,7 +68,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server,
       // Record current time.
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-      server->ready (ACE_TRY_ENV);
+      server->ready (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Grab timestamp again.
@@ -96,7 +96,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server,
           // Record current time.
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-          server->authenticate (user, ACE_TRY_ENV);
+          server->authenticate (user TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
@@ -133,8 +133,8 @@ run_test (Test_Interceptors::Secure_Vault_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
       server->update_records (id,
-                              record,
-                              ACE_TRY_ENV);
+                              record
+                              TAO_ENV_ARG_PARAMETER);
 
       // Grab timestamp again.
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -190,24 +190,24 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Secure_Vault_var server =
-        Test_Interceptors::Secure_Vault::_narrow (object.in (),
-                                                  ACE_TRY_ENV);
+        Test_Interceptors::Secure_Vault::_narrow (object.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -223,10 +223,10 @@ main (int argc, char *argv[])
       // This test is useful for  benchmarking the differences when
       // the same method is intercepted by different interceptors
       // wanting to achieve different functionality.
-      run_test (server.in (), ACE_TRY_ENV);
+      run_test (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
index 937fca29e1b..9c9eb160a09 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
@@ -61,9 +61,8 @@ Vault_Client_Request_Interceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
@@ -82,14 +81,14 @@ Vault_Client_Request_Interceptor::send_request (
       sc.context_data.replace (string_len, string_len, buf, 1);
 
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0, ACE_TRY_ENV);
+      ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -107,15 +106,14 @@ Vault_Client_Request_Interceptor::receive_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -139,18 +137,17 @@ Vault_Client_Request_Interceptor::receive_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV);
+  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_TRY_ENV);
+  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_TRY_ENV);
+    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
@@ -214,16 +211,15 @@ Vault_Server_Request_Interceptor::receive_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       IOP::ServiceId id = request_ctx_id;
       IOP::ServiceContext_var sc =
-        ri->get_request_service_context (id, ACE_TRY_ENV);
+        ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *buf =
@@ -237,7 +233,7 @@ Vault_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -255,15 +251,14 @@ Vault_Server_Request_Interceptor::send_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -347,7 +342,6 @@ Vault_Client_Request_Context_Interceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   // MAke the context to send the context to the target
   IOP::ServiceContext sc;
@@ -366,7 +360,7 @@ Vault_Client_Request_Context_Interceptor::send_request (
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0, ACE_TRY_ENV);
+  ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -396,18 +390,17 @@ Vault_Client_Request_Context_Interceptor::receive_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV);
+  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_TRY_ENV);
+  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_TRY_ENV);
+    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
@@ -473,11 +466,10 @@ Vault_Server_Request_Context_Interceptor::receive_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   IOP::ServiceId id = request_ctx_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id, ACE_TRY_ENV);
+    ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf = ACE_reinterpret_cast (const char *,
@@ -571,15 +563,14 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
  if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *user;
@@ -591,7 +582,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
  if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -609,16 +600,15 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
     {
       CORBA::Short result;
 
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -628,7 +618,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
     {
       CORBA::Long result;
 
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -652,18 +642,17 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV);
+  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_TRY_ENV);
+  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_TRY_ENV);
+    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
@@ -719,15 +708,14 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *user;
@@ -739,7 +727,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -767,15 +755,14 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
     {
       CORBA::Short result;
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -784,7 +771,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -894,18 +881,17 @@ Vault_Client_Request_NOOP_Interceptor::receive_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV);
+  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (ACE_TRY_ENV);
+  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_TRY_ENV);
+    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index 50fbc18e35e..c25209504bb 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -52,19 +52,19 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,35 +72,35 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Secure_Vault_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (&server_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (id.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Secure_Vault_var server =
-        Test_Interceptors::Secure_Vault::_narrow (test_obj.in (),
-                                                  ACE_TRY_ENV);
+        Test_Interceptors::Secure_Vault::_narrow (test_obj.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -120,12 +120,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index 934e5482291..748820c893b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -12,15 +12,15 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb)
 // ctor
 
 CORBA::Short
-Secure_Vault_i::ready (CORBA::Environment &)
+Secure_Vault_i::ready (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
 void
-Secure_Vault_i::authenticate (const char * user,
-              CORBA::Environment &ACE_TRY_ENV)
+Secure_Vault_i::authenticate (const char * user
+              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Invalid))
 {
@@ -31,16 +31,16 @@ Secure_Vault_i::authenticate (const char * user,
 
 CORBA::Long
 Secure_Vault_i::update_records (CORBA::Long,
-                const Test_Interceptors::Secure_Vault::Record &,
-                CORBA::Environment &)
+                const Test_Interceptors::Secure_Vault::Record &
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 return 1;
 }
 
 void
-Secure_Vault_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Secure_Vault_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
index 573c522a3e0..07891acfc20 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
@@ -27,25 +27,21 @@ public:
   Secure_Vault_i (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual CORBA::Short ready (CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ())
+  virtual CORBA::Short ready (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void authenticate (const char * user,
-                             CORBA::Environment &ACE_TRY_ENV =
-                             TAO_default_environment ())
+  virtual void authenticate (const char * user
+                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Invalid));
   // Passwd sent in the service context list
 
   virtual CORBA::Long update_records (CORBA::Long id,
-                                      const Test_Interceptors::Secure_Vault::Record & val,
-                                      CORBA::Environment &ACE_TRY_ENV =
-                                      TAO_default_environment ())
+                                      const Test_Interceptors::Secure_Vault::Record & val
+                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index 09676fcd3d3..bd736641a5a 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -24,7 +24,6 @@ Echo_Client_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index c6b393e442c..3951c2527a6 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -24,7 +24,6 @@ Echo_Server_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index edb75f81cb8..d725bb1c6d7 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -38,16 +38,16 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Test_Interceptors::Visual_ptr server,
-          CORBA::Environment &ACE_TRY_ENV)
+run_test (Test_Interceptors::Visual_ptr server
+          TAO_ENV_ARG_DECL)
 {
-  server->normal (10, ACE_TRY_ENV);
+  server->normal (10 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Long one = 1, two = 1, result = 0;
   result = server->calculate (one,
-                              two,
-                              ACE_TRY_ENV);
+                              two
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -57,7 +57,7 @@ run_test (Test_Interceptors::Visual_ptr server,
 
   ACE_TRY
     {
-      server->user (ACE_TRY_ENV);
+      server->user (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test_Interceptors::Silly, userex)
@@ -69,7 +69,7 @@ run_test (Test_Interceptors::Visual_ptr server,
 
   ACE_TRY_EX (SYS)
     {
-      server->system (ACE_TRY_ENV);
+      server->system (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SYS);
     }
   ACE_CATCH (CORBA::INV_OBJREF, sysex)
@@ -93,23 +93,23 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in (), ACE_TRY_ENV);
+        Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -120,9 +120,9 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in (), ACE_TRY_ENV);
+      run_test (server.in () TAO_ENV_ARG_PARAMETER);
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
index 093a0497204..c3292620654 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
@@ -64,9 +64,8 @@ Echo_Client_Request_Interceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -77,7 +76,7 @@ Echo_Client_Request_Interceptor::send_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -98,9 +97,8 @@ Echo_Client_Request_Interceptor::receive_other (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -115,9 +113,8 @@ Echo_Client_Request_Interceptor::receive_reply (
     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -128,7 +125,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -143,7 +140,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param1, param2, result;
@@ -152,7 +149,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -172,9 +169,8 @@ Echo_Client_Request_Interceptor::receive_exception (
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -184,7 +180,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_TRY_ENV);
+    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -244,9 +240,8 @@ Echo_Server_Request_Interceptor::receive_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -256,7 +251,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -271,7 +266,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_TRY_ENV);
+    ri->target_most_derived_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -285,9 +280,8 @@ Echo_Server_Request_Interceptor::send_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -297,7 +291,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -312,7 +306,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param1, param2, result = 0;
@@ -321,7 +315,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (ACE_TRY_ENV);
+      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -341,9 +335,8 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -353,12 +346,12 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (ACE_TRY_ENV);
+    ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id (ACE_TRY_ENV);
+  const char *exception_id = type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
index fccabebecf0..68777008e86 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
@@ -42,7 +42,7 @@ public:
 
   virtual void send_poll (
         PortableInterceptor::ClientRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS        
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -65,7 +65,7 @@ public:
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   virtual void receive_exception (
       PortableInterceptor::ClientRequestInfo_ptr ri
       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -123,10 +123,10 @@ public:
                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
-  
+
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS        
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 7ac5b662972..3acaf0dba2f 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -50,16 +50,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -68,14 +68,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -84,22 +84,22 @@ main (int argc, char *argv[])
       Visual_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (&server_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (id.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in (),
-                                            ACE_TRY_ENV);
+        Test_Interceptors::Visual::_narrow (test_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
@@ -117,12 +117,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
index 731f0b30ea8..64c80dd0a86 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -11,8 +11,8 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
   // ctor
 
 void
-Visual_i::normal (CORBA::Long arg,
-                  CORBA::Environment&)
+Visual_i::normal (CORBA::Long arg
+                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
@@ -20,8 +20,8 @@ Visual_i::normal (CORBA::Long arg,
 
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
-                     CORBA::Long two,
-                     CORBA::Environment&)
+                     CORBA::Long two
+                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
@@ -29,7 +29,7 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (CORBA::Environment &ACE_TRY_ENV)
+Visual_i::user (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
@@ -37,7 +37,7 @@ Visual_i::user (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Visual_i::system (CORBA::Environment &ACE_TRY_ENV)
+Visual_i::system (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
@@ -45,7 +45,7 @@ Visual_i::system (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Visual_i::shutdown (CORBA::Environment&)
+Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
index 5def6b74e00..1c679a55b7c 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
@@ -27,23 +27,23 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void normal (CORBA::Long arg,
-               CORBA::Environment&)
+  void normal (CORBA::Long arg
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Long calculate (
                          CORBA::Long one,
-                         CORBA::Long two,
-                         CORBA::Environment&)
+                         CORBA::Long two
+                         TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (CORBA::Environment&)
+  void user (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
 
-  void system (CORBA::Environment&)
+  void system (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index 5679d03a868..8ff1de5e5be 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -26,12 +26,10 @@ Client_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
-  CORBA::String_var orb_id = info->orb_id (ACE_TRY_ENV);
+  CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StringSeq_var args = info->arguments (ACE_TRY_ENV);
+  CORBA::StringSeq_var args = info->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var forward_str;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index c180e9e2067..104ad3d7681 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -38,12 +38,10 @@ Client_Request_Interceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   ++this->request_count_;
 
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_TRY_ENV);
+    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -59,19 +57,19 @@ Client_Request_Interceptor::send_request (
           int argc = 0;
           this->orb_ = CORBA::ORB_init (argc,
                                         0,
-                                        this->orb_id_.in (),
-                                        ACE_TRY_ENV);
+                                        this->orb_id_.in ()
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       CORBA::Object_var forward =
-        this->orb_->string_to_object (this->forward_str_.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (this->forward_str_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var forward_str =
-        this->orb_->object_to_string (forward.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->object_to_string (forward.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -118,14 +116,13 @@ Client_Request_Interceptor::receive_other (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_TRY_ENV);
+    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableInterceptor::ReplyStatus reply_status =
-    ri->reply_status (ACE_TRY_ENV);
+    ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected   // A one-way or asynchronous request.
@@ -139,7 +136,7 @@ Client_Request_Interceptor::receive_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (ACE_TRY_ENV);
+  CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (forward.in ()))
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index 5727f3bed21..9fed7eb387f 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -29,8 +29,6 @@ Server_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
   // Install the server request interceptor.
   ACE_NEW_THROW_EX (interceptor,
@@ -44,8 +42,8 @@ Server_ORBInitializer::post_init (
 
   this->server_interceptor_ = interceptor;
 
-  info->add_server_request_interceptor (interceptor,
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (interceptor
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 81b29ec8b2e..650431f5134 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -20,8 +20,8 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void)
 void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
-  CORBA::Object_ptr obj2,
-  CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Object_ptr obj2
+  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
@@ -57,12 +57,10 @@ Server_Request_Interceptor::receive_request_service_contexts (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   this->request_count_++;
 
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_TRY_ENV);
+    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -99,10 +97,8 @@ Server_Request_Interceptor::receive_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_TRY_ENV);
+    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -160,10 +156,8 @@ Server_Request_Interceptor::send_other (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   CORBA::Boolean response_expected =
-    ri->response_expected (ACE_TRY_ENV);
+    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -175,7 +169,7 @@ Server_Request_Interceptor::send_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (ACE_TRY_ENV);
+  CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (forward.in ()))
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index 4ff3b9871cc..189fa3d6ee0 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -68,9 +68,8 @@ public:
 
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
-                                   CORBA::Object_ptr obj2,
-                                   CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ())
+                                   CORBA::Object_ptr obj2
+                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
index 8aefaba9f60..0d3e80d0426 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -63,15 +63,15 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB",
-                                            ACE_TRY_ENV);
+                                            "Client ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
@@ -81,11 +81,11 @@ main (int argc, char *argv[])
       // IOR occurs during the various interceptions executed during
       // this test.
       CORBA::Object_var object =
-        orb->string_to_object (ior1, ACE_TRY_ENV);
+        orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ForwardRequestTest::test_var server =
-        ForwardRequestTest::test::_narrow (object.in (), ACE_TRY_ENV);
+        ForwardRequestTest::test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
           if (i > 1)
             old_number = number;
 
-          number = server->number (ACE_TRY_ENV);
+          number = server->number (TAO_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
             }
         }
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index 9eadd3a9241..cdfc78c8ac8 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -56,7 +56,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       Server_ORBInitializer *temp_initializer = 0;
@@ -66,16 +66,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -84,11 +84,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
@@ -102,22 +102,22 @@ main (int argc, char *argv[])
       PortableServer::POA_var first_poa =
         root_poa->create_POA ("first POA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var oid1 =
-        first_poa->activate_object (&servant1,
-                                    ACE_TRY_ENV);
+        first_poa->activate_object (&servant1
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj1 =
-        first_poa->servant_to_reference (&servant1,
-                                         ACE_TRY_ENV);
+        first_poa->servant_to_reference (&servant1
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior1 =
-        orb->object_to_string (obj1.in (), ACE_TRY_ENV);
+        orb->object_to_string (obj1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -130,29 +130,29 @@ main (int argc, char *argv[])
       PortableServer::POA_var second_poa =
         root_poa->create_POA ("second POA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var oid2 =
-        second_poa->activate_object (&servant2,
-                                     ACE_TRY_ENV);
+        second_poa->activate_object (&servant2
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj2 =
-        second_poa->servant_to_reference (&servant2,
-                                          ACE_TRY_ENV);
+        second_poa->servant_to_reference (&servant2
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior2 =
-        orb->object_to_string (obj2.in (), ACE_TRY_ENV);
+        orb->object_to_string (obj2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "ForwardRequestTest::test servant 2: <%s>\n",
                   ior2.in ()));
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set the forward references in the server request interceptor.
@@ -161,7 +161,7 @@ main (int argc, char *argv[])
 
       ForwardRequestTest::ServerRequestInterceptor_var interceptor =
         ForwardRequestTest::ServerRequestInterceptor::_narrow (
-           server_interceptor.in (), ACE_TRY_ENV);
+           server_interceptor.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (interceptor.in ()))
@@ -171,8 +171,8 @@ main (int argc, char *argv[])
                           -1);
 
       interceptor->forward_references (obj1.in (),
-                                       obj2.in (),
-                                       ACE_TRY_ENV);
+                                       obj2.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Write each IOR to a file.
@@ -199,13 +199,13 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index edd9b01080e..abe34922f30 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -18,18 +18,18 @@ test_i::~test_i (void)
 }
 
 CORBA::Short
-test_i::number (CORBA::Environment &)
+test_i::number (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Server is shutting down via object %d.\n",
               this->number_));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index f583ef93960..2adf3bbcd2e 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -28,14 +28,12 @@ FOO_ClientRequestInterceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   // Verify that the tagged component that was supposed to be embedded
   // into the IOR by the FOO_IORInterceptor is actually in the IOR
   // profile.
   IOP::TaggedComponent_var component =
-    ri->get_effective_component (FOO::COMPONENT_ID,
-                                 ACE_TRY_ENV);
+    ri->get_effective_component (FOO::COMPONENT_ID
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The correct tagged component appears to exist.  Display the
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index 7a1e9bf9ea6..1986211dd64 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -21,8 +21,6 @@ FOO_Client_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   PortableInterceptor::ClientRequestInterceptor_ptr foo;
   ACE_NEW_THROW_EX (foo,
                     FOO_ClientRequestInterceptor,
@@ -36,7 +34,7 @@ FOO_Client_ORBInitializer::post_init (
   PortableInterceptor::ClientRequestInterceptor_var interceptor =
     foo;
 
-  info->add_client_request_interceptor (interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_client_request_interceptor (interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index 8e5c94b4a99..3781f73dd95 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -21,7 +21,6 @@ FOO_IORInterceptor_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   PortableInterceptor::IORInterceptor_ptr foo;
   ACE_NEW_THROW_EX (foo,
@@ -36,7 +35,7 @@ FOO_IORInterceptor_ORBInitializer::post_init (
   PortableInterceptor::IORInterceptor_var ior_interceptor =
     foo;
 
-  info->add_ior_interceptor (ior_interceptor.in (),
-                             ACE_TRY_ENV);
+  info->add_ior_interceptor (ior_interceptor.in ()
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
index e5d7604a380..53095e667a2 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -50,24 +50,24 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_orb", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FOO::test_var server =
-        FOO::test::_narrow (obj.in (), ACE_TRY_ENV);
+        FOO::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index c67e5c3c709..1dc39b2df36 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -52,25 +52,25 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "test_orb",
-                                            ACE_TRY_ENV);
+                                            "test_orb"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -79,10 +79,10 @@ main (int argc, char *argv[])
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
 
       test_i server_impl (orb.in ());
 
-      obj = server_impl._this (ACE_TRY_ENV);
+      obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FOO::test_var server = FOO::test::_narrow (obj.in (),
-                                                 ACE_TRY_ENV);
+      FOO::test_var server = FOO::test::_narrow (obj.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
                           -1);
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ()));
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index f80354bf8d0..1bcd569d623 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -12,10 +12,10 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "\"test_i\" is shutting down.\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index 7f747dc9947..76c69b76129 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -23,9 +23,7 @@ ServerORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
-  ::slot_id = info->allocate_slot_id (ACE_TRY_ENV);
+  ::slot_id = info->allocate_slot_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_ptr tmp;
@@ -40,7 +38,7 @@ ServerORBInitializer::post_init (
 
   PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp;
 
-  info->add_server_request_interceptor (interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index dae6f2b6a99..4f7354e6843 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -34,9 +34,8 @@ ServerRequestInterceptor::receive_request_service_contexts (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
@@ -51,7 +50,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
   ACE_TRY
     {
-      ri->set_slot (this->slot_id_, data, ACE_TRY_ENV);
+      ri->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
@@ -89,9 +88,8 @@ ServerRequestInterceptor::send_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var op = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
@@ -104,7 +102,7 @@ ServerRequestInterceptor::send_reply (
       // Retrieve the data stored in the RSC.  This data should be
       // different from the original data stored into the RSC by the
       // receive_request_service_contexts() interception point.
-      data = ri->get_slot (this->slot_id_, ACE_TRY_ENV);
+      data = ri->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index e2638125471..86a6cc69e5b 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 #if 0
@@ -50,24 +50,24 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif  /* 0 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_orb", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PICurrentTest::test_var server =
-        PICurrentTest::test::_narrow (obj.in (), ACE_TRY_ENV);
+        PICurrentTest::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -78,10 +78,10 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->invoke_me (ACE_TRY_ENV);
+      server->invoke_me (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 32568337887..85b1c03a21c 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -53,23 +53,23 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "test_orb",
-                                            ACE_TRY_ENV);
+                                            "test_orb"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -78,20 +78,20 @@ main (int argc, char *argv[])
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
-      obj = orb->resolve_initial_references ("PICurrent", ACE_TRY_ENV);
+      obj = orb->resolve_initial_references ("PICurrent" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::Current_var pi_current =
-        PortableInterceptor::Current::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableInterceptor::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (pi_current.in ()))
@@ -103,12 +103,12 @@ main (int argc, char *argv[])
                           ::slot_id,
                           orb.in ());
 
-      obj = server_impl._this (ACE_TRY_ENV);
+      obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PICurrentTest::test_var server =
-        PICurrentTest::test::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PICurrentTest::test::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
                           -1);
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "PICurrentTest::test: <%s>\n", ior.in ()));
@@ -137,7 +137,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index bd0c90a8198..dbea3421c8e 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -20,7 +20,7 @@ test_i::~test_i (void)
 }
 
 void
-test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV)
+test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -39,7 +39,7 @@ test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV)
       // receive_request_service_contexts() interception point, and
       // then copied into the TSC current.
       retrieved_any =
-        this->current_->get_slot (this->slot_id_, ACE_TRY_ENV);
+        this->current_->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
@@ -88,7 +88,7 @@ test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY_EX (foo)
     {
-      this->current_->set_slot (this->slot_id_, data, ACE_TRY_ENV);
+      this->current_->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (foo);
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
@@ -113,11 +113,11 @@ test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Server is shutting down.\n"));
 
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index 3661e72841f..642c66c8913 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -26,7 +26,6 @@ Client_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   // Create and register the test request interceptors.
   PortableInterceptor::ClientRequestInterceptor_ptr ci =
@@ -43,8 +42,8 @@ Client_ORBInitializer::post_init (
   PortableInterceptor::ClientRequestInterceptor_var ci_interceptor =
     ci;
 
-  info->add_client_request_interceptor (ci_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_client_request_interceptor (ci_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (ci,
@@ -58,8 +57,8 @@ Client_ORBInitializer::post_init (
 
   ci_interceptor = ci;
 
-  info->add_client_request_interceptor (ci_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_client_request_interceptor (ci_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (ci,
@@ -73,7 +72,7 @@ Client_ORBInitializer::post_init (
 
   ci_interceptor = ci;
 
-  info->add_client_request_interceptor (ci_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_client_request_interceptor (ci_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index 9eceac9aa11..5cb7411e4ee 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -19,10 +19,9 @@ Client_Request_Interceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri, ACE_TRY_ENV);
+    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -36,7 +35,7 @@ Client_Request_Interceptor::send_request (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -79,10 +78,9 @@ Client_Request_Interceptor::send_poll (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri, ACE_TRY_ENV);
+    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -101,10 +99,9 @@ Client_Request_Interceptor::receive_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri, ACE_TRY_ENV);
+    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -120,7 +117,7 @@ Client_Request_Interceptor::receive_reply (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -162,10 +159,9 @@ Client_Request_Interceptor::receive_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri, ACE_TRY_ENV);
+    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -181,7 +177,7 @@ Client_Request_Interceptor::receive_exception (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -196,12 +192,12 @@ Client_Request_Interceptor::receive_exception (
           switch (scenario)
             {
             case 4:
-              exception = ri->received_exception (ACE_TRY_ENV);
+              exception = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               tc = exception->type ();
 
-              id = tc->id (ACE_TRY_ENV);
+              id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0)
@@ -247,10 +243,9 @@ Client_Request_Interceptor::receive_other (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri, ACE_TRY_ENV);
+    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -265,10 +260,10 @@ Client_Request_Interceptor::receive_other (
 
 CORBA::Boolean
 Client_Request_Interceptor::client_side_test (
-  PortableInterceptor::ClientRequestInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ClientRequestInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
-  CORBA::String_var op = info->operation (ACE_TRY_ENV);
+  CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return ACE_OS_String::strcmp (op.in (), "client_test") == 0 ? 1 : 0;
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
index ac150fb9ea7..c7fe08002a5 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
@@ -94,8 +94,8 @@ private:
   // Returns 1 if the client-side test is currently being run, and 0
   // otherwise.
   CORBA::Boolean client_side_test (
-    PortableInterceptor::ClientRequestInfo_ptr info,
-    CORBA::Environment &ACE_TRY_ENV);
+    PortableInterceptor::ClientRequestInfo_ptr info
+    TAO_ENV_ARG_DECL);
 
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index c6b994c7f66..1e5ef57fd73 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -26,7 +26,6 @@ Server_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   // Create and register the test request interceptors.
   PortableInterceptor::ServerRequestInterceptor_ptr si =
@@ -43,8 +42,8 @@ Server_ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var si_interceptor =
     si;
 
-  info->add_server_request_interceptor (si_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (si_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (si,
@@ -58,8 +57,8 @@ Server_ORBInitializer::post_init (
 
   si_interceptor = si;
 
-  info->add_server_request_interceptor (si_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (si_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (si,
@@ -73,7 +72,7 @@ Server_ORBInitializer::post_init (
 
   si_interceptor = si;
 
-  info->add_server_request_interceptor (si_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (si_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index b45a3e8fb41..625574cfa47 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -21,10 +21,9 @@ Server_Request_Interceptor::receive_request_service_contexts (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri, ACE_TRY_ENV);
+    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -69,10 +68,9 @@ Server_Request_Interceptor::receive_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri, ACE_TRY_ENV);
+    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -89,10 +87,9 @@ Server_Request_Interceptor::send_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri, ACE_TRY_ENV);
+    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -108,7 +105,7 @@ Server_Request_Interceptor::send_reply (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -150,10 +147,9 @@ Server_Request_Interceptor::send_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri, ACE_TRY_ENV);
+    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -169,7 +165,7 @@ Server_Request_Interceptor::send_exception (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_TRY_ENV);
+        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -184,12 +180,12 @@ Server_Request_Interceptor::send_exception (
           switch (scenario)
             {
             case 4:
-              exception = ri->sending_exception (ACE_TRY_ENV);
+              exception = ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               tc = exception->type ();
 
-              id = tc->id (ACE_TRY_ENV);
+              id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0)
@@ -235,10 +231,9 @@ Server_Request_Interceptor::send_other (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri, ACE_TRY_ENV);
+    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -253,10 +248,10 @@ Server_Request_Interceptor::send_other (
 
 CORBA::Boolean
 Server_Request_Interceptor::server_side_test (
-  PortableInterceptor::ServerRequestInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ServerRequestInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
-  CORBA::String_var op = info->operation (ACE_TRY_ENV);
+  CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return ACE_OS_String::strcmp (op.in (), "server_test") == 0 ? 1 : 0;
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
index 1b70a2f41c6..1e6c84778ad 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
@@ -96,8 +96,8 @@ private:
   /// Returns 1 if the server-side test is currently being run, and 0
   /// otherwise.
   CORBA::Boolean server_side_test (
-    PortableInterceptor::ServerRequestInfo_ptr info,
-    CORBA::Environment &ACE_TRY_ENV);
+    PortableInterceptor::ServerRequestInfo_ptr info
+    TAO_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index 181e9df512d..1a99d53e0f2 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 }
 
 void
-client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV)
+client_test (Test_ptr server TAO_ENV_ARG_DECL)
 {
   // Currently, there are only four scenarios for the client side
   // tests.
@@ -56,7 +56,7 @@ client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV)
 
       ACE_TRY
         {
-          server->client_test (i, ACE_TRY_ENV);
+          server->client_test (i TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (Test::X, ex)
@@ -89,7 +89,7 @@ client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV)
+server_test (Test_ptr server TAO_ENV_ARG_DECL)
 {
   // Currently, there are only four scenarios for the server side
   // tests.
@@ -104,7 +104,7 @@ server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV)
 
       ACE_TRY
         {
-          server->server_test (i, ACE_TRY_ENV);
+          server->server_test (i TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (Test::X, ex)
@@ -139,7 +139,7 @@ server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV)
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -151,25 +151,25 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "Client ORB",
-                                            ACE_TRY_ENV);
+                                            "Client ORB"
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
         return -1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -180,13 +180,13 @@ main (int argc, char *argv[])
                             1);
         }
 
-      ::client_test (server.in (), ACE_TRY_ENV);
+      ::client_test (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ::server_test (server.in (), ACE_TRY_ENV);
+      ::server_test (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index f89e7c4e978..f3b08527929 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -43,7 +43,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       Server_ORBInitializer *temp_initializer = 0;
@@ -53,16 +53,16 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var orb_initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (orb_initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -71,11 +71,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
@@ -83,18 +83,18 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
-      CORBA::Object_var obj = servant._this (ACE_TRY_ENV);
+      CORBA::Object_var obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in (), ACE_TRY_ENV);
+        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Servant:\n<%s>\n",
                   ior.in ()));
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Write IOR to a file.
@@ -109,13 +109,13 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 9717d06b34b..682c1eec724 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -12,8 +12,8 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::client_test (Test::TestScenario scenario,
-                     CORBA::Environment &ACE_TRY_ENV)
+test_i::client_test (Test::TestScenario scenario
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((Test::X,
                    Test::UnknownScenario,
                    CORBA::SystemException))
@@ -34,8 +34,8 @@ test_i::client_test (Test::TestScenario scenario,
 }
 
 void
-test_i::server_test (Test::TestScenario scenario,
-                     CORBA::Environment &ACE_TRY_ENV)
+test_i::server_test (Test::TestScenario scenario
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((Test::X,
                    Test::UnknownScenario,
                    CORBA::SystemException))
@@ -56,11 +56,11 @@ test_i::server_test (Test::TestScenario scenario,
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
               "Server is shutting down.\n"));
 
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
index af862f149d9..d0a480c43d7 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
@@ -33,24 +33,21 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// The client-side test operation.
-  virtual void client_test (Test::TestScenario scenario,
-                            CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ())
+  virtual void client_test (Test::TestScenario scenario
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((Test::X,
                      Test::UnknownScenario,
                      CORBA::SystemException));
 
   /// The server-side test operation.
-  virtual void server_test (Test::TestScenario scenario,
-                            CORBA::Environment &ACE_TRY_ENV =
-                              TAO_default_environment ())
+  virtual void server_test (Test::TestScenario scenario
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((Test::X,
                      Test::UnknownScenario,
                      CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                           TAO_default_environment ())
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index a5a4f69e84e..4244d28739f 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
@@ -26,10 +26,9 @@ Client_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::String_var orb_id =
-    info->orb_id (ACE_TRY_ENV);
+    info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
@@ -44,8 +43,8 @@ Client_ORBInitializer::post_init (
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
 
-  info->add_client_request_interceptor (client_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_client_request_interceptor (client_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index 5cd4a2011e2..6546f4ef6f9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -26,8 +26,6 @@ Server_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
 
@@ -40,8 +38,8 @@ Server_ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var
     server_interceptor = interceptor;
 
-  info->add_server_request_interceptor (server_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (server_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 92ee62afd33..67ecc0f5985 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -36,23 +36,23 @@ parse_args (int argc, char *argv[])
 }
 
 void
-run_test (Test_Interceptors::Visual_ptr server,
-          CORBA::Environment &ACE_TRY_ENV)
+run_test (Test_Interceptors::Visual_ptr server
+          TAO_ENV_ARG_DECL)
 {
 
-  server->normal (10, ACE_TRY_ENV);
+  server->normal (10 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n"));
 
-  server->nothing (ACE_TRY_ENV);
+  server->nothing (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n"));
 
   ACE_TRY
     {
-      server->user (ACE_TRY_ENV);
+      server->user (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test_Interceptors::Silly, userex)
@@ -64,7 +64,7 @@ run_test (Test_Interceptors::Visual_ptr server,
 
   ACE_TRY_EX (SYS)
     {
-      server->system (ACE_TRY_ENV);
+      server->system (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SYS);
     }
   ACE_CATCH (CORBA::INV_OBJREF, sysex)
@@ -88,23 +88,23 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in (), ACE_TRY_ENV);
+        Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -115,10 +115,10 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in (), ACE_TRY_ENV);
+      run_test (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
index bf1ddc0a93e..e370378705d 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
@@ -65,25 +65,24 @@ Echo_Client_Request_Interceptor::send_request (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in (),
-                                    ACE_TRY_ENV);
+                                    this->orb_id_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var target = ri->target (ACE_TRY_ENV);
+  CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -106,12 +105,12 @@ Echo_Client_Request_Interceptor::send_request (
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0, ACE_TRY_ENV);
+  ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 =
@@ -134,25 +133,24 @@ Echo_Client_Request_Interceptor::receive_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in (),
-                                    ACE_TRY_ENV);
+                                    this->orb_id_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var target = ri->target (ACE_TRY_ENV);
+  CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -165,7 +163,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf =
@@ -183,7 +181,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 =
@@ -218,25 +216,24 @@ Echo_Client_Request_Interceptor::receive_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in (),
-                                    ACE_TRY_ENV);
+                                    this->orb_id_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var target = ri->target (ACE_TRY_ENV);
+  CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -249,7 +246,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf =
@@ -267,7 +264,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 =
@@ -326,9 +323,8 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -345,7 +341,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
   IOP::ServiceId id = ::service_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id, ACE_TRY_ENV);
+    ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf =
@@ -375,7 +371,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   scc.context_data.replace (string_len, string_len, buff, 1);
 
   // Add this context to the service context list.
-  ri->add_reply_service_context (scc, 0, ACE_TRY_ENV);
+  ri->add_reply_service_context (scc, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -396,9 +392,8 @@ Echo_Server_Request_Interceptor::send_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -408,7 +403,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf = ACE_reinterpret_cast (const char *,
@@ -427,7 +422,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 = ACE_reinterpret_cast (const char *,
@@ -451,9 +446,8 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -463,7 +457,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf = ACE_reinterpret_cast (const char *,
@@ -482,7 +476,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 = ACE_reinterpret_cast (const char *,
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index c59db7dad2e..b90dc3879b5 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -49,17 +49,17 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now we can create the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -68,14 +68,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -84,22 +84,22 @@ main (int argc, char *argv[])
       Visual_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        root_poa->activate_object (&server_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (&server_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (id.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in (),
-                                            ACE_TRY_ENV);
+        Test_Interceptors::Visual::_narrow (test_obj.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -119,12 +119,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 9c2439038eb..3d6d031610a 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -13,22 +13,22 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 }
 
 void
-Visual_i::normal (CORBA::Long arg,
-                  CORBA::Environment &)
+Visual_i::normal (CORBA::Long arg
+                  TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
-Visual_i::nothing (CORBA::Environment &)
+Visual_i::nothing (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (CORBA::Environment &ACE_TRY_ENV)
+Visual_i::user (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test_Interceptors::Silly))
 {
@@ -37,7 +37,7 @@ Visual_i::user (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Visual_i::system (CORBA::Environment &ACE_TRY_ENV)
+Visual_i::system (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
@@ -45,9 +45,9 @@ Visual_i::system (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Visual_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
index 2f41cee3958..7fc612e7210 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
@@ -28,26 +28,21 @@ public:
 
   Visual_i (CORBA::ORB_ptr orb);
 
-  void normal (CORBA::Long arg,
-               CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ())
+  void normal (CORBA::Long arg
+               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void nothing (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ())
+  void nothing (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (CORBA::Environment &ACE_TRY_ENV =
-               TAO_default_environment ())
+  void user (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Silly));
 
-  void system (CORBA::Environment &ACE_TRY_ENV =
-                 TAO_default_environment ())
+  void system (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ())
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 274596b42ff..e64d14733a2 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -24,21 +24,21 @@ main (int argc, char *argv[])
   QApplication app (argc, argv);
   TAO_QtResource_Factory::set_context (&app);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client client (orb.in (), app);
 
-      client.parse_args (argc, argv, ACE_TRY_ENV);
+      client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creates the Qt widgets
-      client.create_widgets (ACE_TRY_ENV);
+      client.create_widgets (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This may look a bit suspect, but Qt wants the manager widget
@@ -74,8 +74,8 @@ Client::~Client (void)
 
 void
 Client::parse_args (int argc,
-                    char *argv[],
-                    CORBA::Environment &ACE_TRY_ENV)
+                    char *argv[]
+                    TAO_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
@@ -98,11 +98,11 @@ Client::parse_args (int argc,
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior, ACE_TRY_ENV);
+    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->server_ =
-    LCD_Display::_narrow (object.in (), ACE_TRY_ENV);
+    LCD_Display::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(this->server_.in ()))
@@ -113,7 +113,7 @@ Client::parse_args (int argc,
 }
 
 void
-Client::create_widgets (CORBA::Environment &/*ACE_TRY_ENV*/)
+Client::create_widgets (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // Ewsize the box
   this->box_.resize (200,120);
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index 089d378548c..bbd8a4dc4ba 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -38,13 +38,13 @@ public:
   ~Client (void);
   //Dtor..
 
-  void create_widgets (CORBA::Environment &);
+  void create_widgets (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Adds the callbacks to the GUI underneath.....
 
   void show (void);
 
-  void parse_args (int argc, char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV);
+  void parse_args (int argc, char *argv[]
+                   TAO_ENV_ARG_DECL);
 
   QVBox box_;
   // A box widget..
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index e580ca26a3c..009f27951d7 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -36,14 +36,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -63,15 +63,15 @@ main (int argc, char *argv[])
   QApplication app (argc, argv);
   TAO_QtResource_Factory::set_context (&app);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -80,11 +80,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the Qt stuff..
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
       LCD_Display_imp display_impl (orb.in ());
 
       LCD_Display_var server =
-        display_impl._this (ACE_TRY_ENV);
+        display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the LCD after the QVbox is created.
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
       // End of QT specific stuff..
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -123,17 +123,17 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We choose to run the main Qt event loop..
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 3b63ecbef4b..6277525c83a 100755
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -11,13 +11,13 @@
 ACE_RCSID(FL_Cube, test_i, "$Id$")
 
 LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
-                                  
+
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
 }
 
 void
-LCD_Display_imp::shutdown (CORBA::Environment&)
+LCD_Display_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -26,9 +26,9 @@ LCD_Display_imp::shutdown (CORBA::Environment&)
   this->orb_->destroy ();
 }
 
-void 
-LCD_Display_imp::send_val (CORBA::Long val, 
-                           CORBA::Environment &)
+void
+LCD_Display_imp::send_val (CORBA::Long val
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index 41ad4cf02e8..e13be721eba 100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -41,11 +41,11 @@ public:
 
   // ctor
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void send_val (CORBA::Long val,
-                 CORBA::Environment &)
+  void send_val (CORBA::Long val
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  signals:
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 5d4e5abca60..566e7060c23 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -40,23 +40,23 @@ parse_args (int argc, char *argv[])
 }
 
 CORBA::Short
-get_server_priority (Test_ptr server,
-                     CORBA::Environment &ACE_TRY_ENV)
+get_server_priority (Test_ptr server
+                     TAO_ENV_ARG_DECL)
 {
   // Get the Priority Model Policy from the stub.
   CORBA::Policy_var policy =
-    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
-                         ACE_TRY_ENV);
+    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Narrow down to correct type.
   RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in (), ACE_TRY_ENV);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Make sure that we have the SERVER_DECLARED priority model.
   RTCORBA::PriorityModel priority_model =
-    priority_policy->priority_model (ACE_TRY_ENV);
+    priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (priority_model != RTCORBA::SERVER_DECLARED)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -65,20 +65,20 @@ get_server_priority (Test_ptr server,
                       -1);
 
   // Return the server priority.
-  return priority_policy->server_priority (ACE_TRY_ENV);
+  return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 invocation_exception_test (Test_ptr obj,
-                           CORBA::Short priority,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Short priority
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // Invoke method on test object.
       obj->test_method (1,
-                        priority,
-                        ACE_TRY_ENV);
+                        priority
+                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -114,8 +114,8 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -127,43 +127,43 @@ main (int argc, char *argv[])
 
       // Get the RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the RTCurrent.
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test object 1 (with CLIENT_PROPAGATED priority model).
       object =
-        orb->string_to_object (ior1,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior1
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var client_propagated_obj =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test object 2 (with SERVER_DECLARED priority model).
-      object = orb->string_to_object (ior2,
-                                      ACE_TRY_ENV);
+      object = orb->string_to_object (ior2
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server_declared_obj =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt to set priority bands that do not match server
@@ -182,33 +182,33 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (1);
       policies[0] =
-        rt_orb->create_priority_banded_connection_policy (false_bands,
-                                                          ACE_TRY_ENV);
+        rt_orb->create_priority_banded_connection_policy (false_bands
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set false bands at the object level.  Note that a new object
       // is returned.
       object =
         client_propagated_obj->_set_policy_overrides (policies,
-                                                      CORBA::SET_OVERRIDE,
-                                                      ACE_TRY_ENV);
+                                                      CORBA::SET_OVERRIDE
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client_propagated_obj =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoking on this object with false bands should produce an
       // exception.
       invocation_exception_test (client_propagated_obj.in (),
-                                 0,
-                                 ACE_TRY_ENV);
+                                 0
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the correct bands from the <server_declared_obj>.
       policies[0] =
-        server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE,
-                                          ACE_TRY_ENV);
+        server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityBandedConnectionPolicy_var bands_policy =
@@ -221,13 +221,13 @@ main (int argc, char *argv[])
       // object is returned.
       object =
         client_propagated_obj->_set_policy_overrides (policies,
-                                                      CORBA::SET_OVERRIDE,
-                                                      ACE_TRY_ENV);
+                                                      CORBA::SET_OVERRIDE
+                                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Overwrite existing <client_propagated_obj>.
       client_propagated_obj =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt invocation on <client_propagated_obj> with
@@ -242,15 +242,15 @@ main (int argc, char *argv[])
         bands[bands->length () - 1].high + 1;
 
       // Reset the current thread's priority.
-      current->the_priority (client_priority,
-                             ACE_TRY_ENV);
+      current->the_priority (client_priority
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoking on this object with an invalid client thread
       // priority should produce an exception.
       invocation_exception_test (client_propagated_obj.in (),
-                                 client_priority,
-                                 ACE_TRY_ENV);
+                                 client_priority
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Make invocations on the <client_propagated_obj>.
@@ -267,14 +267,14 @@ main (int argc, char *argv[])
             (bands[i].low + bands[i].high) / 2;
 
           // Reset the current thread's priority.
-          current->the_priority (client_priority,
-                                 ACE_TRY_ENV);
+          current->the_priority (client_priority
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Invoke test method on server.
           client_propagated_obj->test_method (1, // CLIENT_PROPAGATED
-                                              client_priority,
-                                              ACE_TRY_ENV);
+                                              client_priority
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -285,18 +285,18 @@ main (int argc, char *argv[])
 
       // Get the <server_priority> from the stub.
       CORBA::Short server_priority =
-        get_server_priority (server_declared_obj.in (),
-                             ACE_TRY_ENV);
+        get_server_priority (server_declared_obj.in ()
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoke test method on server.
       server_declared_obj->test_method (0, // SERVER_DECLARED
-                                        server_priority,
-                                        ACE_TRY_ENV);
+                                        server_priority
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Testing over. Shut down Server ORB.
-      server_declared_obj->shutdown (ACE_TRY_ENV);
+      server_declared_obj->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index d5ab8565867..76c3f99f1d9 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -11,15 +11,15 @@ class Test_i : public POA_Test
 {
 public:
   Test_i (CORBA::ORB_ptr orb,
-          RTCORBA::PriorityBands &bands,
-          CORBA::Environment &ACE_TRY_ENV);
+          RTCORBA::PriorityBands &bands
+          TAO_ENV_ARG_DECL);
 
   void test_method (CORBA::Boolean client_propagated,
-                    CORBA::Short priority,
-                    CORBA::Environment&)
+                    CORBA::Short priority
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -29,33 +29,33 @@ private:
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb,
-                RTCORBA::PriorityBands &bands,
-                CORBA::Environment &ACE_TRY_ENV)
+                RTCORBA::PriorityBands &bands
+                TAO_ENV_ARG_DECL)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
      bands_ (bands),
      rt_current_ ()
 {
   // We resolve and store the RT Current for later use.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTCurrent"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rt_current_ =
-    RTCORBA::Current::_narrow (obj.in (),
-                               ACE_TRY_ENV);
+    RTCORBA::Current::_narrow (obj.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Test_i::test_method (CORBA::Boolean client_propagated,
-                     CORBA::Short client_priority,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Short client_priority
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the upcall thread's priority.
   CORBA::Short server_priority =
-    this->rt_current_->the_priority (ACE_TRY_ENV);
+    this->rt_current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Check which policy we are dealing with.
@@ -116,11 +116,11 @@ Test_i::test_method (CORBA::Boolean client_propagated,
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -232,25 +232,25 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename,
-               CORBA::Environment &ACE_TRY_ENV)
+               const char *filename
+               TAO_ENV_ARG_DECL)
 {
   // Register servant with the POA.
   PortableServer::ObjectId_var id;
-  id = poa->activate_object (server_impl,
-                             ACE_TRY_ENV);
+  id = poa->activate_object (server_impl
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create object reference.
   CORBA::Object_var server =
-    poa->id_to_reference (id.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in (),
-                           ACE_TRY_ENV);
+    orb->object_to_string (server.in ()
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print ior to the file.
@@ -275,16 +275,16 @@ create_object (PortableServer::POA_ptr poa,
 void
 object_activation_exception_test (RTPortableServer::POA_ptr poa,
                                   Test_i *server_impl,
-                                  CORBA::Short priority,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Short priority
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // Register servant with POA.
       PortableServer::ObjectId_var id =
         poa->activate_object_with_priority (server_impl,
-                                            priority,
-                                            ACE_TRY_ENV);
+                                            priority
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -310,8 +310,8 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa,
 void
 poa_creation_exception_test (PortableServer::POA_ptr root_poa,
                              PortableServer::POAManager_ptr manager,
-                             CORBA::PolicyList &policies,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::PolicyList &policies
+                             TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -319,8 +319,8 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               manager,
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -356,8 +356,8 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -369,28 +369,28 @@ main (int argc, char *argv[])
 
       // Get the RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the RootPOA.
       object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA Manager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain priority bands to be used in this test from the file
@@ -435,8 +435,8 @@ main (int argc, char *argv[])
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size,
-                                              ACE_TRY_ENV);
+                                              max_request_buffer_size
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt to create a POA with priority bands that do not
@@ -454,22 +454,22 @@ main (int argc, char *argv[])
 
       // Create a bands policy.
       poa_policy_list[0] =
-        rt_orb->create_priority_banded_connection_policy (false_bands,
-                                                          ACE_TRY_ENV);
+        rt_orb->create_priority_banded_connection_policy (false_bands
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
-        rt_orb->create_threadpool_policy (threadpool_id,
-                                          ACE_TRY_ENV);
+        rt_orb->create_threadpool_policy (threadpool_id
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a POA with invalid policies.  Should throw an
       // exception.
       poa_creation_exception_test (root_poa.in (),
                                    poa_manager.in (),
-                                   poa_policy_list,
-                                   ACE_TRY_ENV);
+                                   poa_policy_list
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Two policies for the next POA.
@@ -478,14 +478,14 @@ main (int argc, char *argv[])
       // Create a priority model policy.
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0,
-                                              ACE_TRY_ENV);
+                                              0
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[1] =
-        rt_orb->create_threadpool_policy (threadpool_id,
-                                          ACE_TRY_ENV);
+        rt_orb->create_threadpool_policy (threadpool_id
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED priority model, with lanes
@@ -493,8 +493,8 @@ main (int argc, char *argv[])
       PortableServer::POA_var client_propagated_poa =
         root_poa->create_POA ("client_propagated_poa",
                               poa_manager.in (),
-                              poa_policy_list,
-                              ACE_TRY_ENV);
+                              poa_policy_list
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Three policies for the next POA.
@@ -507,20 +507,20 @@ main (int argc, char *argv[])
       // Create a priority model policy.
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                              poa_priority,
-                                              ACE_TRY_ENV);
+                                              poa_priority
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a bands policy.
       poa_policy_list[1] =
-        rt_orb->create_priority_banded_connection_policy (bands,
-                                                          ACE_TRY_ENV);
+        rt_orb->create_priority_banded_connection_policy (bands
+                                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a thread-pool policy.
       poa_policy_list[2] =
-        rt_orb->create_threadpool_policy (threadpool_id,
-                                          ACE_TRY_ENV);
+        rt_orb->create_threadpool_policy (threadpool_id
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with SERVER_DECLARED priority model, with bands
@@ -528,8 +528,8 @@ main (int argc, char *argv[])
       PortableServer::POA_var server_declared_poa =
         root_poa->create_POA ("server_declared_poa",
                               poa_manager.in (),
-                              poa_policy_list,
-                              ACE_TRY_ENV);
+                              poa_policy_list
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test: Attempt to register an object with priority that
@@ -538,55 +538,55 @@ main (int argc, char *argv[])
                   "\n<---Test--->: Servant priority does not match lanes\n\n"));
 
       RTPortableServer::POA_var rt_server_declared_poa =
-        RTPortableServer::POA::_narrow (server_declared_poa.in (), ACE_TRY_ENV);
+        RTPortableServer::POA::_narrow (server_declared_poa.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activation with incorrect priority should fail.
       CORBA::Short wrong_priority = 10000;
       object_activation_exception_test (rt_server_declared_poa.in (),
                                         0,
-                                        wrong_priority,
-                                        ACE_TRY_ENV);
+                                        wrong_priority
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create first servant and register with <client_propagated_poa>.
       Test_i server_impl (orb.in (),
-                          bands,
-                          ACE_TRY_ENV);
+                          bands
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = create_object (client_propagated_poa.in (),
                               orb.in (),
                               &server_impl,
-                              ior_output_file1,
-                              ACE_TRY_ENV);
+                              ior_output_file1
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       // Create second servant and register with <server_declared_poa>.
       Test_i server_impl2 (orb.in (),
-                           bands,
-                           ACE_TRY_ENV);
+                           bands
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = create_object (server_declared_poa.in (),
                               orb.in (),
                               &server_impl2,
-                              ior_output_file2,
-                              ACE_TRY_ENV);
+                              ior_output_file2
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       // Activate POA manager.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run ORB.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy ORB.
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
index 11463bd4333..5a57d02a41b 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
@@ -26,10 +26,9 @@ Client_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   CORBA::String_var orb_id =
-    info->orb_id (ACE_TRY_ENV);
+    info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
@@ -44,8 +43,8 @@ Client_ORBInitializer::post_init (
   PortableInterceptor::ClientRequestInterceptor_var
     client_interceptor = interceptor;
 
-  info->add_client_request_interceptor (client_interceptor.in (),
-                                        ACE_TRY_ENV);
+  info->add_client_request_interceptor (client_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 5f30bea8cb3..1b21f8edc82 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -53,24 +53,24 @@ main (int argc, char *argv[])
       PortableInterceptor::ORBInitializer_var initializer =
         temp_initializer;
 
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
+      PortableInterceptor::register_orb_initializer (initializer.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -84,12 +84,12 @@ main (int argc, char *argv[])
       // Check that the object is configured with CLIENT_PROPAGATED
       // PriorityModelPolicy.
       CORBA::Policy_var policy =
-        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
-                             ACE_TRY_ENV);
+        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
-        RTCORBA::PriorityModelPolicy::_narrow (policy.in (), ACE_TRY_ENV);
+        RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (priority_policy.in ()))
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
                           1);
 
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (ACE_TRY_ENV);
+        priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (priority_model != RTCORBA::CLIENT_PROPAGATED)
@@ -110,18 +110,18 @@ main (int argc, char *argv[])
       // Make several invocation, changing the priority of this thread
       // for each.
       object =
-        orb->resolve_initial_references ("RTCurrent", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (), ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->resolve_initial_references ("PriorityMappingManager",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("PriorityMappingManager"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMapping *pm =
@@ -145,11 +145,11 @@ main (int argc, char *argv[])
 
       for (int i = 0; i < 3; ++i)
         {
-          current->the_priority (desired_priority, ACE_TRY_ENV);
+          current->the_priority (desired_priority TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short priority =
-            current->the_priority (ACE_TRY_ENV);
+            current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (desired_priority != priority)
@@ -159,14 +159,14 @@ main (int argc, char *argv[])
                               1);
 
 
-          server->test_method (priority, ACE_TRY_ENV);
+          server->test_method (priority TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           desired_priority++;
         }
 
       // Shut down Server ORB.
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::DATA_CONVERSION, ex)
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
index 9ac2b144c31..a8b90cfe9b2 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
@@ -70,14 +70,13 @@ Client_Request_Interceptor::receive_reply (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
 
   ACE_TRY
     {
       // Try to get the RTCorbaPriority context.  If its not there,
       // report the fact via an exception.
       IOP::ServiceContext_var sc =
-        ri->get_reply_service_context (IOP::RTCorbaPriority, ACE_TRY_ENV);
+        ri->get_reply_service_context (IOP::RTCorbaPriority TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -109,25 +108,24 @@ Client_Request_Interceptor::receive_exception (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
 
   if (CORBA::is_nil (this->orb_.in ()))
     {
       int argc = 0;
       this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in (),
-                                    ACE_TRY_ENV);
+                                    this->orb_id_.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
+  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Object_var target = ri->target (ACE_TRY_ENV);
+  CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (target.in (), ACE_TRY_ENV);
+    this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -141,6 +139,6 @@ Client_Request_Interceptor::receive_exception (
   // Try to get the RTCorbaPriority context.  If its not there,
   // report the fact via an exception.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (IOP::RTCorbaPriority, ACE_TRY_ENV);
+    ri->get_reply_service_context (IOP::RTCorbaPriority TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index b9fa96e6108..a7a5637a71d 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -16,11 +16,11 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Short priority,
-                    CORBA::Environment&)
+  void test_method (CORBA::Short priority
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -34,26 +34,26 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Short priority,
-                     CORBA::Environment &ACE_TRY_ENV)
+Test_i::test_method (CORBA::Short priority
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (obj.in (), ACE_TRY_ENV);
+    RTCORBA::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (obj.in ()))
     ACE_THROW (CORBA::INTERNAL ());
 
   CORBA::Short servant_thread_priority =
-    current->the_priority (ACE_TRY_ENV);
+    current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Print out the info.
@@ -69,10 +69,10 @@ Test_i::test_method (CORBA::Short priority,
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -119,18 +119,18 @@ main (int argc, char *argv[])
       // parse arguments and get all the references (ORB,
       // RootPOA, RTORB, RTCurrent, POAManager).
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -139,20 +139,20 @@ main (int argc, char *argv[])
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (), ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED PriorityModelPolicy,
@@ -161,31 +161,31 @@ main (int argc, char *argv[])
       poa_policy_list.length (1);
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0,
-                                              ACE_TRY_ENV);
+                                              0
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list,
-                              ACE_TRY_ENV);
+                              poa_policy_list
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        child_poa->activate_object (&server_impl, ACE_TRY_ENV);
+        child_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
-        child_poa->id_to_reference (id.in (),
-                                    ACE_TRY_ENV);
+        child_poa->id_to_reference (id.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
@@ -204,21 +204,21 @@ main (int argc, char *argv[])
 
       // Get the initial priority of the current thread.
       CORBA::Short initial_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
 
       // Get the final priority of the current thread.
       CORBA::Short final_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (final_thread_priority != initial_thread_priority)
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index a480729d6c3..d5d56cc5d92 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -63,12 +63,12 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 
 void
 exception_test (Test_ptr server,
-                const char *msg,
-                CORBA::Environment &ACE_TRY_ENV)
+                const char *msg
+                TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      server->test_method (ACE_TRY_ENV);
+      server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
      }
   ACE_CATCH (CORBA::INV_POLICY, ex)
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -103,48 +103,48 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // PolicyManager.
-      object = orb->resolve_initial_references ("ORBPolicyManager",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("ORBPolicyManager"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_manager.in (), "PolicyManager")
           == -1)
         return 1;
 
       // PolicyCurrent.
-      object = orb->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 1;
 
       // Test object 1 (ClientProtocolPolicy set on server).
-      object = orb->string_to_object (ior1, ACE_TRY_ENV);
+      object = orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server1 = Test::_narrow (object.in (), ACE_TRY_ENV);
+      Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return 1;
 
       // Test object 2 (no client-exposed ClientProtocolPolicy).
-      object = orb->string_to_object (ior2, ACE_TRY_ENV);
+      object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server2 = Test::_narrow (object.in (), ACE_TRY_ENV);
+      Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return 1;
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
       // ClientProtocolPolicy set on the server side.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 1\n"));
-      server1->test_method (ACE_TRY_ENV);
+      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 2: Set the ORB-level ClientProtocolPolicy override, and
@@ -175,17 +175,17 @@ main (int argc, char *argv[])
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_test (server1.in (),
-                      "ERROR: Test 2 failed\n", ACE_TRY_ENV);
+                      "ERROR: Test 2 failed\n" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 3: Attempt the invocation on the second object reference
@@ -194,7 +194,7 @@ main (int argc, char *argv[])
       // conflicts.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 3\n"));
-      server2->test_method (ACE_TRY_ENV);
+      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 4: Override ClientProtocolPolicy on the Current level.
@@ -211,17 +211,17 @@ main (int argc, char *argv[])
       protocols[1].protocol_type = 4;
       protocols[2].protocol_type = 5;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_test (server2.in (),
-                      "ERROR: Test 4 failed\n", ACE_TRY_ENV);
+                      "ERROR: Test 4 failed\n" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 5: Override ClientProtocolPolicy on the Current level
@@ -234,22 +234,22 @@ main (int argc, char *argv[])
       protocols[0].protocol_type = 3;
       protocols[1].protocol_type = protocol_type;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server2->test_method (ACE_TRY_ENV);
+      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Testing over.  Shut down server ORB.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Testing over\n"));
-      server2->shutdown (ACE_TRY_ENV);
+      server2->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index c147e991bdb..c2aba8d8213 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -16,10 +16,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (CORBA::Environment&)
+  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -33,7 +33,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Environment& /*ACE_TRY_ENV*/)
+Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -41,10 +41,10 @@ Test_i::test_method (CORBA::Environment& /*ACE_TRY_ENV*/)
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -112,22 +112,22 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename,
-               CORBA::Environment &ACE_TRY_ENV)
+               const char *filename
+               TAO_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl, ACE_TRY_ENV);
+    poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in (), ACE_TRY_ENV);
+    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -164,27 +164,27 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // RootPOA.
       object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create child POA with RTCORBA::ClientProtocolPolicy set.
@@ -201,15 +201,15 @@ main (int argc, char *argv[])
       CORBA::PolicyList poa_policy_list;
       poa_policy_list.length (1);
       poa_policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list,
-                              ACE_TRY_ENV);
+                              poa_policy_list
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant.
@@ -219,7 +219,7 @@ main (int argc, char *argv[])
       int result;
       ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
       result = create_object (poa.in (), orb.in (), &server_impl,
-                              ior_output_file1, ACE_TRY_ENV);
+                              ior_output_file1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
@@ -227,16 +227,16 @@ main (int argc, char *argv[])
       // Create object 2.
       ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
       result = create_object (root_poa.in (), orb.in (), &server_impl,
-                              ior_output_file2, ACE_TRY_ENV);
+                              ior_output_file2 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index c13bcaf59b1..fea2d7d3fd8 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -30,13 +30,13 @@ public:
           PortableServer::POA_ptr poa,
           Tests &tests);
 
-  void start (CORBA::Environment &ACE_TRY_ENV)
+  void start (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void method (CORBA::Environment &ACE_TRY_ENV)
+  void method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
   int client_propagated (void);
 
@@ -106,7 +106,7 @@ test_i::invocation_lane (CORBA::ULong lane)
 }
 
 void
-test_i::start (CORBA::Environment &ACE_TRY_ENV)
+test_i::start (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -126,17 +126,17 @@ test_i::start (CORBA::Environment &ACE_TRY_ENV)
       if (test->servant_->client_propagated ())
         {
           CORBA::Object_var object =
-            this->orb_->resolve_initial_references ("RTCurrent",
-                                                    ACE_TRY_ENV);
+            this->orb_->resolve_initial_references ("RTCurrent"
+                                                    TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           RTCORBA::Current_var current =
-            RTCORBA::Current::_narrow (object.in (),
-                                       ACE_TRY_ENV);
+            RTCORBA::Current::_narrow (object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA::Short current_thread_priority =
-            current->the_priority (ACE_TRY_ENV);
+            current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (current_thread_priority == default_thread_priority)
@@ -145,25 +145,25 @@ test_i::start (CORBA::Environment &ACE_TRY_ENV)
             test->servant_->invocation_lane (1);
         }
 
-      test->object_->method (ACE_TRY_ENV);
+      test->object_->method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (test->object_.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->object_to_string (test->object_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior.in (),
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (ior.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       test_var test_from_string =
-        test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      test_from_string->method (ACE_TRY_ENV);
+      test_from_string->method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       iterator.advance ();
@@ -204,14 +204,14 @@ test_i::thread_info (const char *method_name)
 }
 
 void
-test_i::method (CORBA::Environment &)
+test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->thread_info ("test_i::method");
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -220,17 +220,17 @@ class Server
 {
 public:
   Server (int argc,
-          char *argv[],
-          CORBA::Environment &ACE_TRY_ENV);
+          char *argv[]
+          TAO_ENV_ARG_DECL);
 
-  void create_servant_in_root_poa (CORBA::Environment &ACE_TRY_ENV);
-  void create_poa_and_servant_with_tp_policy (CORBA::Environment &ACE_TRY_ENV);
+  void create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL);
   void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
-                                                         RTCORBA::PriorityModel priority_model,
-                                                         CORBA::Environment &ACE_TRY_ENV);
-  void test (CORBA::Environment &ACE_TRY_ENV);
-  void start_testing (CORBA::Environment &ACE_TRY_ENV);
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+                                                         RTCORBA::PriorityModel priority_model
+                                                         TAO_ENV_ARG_DECL);
+  void test (TAO_ENV_SINGLE_ARG_DECL);
+  void start_testing (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
 
   CORBA::ORB_var orb_;
   RTCORBA::RTORB_var rt_orb_;
@@ -250,8 +250,8 @@ public:
 };
 
 Server::Server (int argc,
-                char *argv[],
-                CORBA::Environment &ACE_TRY_ENV)
+                char *argv[]
+                TAO_ENV_ARG_DECL)
   : stacksize_ (0),
     static_threads_ (1),
     dynamic_threads_ (0),
@@ -263,55 +263,55 @@ Server::Server (int argc,
   this->orb_ =
     CORBA::ORB_init (argc,
                      argv,
-                     "",
-                     ACE_TRY_ENV);
+                     ""
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTORB",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTORB"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rt_orb_ =
-    RTCORBA::RTORB::_narrow (object.in (),
-                             ACE_TRY_ENV);
+    RTCORBA::RTORB::_narrow (object.in ()
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   object =
-    this->orb_->resolve_initial_references ("RTCurrent",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTCurrent"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->current_ =
-    RTCORBA::Current::_narrow (object.in (),
-                               ACE_TRY_ENV);
+    RTCORBA::Current::_narrow (object.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   default_thread_priority =
-    this->current_->the_priority (ACE_TRY_ENV);
+    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   object =
-    this->orb_->resolve_initial_references ("RootPOA",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RootPOA"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (object.in (),
-                                  ACE_TRY_ENV);
+    PortableServer::POA::_narrow (object.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_manager_ =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
+    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->poa_manager_->activate (ACE_TRY_ENV);
+  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 
 void
-Server::create_servant_in_root_poa (CORBA::Environment &ACE_TRY_ENV)
+Server::create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -329,12 +329,12 @@ Server::create_servant_in_root_poa (CORBA::Environment &ACE_TRY_ENV)
   this->tests_[this->tests_.size () - 1].servant_ =
     servant;
   this->tests_[this->tests_.size () - 1].object_ =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Server::create_poa_and_servant_with_tp_policy (CORBA::Environment &ACE_TRY_ENV)
+Server::create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_DECL)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     this->rt_orb_->create_threadpool (this->stacksize_,
@@ -343,18 +343,18 @@ Server::create_poa_and_servant_with_tp_policy (CORBA::Environment &ACE_TRY_ENV)
                                       default_thread_priority,
                                       this->allow_request_buffering_,
                                       this->max_buffered_requests_,
-                                      this->max_request_buffer_size_,
-                                      ACE_TRY_ENV);
+                                      this->max_request_buffer_size_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id,
-                                             ACE_TRY_ENV);
+    this->rt_orb_->create_threadpool_policy (threadpool_id
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var implicit_activation_policy =
-    this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                        ACE_TRY_ENV);
+    this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -370,8 +370,8 @@ Server::create_poa_and_servant_with_tp_policy (CORBA::Environment &ACE_TRY_ENV)
   PortableServer::POA_var poa =
     this->root_poa_->create_POA ("tp_child",
                                  this->poa_manager_.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -390,14 +390,14 @@ Server::create_poa_and_servant_with_tp_policy (CORBA::Environment &ACE_TRY_ENV)
   this->tests_[this->tests_.size () - 1].servant_ =
     servant;
   this->tests_[this->tests_.size () - 1].object_ =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
-                                                          RTCORBA::PriorityModel priority_model,
-                                                          CORBA::Environment &ACE_TRY_ENV)
+                                                          RTCORBA::PriorityModel priority_model
+                                                          TAO_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes (2);
   lanes.length (2);
@@ -416,19 +416,19 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
                                                  this->allow_borrowing_,
                                                  this->allow_request_buffering_,
                                                  this->max_buffered_requests_,
-                                                 this->max_request_buffer_size_,
-                                                 ACE_TRY_ENV);
+                                                 this->max_request_buffer_size_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id,
-                                             ACE_TRY_ENV);
+    this->rt_orb_->create_threadpool_policy (threadpool_id
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var priority_model_policy =
     this->rt_orb_->create_priority_model_policy (priority_model,
-                                                 default_thread_priority,
-                                                 ACE_TRY_ENV);
+                                                 default_thread_priority
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -444,13 +444,13 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (poa_name,
                                  this->poa_manager_.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
-    RTPortableServer::POA::_narrow (poa.in (),
-                                    ACE_TRY_ENV);
+    RTPortableServer::POA::_narrow (poa.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant1 = 0;
@@ -482,14 +482,14 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
 
       id1 =
         rt_poa->activate_object_with_priority (servant1,
-                                               default_thread_priority,
-                                               ACE_TRY_ENV);
+                                               default_thread_priority
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       id2 =
         rt_poa->activate_object_with_priority (servant2,
-                                               default_thread_priority + 1,
-                                               ACE_TRY_ENV);
+                                               default_thread_priority + 1
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -500,45 +500,45 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
       servant2->client_propagated (1);
 
       id1 =
-        rt_poa->activate_object (servant1,
-                                 ACE_TRY_ENV);
+        rt_poa->activate_object (servant1
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       id2 =
-        rt_poa->activate_object (servant2,
-                                 ACE_TRY_ENV);
+        rt_poa->activate_object (servant2
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   CORBA::Object_var object1 =
-    poa->id_to_reference (id1.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id1.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object2 =
-    poa->id_to_reference (id2.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id2.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
-    test::_narrow (object1.in (),
-                   ACE_TRY_ENV);
+    test::_narrow (object1.in ()
+                   TAO_ENV_ARG_PARAMETER);
   this->tests_[this->tests_.size () - 1].servant_ =
     servant1;
   ACE_CHECK;
 
   this->tests_.size (this->tests_.size () + 1);
   this->tests_[this->tests_.size () - 1].object_ =
-    test::_narrow (object2.in (),
-                   ACE_TRY_ENV);
+    test::_narrow (object2.in ()
+                   TAO_ENV_ARG_PARAMETER);
   this->tests_[this->tests_.size () - 1].servant_ =
     servant2;
   ACE_CHECK;
 }
 
 void
-Server::start_testing (CORBA::Environment &ACE_TRY_ENV)
+Server::start_testing (TAO_ENV_SINGLE_ARG_DECL)
 {
   Tests::ITERATOR iterator (this->tests_);
   while (!iterator.done ())
@@ -549,7 +549,7 @@ Server::start_testing (CORBA::Environment &ACE_TRY_ENV)
       if (test->servant_->client_propagated ())
         {
           CORBA::Short current_thread_priority =
-            this->current_->the_priority (ACE_TRY_ENV);
+            this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (current_thread_priority == default_thread_priority)
@@ -558,7 +558,7 @@ Server::start_testing (CORBA::Environment &ACE_TRY_ENV)
             test->servant_->invocation_lane (1);
         }
 
-      test->object_->start (ACE_TRY_ENV);
+      test->object_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       iterator.advance ();
@@ -566,29 +566,29 @@ Server::start_testing (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-Server::test (CORBA::Environment &ACE_TRY_ENV)
+Server::test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->start_testing (ACE_TRY_ENV);
+  this->start_testing (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\n*** Changing priority to be higher ***\n\n"));
 
-  this->current_->the_priority (default_thread_priority + 1,
-                                ACE_TRY_ENV);
+  this->current_->the_priority (default_thread_priority + 1
+                                TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->start_testing (ACE_TRY_ENV);
+  this->start_testing (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Server::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Server::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->shutdown (1, ACE_TRY_ENV);
+  this->orb_->shutdown (1 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->destroy (ACE_TRY_ENV);
+  this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -598,30 +598,30 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       Server server (argc,
-                     argv,
-                     ACE_TRY_ENV);
+                     argv
+                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.create_servant_in_root_poa (ACE_TRY_ENV);
+      server.create_servant_in_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.create_poa_and_servant_with_tp_policy (ACE_TRY_ENV);
+      server.create_poa_and_servant_with_tp_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_client_propagated_poa",
-                                                               RTCORBA::CLIENT_PROPAGATED,
-                                                               ACE_TRY_ENV);
+                                                               RTCORBA::CLIENT_PROPAGATED
+                                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_server_declared_poa",
-                                                               RTCORBA::SERVER_DECLARED,
-                                                               ACE_TRY_ENV);
+                                                               RTCORBA::SERVER_DECLARED
+                                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test (ACE_TRY_ENV);
+      server.test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.shutdown (ACE_TRY_ENV);
+      server.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index a66be2852ec..9ed5a011b1a 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -43,8 +43,8 @@ parse_args (int argc, char *argv[])
 }
 
 RTCORBA::ThreadpoolId
-create_threadpool (RTCORBA::RTORB_ptr rt_orb,
-                   CORBA_Environment &ACE_TRY_ENV)
+create_threadpool (RTCORBA::RTORB_ptr rt_orb
+                   TAO_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolId id =
     rt_orb->create_threadpool (stacksize,
@@ -53,16 +53,16 @@ create_threadpool (RTCORBA::RTORB_ptr rt_orb,
                                default_thread_priority,
                                allow_request_buffering,
                                max_buffered_requests,
-                               max_request_buffer_size,
-                               ACE_TRY_ENV);
+                               max_request_buffer_size
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return id;
 }
 
 RTCORBA::ThreadpoolId
-create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb,
-                              CORBA_Environment &ACE_TRY_ENV)
+create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
+                              TAO_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes (2);
   lanes.length (2);
@@ -81,8 +81,8 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb,
                                           allow_borrowing,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size,
-                                          ACE_TRY_ENV);
+                                          max_request_buffer_size
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return id;
@@ -96,32 +96,32 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -135,25 +135,25 @@ main (int argc, char *argv[])
            ++i)
         {
           RTCORBA::ThreadpoolId id =
-            create_threadpool (rt_orb.in (),
-                               ACE_TRY_ENV);
+            create_threadpool (rt_orb.in ()
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          rt_orb->destroy_threadpool (id,
-                                      ACE_TRY_ENV);
+          rt_orb->destroy_threadpool (id
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           id =
-            create_threadpool_with_lanes (rt_orb.in (),
-                                          ACE_TRY_ENV);
+            create_threadpool_with_lanes (rt_orb.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          rt_orb->destroy_threadpool (id,
-                                      ACE_TRY_ENV);
+          rt_orb->destroy_threadpool (id
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index daf081c5e77..924ea8c69de 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -63,29 +63,29 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // PolicyCurrent.
-      object = orb->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 1;
 
       // Test object.
-      object = orb->string_to_object (ior, ACE_TRY_ENV);
+      object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server = Test::_narrow (object.in (), ACE_TRY_ENV);
+      Test_var server = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server.in (), "server") == -1)
         return 1;
@@ -107,21 +107,21 @@ main (int argc, char *argv[])
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 1\n"));
 
       CORBA::PolicyList_var pols;
-      int status = server->_validate_connection (pols.out (),
-                                                 ACE_TRY_ENV);
+      int status = server->_validate_connection (pols.out ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!status)
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
       // NO new connections should get established.
       ACE_DEBUG ((LM_DEBUG,
                   "\n     Test 2\n"));
-      server->test_method (ACE_TRY_ENV);
+      server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test 3: Check that <validate_connection> detects policy
@@ -149,17 +149,17 @@ main (int argc, char *argv[])
 
       protocols[0].protocol_type = TAO_TAG_UIOP_PROFILE;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      status = server->_validate_connection (pols.out (),
-                                             ACE_TRY_ENV);
+      status = server->_validate_connection (pols.out ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status)
@@ -187,15 +187,15 @@ main (int argc, char *argv[])
                   "\n  Testing over - shutting down\n"));
       protocols[0].protocol_type = TAO_TAG_SHMEM_PROFILE;
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index a65ad7ebd74..ea30d8e4266 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -17,10 +17,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Environment&)
+  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -34,7 +34,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Environment &/* ACE_TRY_ENV */)
+Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -42,10 +42,10 @@ Test_i::test_method (CORBA::Environment &/* ACE_TRY_ENV */)
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -95,23 +95,23 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename,
-               CORBA::Environment &ACE_TRY_ENV)
+               const char *filename
+               TAO_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl, ACE_TRY_ENV);
+    poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in (), ACE_TRY_ENV);
+    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -148,17 +148,17 @@ main (int argc, char *argv[])
 
       // RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant.
@@ -169,17 +169,17 @@ main (int argc, char *argv[])
       result = create_object (root_poa.in (),
                               orb.in (),
                               &server_impl,
-                              ior_output_file,
-                              ACE_TRY_ENV);
+                              ior_output_file
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index c55f59580c5..556c5fa5b20 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -91,13 +91,13 @@ Worker_Thread::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->current_->the_priority (this->priority_,
-                                    ACE_TRY_ENV);
+      this->current_->the_priority (this->priority_
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < iterations; i++)
         {
-          this->test_->method (ACE_TRY_ENV);
+          this->test_->method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -122,8 +122,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -132,47 +132,47 @@ main (int argc, char **argv)
         return result;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      current->the_priority (0,
-                             ACE_TRY_ENV);
+      current->the_priority (0
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->string_to_object (ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
-        test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Short_Array priorities;
@@ -190,15 +190,15 @@ main (int argc, char **argv)
         get_priority_bands ("client",
                             bands_file,
                             rt_orb.in (),
-                            policies,
-                            ACE_TRY_ENV);
+                            policies
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       u_long i = 0;
@@ -244,7 +244,7 @@ main (int argc, char **argv)
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_TRY_ENV);
+          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/readers.cpp b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
index f596ac6908e..c5f1b31b73f 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
@@ -9,8 +9,8 @@ int
 get_priority_bands (const char *test_type,
                     const char *bands_file,
                     RTCORBA::RTORB_ptr rt_orb,
-                    CORBA::PolicyList &policies,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::PolicyList &policies
+                    TAO_ENV_ARG_DECL)
 {
   //
   // Read bands from a file.
@@ -89,8 +89,8 @@ get_priority_bands (const char *test_type,
               "\n\n"));
 
   CORBA::Policy_var banded_connection_policy =
-    rt_orb->create_priority_banded_connection_policy (bands,
-                                                      ACE_TRY_ENV);
+    rt_orb->create_priority_banded_connection_policy (bands
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policies.length (policies.length () + 1);
@@ -187,8 +187,8 @@ get_priority_lanes (const char *test_type,
                     CORBA::ULong max_buffered_requests,
                     CORBA::ULong max_request_buffer_size,
                     CORBA::Boolean allow_borrowing,
-                    CORBA::PolicyList &policies,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::PolicyList &policies
+                    TAO_ENV_ARG_DECL)
 {
   Short_Array priorities;
   int result =
@@ -218,13 +218,13 @@ get_priority_lanes (const char *test_type,
                                           allow_borrowing,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size,
-                                          ACE_TRY_ENV);
+                                          max_request_buffer_size
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Policy_var threadpool_policy =
-    rt_orb->create_threadpool_policy (threadpool_id,
-                                      ACE_TRY_ENV);
+    rt_orb->create_threadpool_policy (threadpool_id
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policies.length (policies.length () + 1);
@@ -244,8 +244,8 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes,
                                    CORBA::ULong max_buffered_requests,
                                    CORBA::ULong max_request_buffer_size,
                                    CORBA::Boolean allow_borrowing,
-                                   CORBA::PolicyList &policies,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::PolicyList &policies
+                                   TAO_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes;
   lanes.length (number_of_lanes);
@@ -299,20 +299,20 @@ get_auto_priority_lanes_and_bands (CORBA::ULong number_of_lanes,
                                           allow_borrowing,
                                           allow_request_buffering,
                                           max_buffered_requests,
-                                          max_request_buffer_size,
-                                          ACE_TRY_ENV);
+                                          max_request_buffer_size
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
-    rt_orb->create_priority_banded_connection_policy (bands,
-                                                      ACE_TRY_ENV);
+    rt_orb->create_priority_banded_connection_policy (bands
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
-    rt_orb->create_threadpool_policy (threadpool_id,
-                                      ACE_TRY_ENV);
+    rt_orb->create_threadpool_policy (threadpool_id
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 94a8bd5b96d..2f4a26e031b 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -14,13 +14,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (CORBA::Environment &ACE_TRY_ENV)
+  void method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -36,7 +36,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (CORBA::Environment &)
+test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -44,19 +44,19 @@ test_i::method (CORBA::Environment &)
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -108,16 +108,16 @@ parse_args (int argc, char **argv)
 static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
-                    const char *filename,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const char *filename
+                    TAO_ENV_ARG_DECL)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
-    orb->object_to_string (object,
-                           ACE_TRY_ENV);
+    orb->object_to_string (object
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   u_int result = 0;
@@ -144,18 +144,18 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -164,17 +164,17 @@ main (int argc, char **argv)
         return result;
 
       object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies;
@@ -183,8 +183,8 @@ main (int argc, char **argv)
         get_priority_bands ("server",
                             bands_file,
                             rt_orb.in (),
-                            policies,
-                            ACE_TRY_ENV);
+                            policies
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
@@ -200,22 +200,22 @@ main (int argc, char **argv)
                             max_buffered_requests,
                             max_request_buffer_size,
                             allow_borrowing,
-                            policies,
-                            ACE_TRY_ENV);
+                            policies
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
       CORBA::Policy_var priority_model_policy =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0,
-                                              ACE_TRY_ENV);
+                                              0
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Implicit_activation policy.
       CORBA::Policy_var implicit_activation_policy =
-        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                     ACE_TRY_ENV);
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies.length (policies.length () + 1);
@@ -229,8 +229,8 @@ main (int argc, char **argv)
       PortableServer::POA_var poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i *servant = 0;
@@ -243,22 +243,22 @@ main (int argc, char **argv)
       PortableServer::ServantBase_var safe_servant (servant);
 
       test_var test =
-        servant->_this (ACE_TRY_ENV);
+        servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       write_iors_to_file (test.in (),
                           orb.in (),
-                          ior,
-                          ACE_TRY_ENV);
+                          ior
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index 14b94dc9382..8b2e6eb4110 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -151,7 +151,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -160,12 +160,12 @@ main (int argc, char *argv[])
 
       // Priority Mapping Manager.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PriorityMappingManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PriorityMappingManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (mapping_manager.in (), "Mapping Manager") == -1)
         return 1;
@@ -175,19 +175,19 @@ main (int argc, char *argv[])
 
       // RTCurrent.
       object =
-        orb->resolve_initial_references ("RTCurrent", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (), ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (current.in (), "RTCurrent") == -1)
         return 1;
 
       // Obtain Test object reference.
       object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server = Test::_narrow (object.in (), ACE_TRY_ENV);
+      Test_var server = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server.in (), "Test object") == -1)
         return 1;
@@ -195,19 +195,19 @@ main (int argc, char *argv[])
       // Check that test object is configured with CLIENT_PROPAGATED
       // PriorityModelPolicy.
       CORBA::Policy_var policy =
-        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
-                             ACE_TRY_ENV);
+        server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityModelPolicy_var priority_policy =
-        RTCORBA::PriorityModelPolicy::_narrow (policy.in (), ACE_TRY_ENV);
+        RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1)
         return 1;
 
       RTCORBA::PriorityModel priority_model =
-        priority_policy->priority_model (ACE_TRY_ENV);
+        priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (priority_model != RTCORBA::CLIENT_PROPAGATED)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -264,9 +264,9 @@ main (int argc, char *argv[])
 
       // Testing over.  Shut down the server.
       ACE_DEBUG ((LM_DEBUG, "Client threads finished\n"));
-      current->the_priority (priority1, ACE_TRY_ENV);
+      current->the_priority (priority1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -299,21 +299,21 @@ Worker_Thread::svc (void)
     {
       // RTORB.
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 0;
 
       // PolicyCurrent.
       object =
-        this->orb_->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
@@ -331,13 +331,13 @@ Worker_Thread::svc (void)
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_client_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_client_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for other threads.
@@ -346,7 +346,7 @@ Worker_Thread::svc (void)
       for (int i = 0; i < iterations; ++i)
         {
           // Invoke method.
-          this->server_->test_method (ACE_TRY_ENV);
+          this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 9a0ca3232bc..873bdf1165a 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -16,10 +16,10 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (CORBA::Environment&)
+  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -33,17 +33,17 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Environment& /* ACE_TRY_ENV */)
+Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "test_method invoked\n"));
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -100,7 +100,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -109,27 +109,27 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // RootPOA.
       object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA with CLIENT_PROPAGATED PriorityModelPolicy.
@@ -137,32 +137,32 @@ main (int argc, char *argv[])
       poa_policy_list.length (1);
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              0,
-                                              ACE_TRY_ENV);
+                                              0
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list,
-                              ACE_TRY_ENV);
+                              poa_policy_list
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create object.
       Test_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        child_poa->activate_object (&server_impl, ACE_TRY_ENV);
+        child_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
-        child_poa->id_to_reference (id.in (),
-                                    ACE_TRY_ENV);
+        child_poa->id_to_reference (id.in ()
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n\n", ior.in ()));
@@ -180,11 +180,11 @@ main (int argc, char *argv[])
         }
 
       // Activate POA manager.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start ORB event loop.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index 7f30a09d190..e8c7cadba07 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -30,20 +30,20 @@ test_multiple_orbs (const char *test_name,
           orbs[i] =
             CORBA::ORB_init (argc,
                              argv,
-                             name,
-                             ACE_TRY_ENV);
+                             name
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (rt_orb)
             {
               CORBA::Object_var object =
-                orbs[i]->resolve_initial_references ("RTORB",
-                                                     ACE_TRY_ENV);
+                orbs[i]->resolve_initial_references ("RTORB"
+                                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               rt_orbs[i] =
-                RTCORBA::RTORB::_narrow (object.in (),
-                                         ACE_TRY_ENV);
+                RTCORBA::RTORB::_narrow (object.in ()
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_ASSERT (rt_orbs[i].in () != RTCORBA::RTORB::_nil ());
@@ -56,7 +56,7 @@ test_multiple_orbs (const char *test_name,
                i < iterations;
                ++i)
             {
-              orbs[i]->destroy (ACE_TRY_ENV);
+              orbs[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 96fe92a903d..3affdc5150b 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -57,8 +57,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -67,24 +67,24 @@ main (int argc, char **argv)
         return result;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
-        test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < iterations; i++)
         {
-          test->method (ACE_TRY_ENV);
+          test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_TRY_ENV);
+          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index 818330b693e..c4bf7b418d1 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -12,13 +12,13 @@ public:
   test_i (CORBA::ORB_ptr orb,
           PortableServer::POA_ptr poa);
 
-  void method (CORBA::Environment &ACE_TRY_ENV)
+  void method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -34,7 +34,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 void
-test_i::method (CORBA::Environment &)
+test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -42,19 +42,19 @@ test_i::method (CORBA::Environment &)
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -111,16 +111,16 @@ parse_args (int argc, char *argv[])
 static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
-                    const char *filename,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const char *filename
+                    TAO_ENV_ARG_DECL)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
-    orb->object_to_string (object,
-                           ACE_TRY_ENV);
+    orb->object_to_string (object
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (debug)
@@ -143,19 +143,19 @@ write_iors_to_file (CORBA::Object_ptr object,
 void
 create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
                                                PortableServer::POA_ptr root_poa,
-                                               PortableServer::POAManager_ptr poa_manager,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               PortableServer::POAManager_ptr poa_manager
+                                               TAO_ENV_ARG_DECL)
 {
   CORBA::PolicyList policies;
 
   CORBA::Policy_var implicit_activation_policy =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                 ACE_TRY_ENV);
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var lifespan_policy =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                      ACE_TRY_ENV);
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies.length (policies.length () + 1);
@@ -169,8 +169,8 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
   PortableServer::POA_var poa =
     root_poa->create_POA ("persistent_child",
                           poa_manager,
-                          policies,
-                          ACE_TRY_ENV);
+                          policies
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -183,13 +183,13 @@ create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       orb,
-                      persistent_ior,
-                      ACE_TRY_ENV);
+                      persistent_ior
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -197,8 +197,8 @@ void
 create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                                        RTCORBA::RTORB_ptr rt_orb,
                                        PortableServer::POA_ptr root_poa,
-                                       PortableServer::POAManager_ptr poa_manager,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       PortableServer::POAManager_ptr poa_manager
+                                       TAO_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     rt_orb->create_threadpool (stacksize,
@@ -207,18 +207,18 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
                                default_thread_priority,
                                allow_request_buffering,
                                max_buffered_requests,
-                               max_request_buffer_size,
-                               ACE_TRY_ENV);
+                               max_request_buffer_size
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
-    rt_orb->create_threadpool_policy (threadpool_id,
-                                      ACE_TRY_ENV);
+    rt_orb->create_threadpool_policy (threadpool_id
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var implicit_activation_policy =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                 ACE_TRY_ENV);
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -234,8 +234,8 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
   PortableServer::POA_var poa =
     root_poa->create_POA ("tp_child",
                           poa_manager,
-                          policies,
-                          ACE_TRY_ENV);
+                          policies
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -248,20 +248,20 @@ create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       orb,
-                      transient_ior,
-                      ACE_TRY_ENV);
+                      transient_ior
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
-                                          PortableServer::POA_ptr root_poa,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          PortableServer::POA_ptr root_poa
+                                          TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -274,18 +274,18 @@ create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
                                    default_thread_priority,
                                    allow_request_buffering,
                                    max_buffered_requests,
-                                   max_request_buffer_size,
-                                   ACE_TRY_ENV);
+                                   max_request_buffer_size
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy =
-        rt_orb->create_threadpool_policy (threadpool_id,
-                                          ACE_TRY_ENV);
+        rt_orb->create_threadpool_policy (threadpool_id
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var lifespan_policy =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       policies.length (policies.length () + 1);
@@ -299,8 +299,8 @@ create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
       PortableServer::POA_var invalid_poa =
         root_poa->create_POA ("invalid",
                               PortableServer::POAManager::_nil (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This next line of code should not run because an exception
@@ -331,8 +331,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -341,68 +341,68 @@ main (int argc, char **argv)
         return result;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poa_and_servant_with_tp_policy (orb.in (),
                                              rt_orb.in (),
                                              root_poa.in  (),
-                                             poa_manager.in (),
-                                             ACE_TRY_ENV);
+                                             poa_manager.in ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poa_and_servant_with_persistent_policy (orb.in (),
                                                      root_poa.in  (),
-                                                     poa_manager.in (),
-                                                     ACE_TRY_ENV);
+                                                     poa_manager.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poa_with_tp_and_persistent_policy (rt_orb.in (),
-                                                root_poa.in  (),
-                                                ACE_TRY_ENV);
+                                                root_poa.in  ()
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index bf74a4cd00e..24688032808 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -64,8 +64,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -93,53 +93,53 @@ main (int argc, char **argv)
         return result;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->string_to_object (ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
-        test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < iterations; i++)
         {
-          current->the_priority (default_thread_priority,
-                                 ACE_TRY_ENV);
+          current->the_priority (default_thread_priority
+                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short priority =
-            test->method (ACE_TRY_ENV);
+            test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (priority != TAO_INVALID_PRIORITY)
             {
-              current->the_priority (priority,
-                                     ACE_TRY_ENV);
+              current->the_priority (priority
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              test->prioritized_method (ACE_TRY_ENV);
+              test->prioritized_method (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_TRY_ENV);
+          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index 6d98f81ab1b..879aa6ccb6e 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -16,16 +16,16 @@ public:
           CORBA::Short server_priority,
           CORBA::Short client_priority);
 
-  CORBA::Short method (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Short method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void prioritized_method (CORBA::Environment &ACE_TRY_ENV)
+  void prioritized_method (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -47,7 +47,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Short
-test_i::method (CORBA::Environment &)
+test_i::method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -57,21 +57,21 @@ test_i::method (CORBA::Environment &)
 }
 
 void
-test_i::prioritized_method (CORBA::Environment &ACE_TRY_ENV)
+test_i::prioritized_method (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTCurrent",
-                                            ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTCurrent"
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (object.in (),
-                               ACE_TRY_ENV);
+    RTCORBA::Current::_narrow (object.in ()
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Short priority =
-    current->the_priority (ACE_TRY_ENV);
+    current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -84,19 +84,19 @@ test_i::prioritized_method (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "test_i::shutdown\n"));
 
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -146,16 +146,16 @@ parse_args (int argc, char **argv)
 static void
 write_iors_to_file (CORBA::Object_ptr object,
                     CORBA::ORB_ptr orb,
-                    const char *filename,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    const char *filename
+                    TAO_ENV_ARG_DECL)
 {
   FILE *file =
     ACE_OS::fopen (filename, "w");
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
-    orb->object_to_string (object,
-                           ACE_TRY_ENV);
+    orb->object_to_string (object
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   u_int result = 0;
@@ -178,87 +178,87 @@ public:
           PortableServer::POA_ptr root_poa,
           PortableServer::POAManager_ptr poa_manager);
 
-  void test_root_poa (CORBA::Environment &ACE_TRY_ENV);
-  void test_child_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_root_poa (TAO_ENV_SINGLE_ARG_DECL);
+  void test_child_poa (TAO_ENV_SINGLE_ARG_DECL);
 
   typedef void (server::*test_function) (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
                                          CORBA::Short client_priority,
-                                         const char *test_name,
-                                         CORBA::Environment &ACE_TRY_ENV);
+                                         const char *test_name
+                                         TAO_ENV_ARG_DECL);
 
   void test_default_pool_poa (CORBA::Short server_priority,
                               CORBA::Short client_priority,
                               server::test_function function,
-                              const char *test_name,
-                              CORBA::Environment &ACE_TRY_ENV);
+                              const char *test_name
+                              TAO_ENV_ARG_DECL);
 
   void test_bands_poa (CORBA::PolicyList &policies,
                        CORBA::Short server_priority,
                        CORBA::Short client_priority,
                        server::test_function function,
-                       const char *test_name,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       const char *test_name
+                       TAO_ENV_ARG_DECL);
 
   void test_no_lanes_poa (CORBA::Short server_priority,
                           CORBA::Short client_priority,
                           server::test_function function,
-                          const char *test_name,
-                          CORBA::Environment &ACE_TRY_ENV);
+                          const char *test_name
+                          TAO_ENV_ARG_DECL);
 
   void test_lanes_poa (CORBA::Short server_priority,
                        CORBA::Short client_priority,
                        server::test_function function,
-                       const char *test_name,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       const char *test_name
+                       TAO_ENV_ARG_DECL);
 
   void test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                             CORBA::Short server_priority,
                                             CORBA::Short client_priority,
-                                            const char *test_name,
-                                            CORBA::Environment &ACE_TRY_ENV);
+                                            const char *test_name
+                                            TAO_ENV_ARG_DECL);
 
   void test_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                          CORBA::Short server_priority,
                                          CORBA::Short client_priority,
-                                         const char *test_name,
-                                         CORBA::Environment &ACE_TRY_ENV);
+                                         const char *test_name
+                                         TAO_ENV_ARG_DECL);
 
   void test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
                                           CORBA::Short server_priority,
                                           CORBA::Short client_priority,
-                                          const char *test_name,
-                                          CORBA::Environment &ACE_TRY_ENV);
+                                          const char *test_name
+                                          TAO_ENV_ARG_DECL);
 
   void test_bands_server_declared_poa (CORBA::PolicyList &policies,
                                        CORBA::Short server_priority,
                                        CORBA::Short client_priority,
-                                       const char *test_name,
-                                       CORBA::Environment &ACE_TRY_ENV);
+                                       const char *test_name
+                                       TAO_ENV_ARG_DECL);
 
-  void test_default_pool_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_default_pool_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_default_pool_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_default_pool_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_no_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
 
-  void test_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -280,7 +280,7 @@ server::server (CORBA::ORB_ptr orb,
 }
 
 void
-server::test_root_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_root_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   test_i *servant = 0;
   ACE_NEW_THROW_EX (servant,
@@ -294,31 +294,31 @@ server::test_root_poa (CORBA::Environment &ACE_TRY_ENV)
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
-                      "root",
-                      ACE_TRY_ENV);
+                      "root"
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_child_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_child_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::PolicyList policies;
   policies.length (1);
   policies[policies.length () - 1] =
-    this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
-                                                        ACE_TRY_ENV);
+    this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
+                                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA ("child",
                                  this->poa_manager_.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -333,13 +333,13 @@ server::test_child_poa (CORBA::Environment &ACE_TRY_ENV)
   PortableServer::ServantBase_var safe_servant (servant);
 
   test_var test =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (test.in (),
                       this->orb_.in (),
-                      "child",
-                      ACE_TRY_ENV);
+                      "child"
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -347,15 +347,15 @@ void
 server::test_default_pool_poa (CORBA::Short server_priority,
                                CORBA::Short client_priority,
                                server::test_function function,
-                               const char *test_name,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const char *test_name
+                               TAO_ENV_ARG_DECL)
 {
   CORBA::PolicyList empty_policies;
   (this->*function) (empty_policies,
                      server_priority,
                      client_priority,
-                     test_name,
-                     ACE_TRY_ENV);
+                     test_name
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -364,8 +364,8 @@ server::test_bands_poa (CORBA::PolicyList &policies,
                         CORBA::Short server_priority,
                         CORBA::Short client_priority,
                         server::test_function function,
-                        const char *test_name,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        const char *test_name
+                        TAO_ENV_ARG_DECL)
 {
   RTCORBA::PriorityBands bands;
   bands.length (3);
@@ -379,15 +379,15 @@ server::test_bands_poa (CORBA::PolicyList &policies,
 
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
-    this->rt_orb_->create_priority_banded_connection_policy (bands,
-                                                             ACE_TRY_ENV);
+    this->rt_orb_->create_priority_banded_connection_policy (bands
+                                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   (this->*function) (policies,
                      server_priority,
                      client_priority,
-                     test_name,
-                     ACE_TRY_ENV);
+                     test_name
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -395,8 +395,8 @@ void
 server::test_no_lanes_poa (CORBA::Short server_priority,
                            CORBA::Short client_priority,
                            server::test_function function,
-                           const char *test_name,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           const char *test_name
+                           TAO_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolId threadpool_id =
     this->rt_orb_->create_threadpool (stacksize,
@@ -405,13 +405,13 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
                                       default_thread_priority,
                                       allow_request_buffering,
                                       max_buffered_requests,
-                                      max_request_buffer_size,
-                                      ACE_TRY_ENV);
+                                      max_request_buffer_size
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id,
-                                             ACE_TRY_ENV);
+    this->rt_orb_->create_threadpool_policy (threadpool_id
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -422,8 +422,8 @@ server::test_no_lanes_poa (CORBA::Short server_priority,
   (this->*function) (policies,
                      server_priority,
                      client_priority,
-                     test_name,
-                     ACE_TRY_ENV);
+                     test_name
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -431,8 +431,8 @@ void
 server::test_lanes_poa (CORBA::Short server_priority,
                         CORBA::Short client_priority,
                         server::test_function function,
-                        const char *test_name,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        const char *test_name
+                        TAO_ENV_ARG_DECL)
 {
   RTCORBA::ThreadpoolLanes lanes;
   lanes.length (3);
@@ -455,13 +455,13 @@ server::test_lanes_poa (CORBA::Short server_priority,
                                                  allow_borrowing,
                                                  allow_request_buffering,
                                                  max_buffered_requests,
-                                                 max_request_buffer_size,
-                                                 ACE_TRY_ENV);
+                                                 max_request_buffer_size
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var threadpool_policy =
-    this->rt_orb_->create_threadpool_policy (threadpool_id,
-                                             ACE_TRY_ENV);
+    this->rt_orb_->create_threadpool_policy (threadpool_id
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policies;
@@ -472,8 +472,8 @@ server::test_lanes_poa (CORBA::Short server_priority,
   (this->*function) (policies,
                      server_priority,
                      client_priority,
-                     test_name,
-                     ACE_TRY_ENV);
+                     test_name
+                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -481,26 +481,26 @@ void
 server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                              CORBA::Short server_priority,
                                              CORBA::Short client_priority,
-                                             const char *test_name,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             const char *test_name
+                                             TAO_ENV_ARG_DECL)
 {
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                                 default_thread_priority,
-                                                 ACE_TRY_ENV);
+                                                 default_thread_priority
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
-    RTPortableServer::POA::_narrow (poa.in (),
-                                    ACE_TRY_ENV);
+    RTPortableServer::POA::_narrow (poa.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -515,19 +515,19 @@ server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
   PortableServer::ServantBase_var safe_servant (servant);
 
   PortableServer::ObjectId_var id =
-    rt_poa->activate_object (servant,
-                             ACE_TRY_ENV);
+    rt_poa->activate_object (servant
+                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
-    poa->id_to_reference (id.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
-                      test_name,
-                      ACE_TRY_ENV);
+                      test_name
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -535,81 +535,81 @@ void
 server::test_bands_client_propagated_poa (CORBA::PolicyList &policies,
                                           CORBA::Short server_priority,
                                           CORBA::Short client_priority,
-                                          const char *test_name,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          const char *test_name
+                                          TAO_ENV_ARG_DECL)
 {
   this->test_bands_poa (policies,
                         server_priority,
                         client_priority,
                         &server::test_no_bands_client_propagated_poa,
-                        test_name,
-                        ACE_TRY_ENV);
+                        test_name
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
                                &server::test_no_bands_client_propagated_poa,
-                               "default_pool_no_bands_client_propagated",
-                               ACE_TRY_ENV);
+                               "default_pool_no_bands_client_propagated"
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
                            &server::test_no_bands_client_propagated_poa,
-                           "no_lanes_no_bands_client_propagated",
-                           ACE_TRY_ENV);
+                           "no_lanes_no_bands_client_propagated"
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority,
                         &server::test_no_bands_client_propagated_poa,
-                        "lanes_no_bands_client_propagated",
-                        ACE_TRY_ENV);
+                        "lanes_no_bands_client_propagated"
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::client_priority + 1,
                                ::client_priority + 1,
                                &server::test_bands_client_propagated_poa,
-                               "default_pool_bands_client_propagated",
-                               ACE_TRY_ENV);
+                               "default_pool_bands_client_propagated"
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::client_priority - 1,
                            ::client_priority - 1,
                            &server::test_bands_client_propagated_poa,
-                           "no_lanes_bands_client_propagated",
-                           ACE_TRY_ENV);
+                           "no_lanes_bands_client_propagated"
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::client_priority,
                         ::client_priority + 1,
                         &server::test_bands_client_propagated_poa,
-                        "lanes_bands_client_propagated",
-                        ACE_TRY_ENV);
+                        "lanes_bands_client_propagated"
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -618,26 +618,26 @@ void
 server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
                                            CORBA::Short server_priority,
                                            CORBA::Short client_priority,
-                                           const char *test_name,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           const char *test_name
+                                           TAO_ENV_ARG_DECL)
 {
   policies.length (policies.length () + 1);
   policies[policies.length () - 1] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                                 default_thread_priority,
-                                                 ACE_TRY_ENV);
+                                                 default_thread_priority
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
     this->root_poa_->create_POA (test_name,
                                  this->poa_manager_.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTPortableServer::POA_var rt_poa =
-    RTPortableServer::POA::_narrow (poa.in (),
-                                    ACE_TRY_ENV);
+    RTPortableServer::POA::_narrow (poa.in ()
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   test_i *servant = 0;
@@ -653,19 +653,19 @@ server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
 
   PortableServer::ObjectId_var id =
     rt_poa->activate_object_with_priority (servant,
-                                           ::server_priority,
-                                           ACE_TRY_ENV);
+                                           ::server_priority
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
-    poa->id_to_reference (id.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   write_iors_to_file (object.in (),
                       this->orb_.in (),
-                      test_name,
-                      ACE_TRY_ENV);
+                      test_name
+                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -673,81 +673,81 @@ void
 server::test_bands_server_declared_poa (CORBA::PolicyList &policies,
                                         CORBA::Short server_priority,
                                         CORBA::Short client_priority,
-                                        const char *test_name,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const char *test_name
+                                        TAO_ENV_ARG_DECL)
 {
   this->test_bands_poa (policies,
                         server_priority,
                         client_priority,
                         &server::test_no_bands_server_declared_poa,
-                        test_name,
-                        ACE_TRY_ENV);
+                        test_name
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority + 1,
                                &server::test_no_bands_server_declared_poa,
-                               "default_pool_no_bands_server_declared",
-                               ACE_TRY_ENV);
+                               "default_pool_no_bands_server_declared"
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority - 1,
                            &server::test_no_bands_server_declared_poa,
-                           "no_lanes_no_bands_server_declared",
-                           ACE_TRY_ENV);
+                           "no_lanes_no_bands_server_declared"
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority + 1,
                         &server::test_no_bands_server_declared_poa,
-                        "lanes_no_bands_server_declared",
-                        ACE_TRY_ENV);
+                        "lanes_no_bands_server_declared"
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_default_pool_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_default_pool_poa (::server_priority,
                                ::client_priority - 1,
                                &server::test_bands_server_declared_poa,
-                               "default_pool_bands_server_declared",
-                               ACE_TRY_ENV);
+                               "default_pool_bands_server_declared"
+                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_no_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_no_lanes_poa (::server_priority,
                            ::client_priority + 1,
                            &server::test_bands_server_declared_poa,
-                           "no_lanes_bands_server_declared",
-                           ACE_TRY_ENV);
+                           "no_lanes_bands_server_declared"
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server::test_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+server::test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->test_lanes_poa (::server_priority,
                         ::client_priority - 1,
                         &server::test_bands_server_declared_poa,
-                        "lanes_bands_server_declared",
-                        ACE_TRY_ENV);
+                        "lanes_bands_server_declared"
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -763,18 +763,18 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The following sets the current thread to the lowest priority
@@ -797,17 +797,17 @@ main (int argc, char **argv)
         return result;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client_priority =
@@ -822,17 +822,17 @@ main (int argc, char **argv)
         return result;
 
       object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server server (orb.in (),
@@ -840,55 +840,55 @@ main (int argc, char **argv)
                      root_poa.in (),
                      poa_manager.in ());
 
-      server.test_root_poa (ACE_TRY_ENV);
+      server.test_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_child_poa (ACE_TRY_ENV);
+      server.test_child_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_no_bands_client_propagated_poa (ACE_TRY_ENV);
+      server.test_default_pool_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_no_bands_server_declared_poa (ACE_TRY_ENV);
+      server.test_default_pool_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_no_bands_client_propagated_poa (ACE_TRY_ENV);
+      server.test_no_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_no_bands_server_declared_poa (ACE_TRY_ENV);
+      server.test_no_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_no_bands_client_propagated_poa (ACE_TRY_ENV);
+      server.test_lanes_no_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_no_bands_server_declared_poa (ACE_TRY_ENV);
+      server.test_lanes_no_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_bands_client_propagated_poa (ACE_TRY_ENV);
+      server.test_default_pool_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_default_pool_bands_server_declared_poa (ACE_TRY_ENV);
+      server.test_default_pool_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_bands_client_propagated_poa (ACE_TRY_ENV);
+      server.test_no_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_no_lanes_bands_server_declared_poa (ACE_TRY_ENV);
+      server.test_no_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_bands_client_propagated_poa (ACE_TRY_ENV);
+      server.test_lanes_bands_client_propagated_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server.test_lanes_bands_server_declared_poa (ACE_TRY_ENV);
+      server.test_lanes_bands_server_declared_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index 3e03e33daac..9639177547a 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -66,37 +66,37 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // PolicyCurrent.
-      object = orb->resolve_initial_references ("PolicyCurrent",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("PolicyCurrent"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (policy_current.in (), "PolicyCurrent")
           == -1)
         return 1;
 
       // Test object 1.
-      object = orb->string_to_object (ior1, ACE_TRY_ENV);
+      object = orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server1 = Test::_narrow (object.in (), ACE_TRY_ENV);
+      Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return 1;
 
       // Test object 2.
-      object = orb->string_to_object (ior2, ACE_TRY_ENV);
+      object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Test_var server2 = Test::_narrow (object.in (), ACE_TRY_ENV);
+      Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return 1;
@@ -106,34 +106,34 @@ main (int argc, char *argv[])
       // following three.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 1 --> new connection\n"));
-      server1->test_method (ACE_TRY_ENV);
+      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 2 --> use connection from invocation 1\n"));
-      server2->test_method (ACE_TRY_ENV);
+      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 3 --> use connection from invocation 1\n"));
-      server1->test_method (ACE_TRY_ENV);
+      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 4 --> use connection from invocation 1\n"));
-      server2->test_method (ACE_TRY_ENV);
+      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set RTCORBA::PrivateConnectionPolicy on PolicyCurrent.
       CORBA::PolicyList policy_list;
       policy_list.length (1);
       policy_list[0] =
-        rt_orb->create_private_connection_policy (ACE_TRY_ENV);
+        rt_orb->create_private_connection_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
 
       // Make four invocations on test objects again.  This time,
       // since RTCORBA::PrivateConnectionPolicy is set, we expect a
@@ -143,28 +143,28 @@ main (int argc, char *argv[])
       // third, and <server2>'s reused on fourth.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 5 --> new connection\n"));
-      server1->test_method (ACE_TRY_ENV);
+      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 6 --> new connection\n"));
-      server2->test_method (ACE_TRY_ENV);
+      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 7 --> use connection from invocation 5\n"));
-      server1->test_method (ACE_TRY_ENV);
+      server1->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Invocation 8 --> use connection from invocation 6\n"));
-      server2->test_method (ACE_TRY_ENV);
+      server2->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Testing over.  Shut down Server ORB.
       ACE_DEBUG ((LM_DEBUG,
                   "\n  Testing over - shutting down\n"));
-      server1->shutdown (ACE_TRY_ENV);
+      server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 729bfcf46c4..7b8d15d709b 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -15,10 +15,10 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Environment&)
+  void test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -32,7 +32,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Environment &/* ACE_TRY_ENV */)
+Test_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -40,10 +40,10 @@ Test_i::test_method (CORBA::Environment &/* ACE_TRY_ENV */)
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -99,23 +99,23 @@ int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
-               const char *filename,
-               CORBA::Environment &ACE_TRY_ENV)
+               const char *filename
+               TAO_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id =
-    poa->activate_object (server_impl, ACE_TRY_ENV);
+    poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in (), ACE_TRY_ENV);
+    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -152,17 +152,17 @@ main (int argc, char *argv[])
 
       // RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servants.
@@ -174,8 +174,8 @@ main (int argc, char *argv[])
       result = create_object (root_poa.in (),
                               orb.in (),
                               &server_impl1,
-                              ior_output_file1,
-                              ACE_TRY_ENV);
+                              ior_output_file1
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
@@ -183,17 +183,17 @@ main (int argc, char *argv[])
       result = create_object (root_poa.in (),
                               orb.in (),
                               &server_impl2,
-                              ior_output_file2,
-                              ACE_TRY_ENV);
+                              ior_output_file2
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n"));
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index d60948d5a8d..b5db53f4614 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -66,22 +66,22 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
     {
       RTCORBA::Mutex_var my_mutex;
 
-      my_mutex = rt_orb->create_mutex (ACE_TRY_ENV);
+      my_mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->lock (ACE_TRY_ENV);
+      my_mutex->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->unlock (ACE_TRY_ENV);
+      my_mutex->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->lock (ACE_TRY_ENV);
+      my_mutex->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_mutex->unlock (ACE_TRY_ENV);
+      my_mutex->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      rt_orb->destroy_mutex (my_mutex.in (), ACE_TRY_ENV);
+      rt_orb->destroy_mutex (my_mutex.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -109,7 +109,7 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
       CORBA::Boolean created_flag;
 
       larry_mutex1 = rt_orb->create_named_mutex ("larry",
-                                                 created_flag, ACE_TRY_ENV);
+                                                 created_flag TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (created_flag != 1)
@@ -118,8 +118,8 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                           1);
 
       moe_mutex1 = rt_orb->create_named_mutex ("moe",
-                                               created_flag,
-                                               ACE_TRY_ENV);
+                                               created_flag
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (created_flag != 1)
@@ -127,18 +127,18 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                            "ERROR: Expected named mutex moe to be created, but it wasn't\n"),
                           1);
 
-      larry_mutex1->lock (ACE_TRY_ENV);
+      larry_mutex1->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      larry_mutex1->unlock (ACE_TRY_ENV);
+      larry_mutex1->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test creating the mutex a second time
       {
         RTCORBA::Mutex_var larry_mutex2;
         larry_mutex2 = rt_orb->create_named_mutex ("larry",
-                                                   created_flag,
-                                                   ACE_TRY_ENV);
+                                                   created_flag
+                                                   TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (created_flag != 0)
@@ -153,18 +153,18 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             1);
 
-        larry_mutex2->lock (ACE_TRY_ENV);
+        larry_mutex2->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        larry_mutex2->unlock (ACE_TRY_ENV);
+        larry_mutex2->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
       // test opening the mutex
       {
         RTCORBA::Mutex_var larry_mutex3;
-        larry_mutex3 = rt_orb->open_named_mutex ("larry",
-                                                 ACE_TRY_ENV);
+        larry_mutex3 = rt_orb->open_named_mutex ("larry"
+                                                 TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // test the pointers...
@@ -174,24 +174,24 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
                              "ERROR: Should have gotten the same mutex, but didn't\n"),
                             1);
 
-        larry_mutex3->lock (ACE_TRY_ENV);
+        larry_mutex3->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        larry_mutex3->unlock (ACE_TRY_ENV);
+        larry_mutex3->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
       // Make sure that nothing has been broken behind the scenes.
-      larry_mutex1->lock (ACE_TRY_ENV);
+      larry_mutex1->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      larry_mutex1->unlock (ACE_TRY_ENV);
+      larry_mutex1->unlock (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      rt_orb->destroy_mutex (larry_mutex1.in (), ACE_TRY_ENV);
+      rt_orb->destroy_mutex (larry_mutex1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      rt_orb->destroy_mutex (moe_mutex1.in (), ACE_TRY_ENV);
+      rt_orb->destroy_mutex (moe_mutex1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -216,7 +216,7 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb)
     {
       RTCORBA::Mutex_var larry_mutex1;
 
-      larry_mutex1 = rt_orb->open_named_mutex ("larry", ACE_TRY_ENV);
+      larry_mutex1 = rt_orb->open_named_mutex ("larry" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -340,7 +340,7 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb)
 
   ACE_TRY_NEW_ENV
     {
-      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_TRY_ENV);
+      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_data.mutex = mutex;
@@ -385,7 +385,7 @@ mutex_test_try_lock_thread (void *args)
     {
       // check that try_lock (0) returns false
       ACE_DEBUG ((LM_DEBUG,"attempting try_lock (0) - expect failure (but no exceptions) \n"));
-      result = mutex->try_lock (0u, ACE_TRY_ENV);
+      result = mutex->try_lock (0u TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result)
@@ -405,7 +405,7 @@ mutex_test_try_lock_thread (void *args)
                       "attempting try_lock (5 sec) - expect failure after 5 secs (but no exceptions)\n"));
 
           timer.start ();
-          result = mutex->try_lock (50000000u /*5sec*/,ACE_TRY_ENV);
+          result = mutex->try_lock (50000000u /*5sec*/ TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           timer.stop ();
 
@@ -456,12 +456,12 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
 
   ACE_TRY_NEW_ENV
     {
-      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (ACE_TRY_ENV);
+      RTCORBA::Mutex_ptr mutex = rt_orb->create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test out try_lock and keep the lock so that the spawned task
       // can test out try_lock failure cases
-      result = mutex->try_lock (0u, ACE_TRY_ENV);
+      result = mutex->try_lock (0u TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (!result)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -506,7 +506,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -515,10 +515,10 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 2cb28785ec2..fdb42ab30ed 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -50,23 +50,23 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 }
 
 CORBA::Short
-check_policy (Test_ptr server,
-              CORBA::Environment &ACE_TRY_ENV)
+check_policy (Test_ptr server
+              TAO_ENV_ARG_DECL)
 {
   CORBA::Policy_var policy =
-    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
-                         ACE_TRY_ENV);
+    server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   RTCORBA::PriorityModelPolicy_var priority_policy =
-    RTCORBA::PriorityModelPolicy::_narrow (policy.in (), ACE_TRY_ENV);
+    RTCORBA::PriorityModelPolicy::_narrow (policy.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1)
     return -1;
 
   RTCORBA::PriorityModel priority_model =
-    priority_policy->priority_model (ACE_TRY_ENV);
+    priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (priority_model != RTCORBA::SERVER_DECLARED)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -74,7 +74,7 @@ check_policy (Test_ptr server,
                        "RTCORBA::SERVER_DECLARED!\n"),
                       -1);
 
-  return priority_policy->server_priority (ACE_TRY_ENV);
+  return priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -99,19 +99,19 @@ main (int argc, char *argv[])
 
           // Test object 1.
       CORBA::Object_var object =
-        orb->string_to_object (ior1, ACE_TRY_ENV);
+        orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test_var server1 = Test::_narrow (object.in (), ACE_TRY_ENV);
+      Test_var server1 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server1.in (), "server1") == -1)
         return 1;
 
       // Test object 2.
-      object = orb->string_to_object (ior2, ACE_TRY_ENV);
+      object = orb->string_to_object (ior2 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-          Test_var server2 = Test::_narrow (object.in (), ACE_TRY_ENV);
+          Test_var server2 = Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (server2.in (), "server2") == -1)
         return 1;
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
 
       // Test object 1.
       CORBA::Short server1_priority =
-        check_policy (server1.in (), ACE_TRY_ENV);
+        check_policy (server1.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
           if (server1_priority == -1)
@@ -129,7 +129,7 @@ main (int argc, char *argv[])
 
           // Test object 2.
       CORBA::Short server2_priority =
-        check_policy (server2.in (), ACE_TRY_ENV);
+        check_policy (server2.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (server2_priority == -1)
         return 1;
@@ -137,16 +137,16 @@ main (int argc, char *argv[])
           // Testing: make several invocations on test objects.
       for (int i = 0; i < 5; ++i)
         {
-          server1->test_method (server1_priority, ACE_TRY_ENV);
+          server1->test_method (server1_priority TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          server2->test_method (server2_priority, ACE_TRY_ENV);
+          server2->test_method (server2_priority TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           }
 
       // Testing over. Shut down Server ORB.
-      server1->shutdown (ACE_TRY_ENV);
+      server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index b214fe6b6ee..20fc89252ac 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -15,11 +15,11 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void test_method (CORBA::Short priority,
-                    CORBA::Environment&)
+  void test_method (CORBA::Short priority
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -33,26 +33,26 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::test_method (CORBA::Short priority,
-                     CORBA::Environment& ACE_TRY_ENV)
+Test_i::test_method (CORBA::Short priority
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Use RTCurrent to find out the CORBA priority of the current
   // thread.
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTCurrent" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (obj.in (), ACE_TRY_ENV);
+    RTCORBA::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (obj.in ()))
     ACE_THROW (CORBA::INTERNAL ());
 
   CORBA::Short servant_thread_priority =
-    current->the_priority (ACE_TRY_ENV);
+    current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Print out the info.
@@ -68,10 +68,10 @@ Test_i::test_method (CORBA::Short priority,
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -159,29 +159,29 @@ create_object (RTPortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
                CORBA::Short priority,
-               const char *filename,
-               CORBA::Environment &ACE_TRY_ENV)
+               const char *filename
+               TAO_ENV_ARG_DECL)
 {
   // Register with poa.
   PortableServer::ObjectId_var id;
 
   if (priority > -1)
     id = poa->activate_object_with_priority (server_impl,
-                                             priority,
-                                             ACE_TRY_ENV);
+                                             priority
+                                             TAO_ENV_ARG_PARAMETER);
   else
-    id = poa->activate_object (server_impl, ACE_TRY_ENV);
+    id = poa->activate_object (server_impl TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var server =
-    poa->id_to_reference (id.in (),
-                          ACE_TRY_ENV);
+    poa->id_to_reference (id.in ()
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in (), ACE_TRY_ENV);
+    orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
@@ -213,7 +213,7 @@ main (int argc, char *argv[])
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
@@ -222,27 +222,27 @@ main (int argc, char *argv[])
 
       // RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_orb.in (), "RTORB") == -1)
         return 1;
 
       // RootPOA.
       object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (root_poa.in (), "RootPOA") == -1)
         return 1;
 
       // POAManager.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create child POA with SERVER_DECLARED PriorityModelPolicy,
@@ -252,24 +252,24 @@ main (int argc, char *argv[])
       poa_policy_list.length (2);
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
-                                              poa_priority,
-                                              ACE_TRY_ENV);
+                                              poa_priority
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       poa_policy_list[1] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
-                                              ACE_TRY_ENV);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               poa_manager.in (),
-                              poa_policy_list,
-                              ACE_TRY_ENV);
+                              poa_policy_list
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTPortableServer::POA_var rt_poa =
-        RTPortableServer::POA::_narrow (child_poa.in (), ACE_TRY_ENV);
+        RTPortableServer::POA::_narrow (child_poa.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (check_for_nil (rt_poa.in (), "RTPOA") == -1)
         return 1;
@@ -282,7 +282,7 @@ main (int argc, char *argv[])
       int result;
       ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
       result = create_object (rt_poa.in (), orb.in (), &server_impl,
-                              -1, ior_output_file1, ACE_TRY_ENV);
+                              -1, ior_output_file1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
@@ -290,17 +290,17 @@ main (int argc, char *argv[])
       // Create object 2 (override POA's priority).
       ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
       result = create_object (rt_poa.in (), orb.in (), &server_impl,
-                              object_priority, ior_output_file2, ACE_TRY_ENV);
+                              object_priority, ior_output_file2 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return 1;
 
       // Activate POA manager.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start ORB event loop.
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index 78bc5b69407..dfd281c6433 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -39,18 +39,18 @@ main (int argc, char *argv[])
     {
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -62,13 +62,13 @@ main (int argc, char *argv[])
         }
 
       // Make an invocation on the obtained Test object.
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index cd3802e1386..7601a327a51 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -16,7 +16,7 @@ public:
   Test_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -30,12 +30,12 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Received request to shut down the ORB\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 //*************************************************************************
@@ -84,8 +84,8 @@ parse_args (int argc, char *argv[])
 }
 
 int
-check_default_server_protocol (CORBA::ORB_ptr orb,
-                               CORBA::Environment &ACE_TRY_ENV)
+check_default_server_protocol (CORBA::ORB_ptr orb
+                               TAO_ENV_ARG_DECL)
 {
   // Users should never write code like below.
   // It is for testing purposes only! (Unfortunately, there
@@ -94,8 +94,8 @@ check_default_server_protocol (CORBA::ORB_ptr orb,
     orb->orb_core ()->get_default_policies ()->get_policy (RTCORBA::SERVER_PROTOCOL_POLICY_TYPE);
 
   RTCORBA::ServerProtocolPolicy_var policy =
-    RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in (),
-                                            ACE_TRY_ENV);
+    RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in ()
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (policy.in ()))
@@ -104,7 +104,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb,
                        "is missing\n"),
                       -1);
 
-  RTCORBA::ProtocolList_var protocols = policy->protocols (ACE_TRY_ENV);
+  RTCORBA::ProtocolList_var protocols = policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -125,8 +125,8 @@ check_default_server_protocol (CORBA::ORB_ptr orb,
         {
           RTCORBA::TCPProtocolProperties_var tcp_properties =
             RTCORBA::TCPProtocolProperties::_narrow (properties.in
-                                                     (),
-                                                     ACE_TRY_ENV);
+                                                     ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           if (!CORBA::is_nil (tcp_properties.in ()))
@@ -143,8 +143,8 @@ check_default_server_protocol (CORBA::ORB_ptr orb,
         {
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
             RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in
-                                                            (),
-                                                            ACE_TRY_ENV);
+                                                            ()
+                                                            TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
 
@@ -169,18 +169,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -189,18 +189,18 @@ main (int argc, char *argv[])
                           -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("RTORB" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check ORB default ServerProtocol configuration.
-      int result = check_default_server_protocol (orb.in (),
-                                                  ACE_TRY_ENV);
+      int result = check_default_server_protocol (orb.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return 1;
@@ -221,8 +221,8 @@ main (int argc, char *argv[])
       CORBA::PolicyList poa_policy_list;
       poa_policy_list.length (1);
       poa_policy_list[0] =
-        rt_orb->create_server_protocol_policy (protocols,
-                                               ACE_TRY_ENV);
+        rt_orb->create_server_protocol_policy (protocols
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa;
@@ -232,8 +232,8 @@ main (int argc, char *argv[])
           poa =
             root_poa->create_POA ("Child_POA",
                                   poa_manager.in (),
-                                  poa_policy_list,
-                                  ACE_TRY_ENV);
+                                  poa_policy_list
+                                  TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -246,17 +246,17 @@ main (int argc, char *argv[])
       Test_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
-        poa->activate_object (&server_impl, ACE_TRY_ENV);
+        poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
-        poa->id_to_reference (id.in (),
-                              ACE_TRY_ENV);
+        poa->id_to_reference (id.in ()
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print Object IOR.
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "\nActivated as <%s>\n\n", ior.in ()));
@@ -274,10 +274,10 @@ main (int argc, char *argv[])
         }
 
       // Run ORB Event loop.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index 9921524a61a..0bc45408f53 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -67,11 +67,11 @@ main (int argc, char *argv[])
       return result;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
-        test::_narrow (object.in (), ACE_TRY_ENV);
+        test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       pid_t pid =
@@ -81,8 +81,8 @@ main (int argc, char *argv[])
         {
           CORBA::Long r =
             test->method (pid,
-                          i,
-                          ACE_TRY_ENV);
+                          i
+                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (r == i);
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_TRY_ENV);
+          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 0d50b2c58b7..20645be64e4 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -57,12 +57,12 @@ parse_args (int argc, char *argv[])
 
 int
 write_ior_to_file (CORBA::ORB_ptr orb,
-                   test_ptr test,
-                   CORBA_Environment &ACE_TRY_ENV)
+                   test_ptr test
+                   TAO_ENV_ARG_DECL)
 {
   CORBA::String_var ior =
-    orb->object_to_string (test,
-                           ACE_TRY_ENV);
+    orb->object_to_string (test
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   char filename[BUFSIZ];
@@ -96,8 +96,8 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
                                  PortableServer::POAManager_ptr poa_manager,
                                  PortableServer::POA_ptr root_poa,
                                  CORBA::ORB_ptr orb,
-                                 RTCORBA::RTORB_ptr rt_orb,
-                                 CORBA_Environment &ACE_TRY_ENV)
+                                 RTCORBA::RTORB_ptr rt_orb
+                                 TAO_ENV_ARG_DECL)
 {
   // Policies for the firstPOA to be created.
   CORBA::PolicyList policies (3); policies.length (3);
@@ -105,8 +105,8 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Implicit_activation policy.
   policies[0] =
     root_poa->create_implicit_activation_policy
-      (PortableServer::IMPLICIT_ACTIVATION,
-       ACE_TRY_ENV);
+      (PortableServer::IMPLICIT_ACTIVATION
+       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Thread pool policy.
@@ -116,16 +116,16 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   // Priority Model policy.
   policies[2] =
     rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0,
-                                          ACE_TRY_ENV);
+                                          0
+                                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create the POA under the RootPOA.
   PortableServer::POA_var poa =
     root_poa->create_POA (poa_name,
                           poa_manager,
-                          policies,
-                          ACE_TRY_ENV);
+                          policies
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Creation of POAs is over. Destroy the Policy objects.
@@ -133,7 +133,7 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (ACE_TRY_ENV);
+      policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -146,13 +146,13 @@ create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
   ACE_UNUSED_ARG (safe_servant);
 
   test_var test =
-    servant->_this (ACE_TRY_ENV);
+    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int result =
     write_ior_to_file (orb,
-                       test.in (),
-                       ACE_TRY_ENV);
+                       test.in ()
+                       TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -170,46 +170,46 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Priority default_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -221,19 +221,19 @@ main (int argc, char *argv[])
                       root_poa.in (),
                       nap_time);
       test_var test =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result =
         write_ior_to_file (orb.in (),
-                           test.in (),
-                           ACE_TRY_ENV);
+                           test.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong stacksize = 0;
@@ -248,13 +248,13 @@ main (int argc, char *argv[])
                                    default_thread_priority,
                                    allow_request_buffering,
                                    max_buffered_requests,
-                                   max_request_buffer_size,
-                                   ACE_TRY_ENV);
+                                   max_request_buffer_size
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_1 =
-        rt_orb->create_threadpool_policy (threadpool_id_1,
-                                          ACE_TRY_ENV);
+        rt_orb->create_threadpool_policy (threadpool_id_1
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean allow_borrowing = 0;
@@ -275,13 +275,13 @@ main (int argc, char *argv[])
                                               allow_borrowing,
                                               allow_request_buffering,
                                               max_buffered_requests,
-                                              max_request_buffer_size,
-                                              ACE_TRY_ENV);
+                                              max_request_buffer_size
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Policy_var threadpool_policy_2 =
-        rt_orb->create_threadpool_policy (threadpool_id_2,
-                                          ACE_TRY_ENV);
+        rt_orb->create_threadpool_policy (threadpool_id_2
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result =
@@ -290,8 +290,8 @@ main (int argc, char *argv[])
                                          poa_manager.in (),
                                          root_poa.in (),
                                          orb.in (),
-                                         rt_orb.in (),
-                                         ACE_TRY_ENV);
+                                         rt_orb.in ()
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
@@ -302,16 +302,16 @@ main (int argc, char *argv[])
                                          poa_manager.in (),
                                          root_poa.in (),
                                          orb.in (),
-                                         rt_orb.in (),
-                                         ACE_TRY_ENV);
+                                         rt_orb.in ()
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result != 0)
         return result;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index 0597652d87d..03c8b5b52b4 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -18,8 +18,8 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 CORBA::Long
 test_i::method (CORBA::Long client_id,
-                CORBA::Long iteration,
-                CORBA::Environment &)
+                CORBA::Long iteration
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ORB_Core's TSS resources.
@@ -49,16 +49,16 @@ test_i::method (CORBA::Long client_id,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index c5d058eb758..5fed9fa6379 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -22,16 +22,16 @@ public:
 
   /// Test method.
   CORBA::Long method (CORBA::Long client_id,
-                      CORBA::Long iteration,
-                      CORBA::Environment &)
+                      CORBA::Long iteration
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the server.
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Our POA.
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// ORB.
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index d737813d0a6..0de4f50137e 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -12,29 +12,29 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Oneway_Receiver::raise_no_permission (CORBA::Environment &ACE_TRY_ENV)
+Oneway_Receiver::raise_no_permission (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::NO_PERMISSION ());
 }
 
 void
-Oneway_Receiver::destroy (CORBA::Environment &ACE_TRY_ENV)
+Oneway_Receiver::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
+  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 Test::Shutdown_Helper_ptr
-Oneway_Receiver::get_shutdown_helper (CORBA::Environment &ACE_TRY_ENV)
+Oneway_Receiver::get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Shutdown_Helper *shutdown_helper;
@@ -45,5 +45,5 @@ Oneway_Receiver::get_shutdown_helper (CORBA::Environment &ACE_TRY_ENV)
 
   PortableServer::ServantBase_var transfer_ownership(shutdown_helper);
 
-  return shutdown_helper->_this (ACE_TRY_ENV);
+  return shutdown_helper->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index 733c7107c99..8c5e8b0781e 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -11,8 +11,8 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
 }
 
 void
-Shutdown_Helper::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Shutdown_Helper::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index a33b230801b..ea3ca82198a 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -31,12 +31,12 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'n':
         test_sync_none = 1;
@@ -58,7 +58,7 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
+                           "-k <ior> "
                            "-n -t -s -r "
                            "\n",
                            argv [0]),
@@ -68,14 +68,14 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver,
-                                CORBA::Environment &ACE_TRY_ENV);
-void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver,
-                                CORBA::Environment &ACE_TRY_ENV);
-void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver,
-                                   CORBA::Environment &ACE_TRY_ENV);
-void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver,
-                         CORBA::Environment &ACE_TRY_ENV);
+void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
+                                TAO_ENV_ARG_DECL);
+void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
+                                TAO_ENV_ARG_DECL);
+void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver
+                                   TAO_ENV_ARG_DECL);
+void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver
+                         TAO_ENV_ARG_DECL);
 
 
 int
@@ -84,18 +84,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Receiver_var oneway_receiver =
-        Test::Oneway_Receiver::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Oneway_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_receiver.in ()))
@@ -109,29 +109,29 @@ main (int argc, char *argv[])
       if (test_sync_with_target)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TARGET\n"));
-          run_test_sync_with_target (oneway_receiver.in (),
-                                     ACE_TRY_ENV);
+          run_test_sync_with_target (oneway_receiver.in ()
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (test_sync_with_server)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_SERVER\n"));
-          run_test_sync_with_server (oneway_receiver.in (),
-                                     ACE_TRY_ENV);
+          run_test_sync_with_server (oneway_receiver.in ()
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (test_sync_with_transport)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TRANSPORT\n"));
-          run_test_sync_with_transport (oneway_receiver.in (),
-                                        ACE_TRY_ENV);
+          run_test_sync_with_transport (oneway_receiver.in ()
+                                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_NONE\n"));
-          run_test_sync_none (oneway_receiver.in (),
-                              ACE_TRY_ENV);
+          run_test_sync_none (oneway_receiver.in ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -147,7 +147,7 @@ main (int argc, char *argv[])
                     "ERROR: Mismatched number of calls (%d + %d != %d)\n",
                     successful_calls, failed_calls, iterations));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -162,19 +162,19 @@ main (int argc, char *argv[])
 }
 
 void
-set_sync_scope_policy (Messaging::SyncScope sync_scope,
-                       CORBA::Environment &ACE_TRY_ENV)
+set_sync_scope_policy (Messaging::SyncScope sync_scope
+                       TAO_ENV_ARG_DECL)
 {
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "", ACE_TRY_ENV);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV);
+    orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+    CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (policy_current.in ()))
@@ -188,23 +188,23 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope,
   CORBA::PolicyList policies(1); policies.length (1);
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        scope_as_any,
-                        ACE_TRY_ENV);
+                        scope_as_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+  policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[0]->destroy (ACE_TRY_ENV);
+  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_one_iteration (int i,
                    Test::Oneway_Receiver_ptr oneway_receiver,
-                   Test::Shutdown_Helper_ptr shutdown_helper,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   Test::Shutdown_Helper_ptr shutdown_helper
+                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -212,14 +212,14 @@ run_one_iteration (int i,
         {
           ACE_DEBUG ((LM_DEBUG, "Destroying object\n"));
           server_status = DESTROYED;
-          oneway_receiver->destroy (ACE_TRY_ENV);
+          oneway_receiver->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (i == 2 * iterations / 3)
         {
           ACE_DEBUG ((LM_DEBUG, "Shutting down server process\n"));
           server_status = SHUTDOWN;
-          shutdown_helper->shutdown (ACE_TRY_ENV);
+          shutdown_helper->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -228,7 +228,7 @@ run_one_iteration (int i,
     }
   ACE_ENDTRY;
 
-  oneway_receiver->raise_no_permission (ACE_TRY_ENV);
+  oneway_receiver->raise_no_permission (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -242,14 +242,14 @@ call_failed (const CORBA::SystemException &ex)
 }
 
 void
-run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver,
-                           CORBA::Environment &ACE_TRY_ENV)
+run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
+                           TAO_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_TARGET, ACE_TRY_ENV);
+  set_sync_scope_policy (Messaging::SYNC_WITH_TARGET TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (ACE_TRY_ENV);
+    oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   int had_comm_failure = 0;
@@ -257,8 +257,8 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver,
     {
       ACE_TRY
         {
-          run_one_iteration (i, oneway_receiver, shutdown_helper.in (),
-                             ACE_TRY_ENV);
+          run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::NO_PERMISSION, ex)
@@ -299,14 +299,14 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver,
 }
 
 void
-run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver,
-                           CORBA::Environment &ACE_TRY_ENV)
+run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
+                           TAO_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_SERVER, ACE_TRY_ENV);
+  set_sync_scope_policy (Messaging::SYNC_WITH_SERVER TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (ACE_TRY_ENV);
+    oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   int had_comm_failure = 0;
@@ -314,8 +314,8 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver,
     {
       ACE_TRY
         {
-          run_one_iteration (i, oneway_receiver, shutdown_helper.in (),
-                             ACE_TRY_ENV);
+          run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (server_status == DESTROYED
@@ -360,38 +360,38 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver,
 
 /// Helper routine to run the sync_with_transport and sync_none tests.
 void
-run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver,
-                     CORBA::Environment &ACE_TRY_ENV);
+run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
+                     TAO_ENV_ARG_DECL);
 
 void
-run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver,
-                              CORBA::Environment &ACE_TRY_ENV)
+run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver
+                              TAO_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT, ACE_TRY_ENV);
+  set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  run_test_unreliable (oneway_receiver, ACE_TRY_ENV);
+  run_test_unreliable (oneway_receiver TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver,
-                    CORBA::Environment &ACE_TRY_ENV)
+run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver
+                    TAO_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_NONE, ACE_TRY_ENV);
+  set_sync_scope_policy (Messaging::SYNC_NONE TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  run_test_unreliable (oneway_receiver, ACE_TRY_ENV);
+  run_test_unreliable (oneway_receiver TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 
 void
-run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver,
-                     CORBA::Environment &ACE_TRY_ENV)
+run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
+                     TAO_ENV_ARG_DECL)
 {
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (ACE_TRY_ENV);
+    oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   int undetected = 0;
@@ -400,8 +400,8 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver,
     {
       ACE_TRY
         {
-          run_one_iteration (i, oneway_receiver, shutdown_helper.in (),
-                             ACE_TRY_ENV);
+          run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
+                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // A few failures can go undetected...
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index 0fcd864c9d7..2475bfc8d22 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,15 +39,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this (ACE_TRY_ENV);
+        oneway_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (oneway_receiver.in (), ACE_TRY_ENV);
+        orb->object_to_string (oneway_receiver.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,22 +82,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp
index 084c3cb6415..ad640088619 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.cpp
+++ b/TAO/tests/Server_Leaks/Ping_Service.cpp
@@ -11,14 +11,14 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
 }
 
 void
-Ping_Service::ping (CORBA::Environment &)
+Ping_Service::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Ping_Service::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Ping_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index 923e4a11f84..5505a41b60b 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/client.cpp
@@ -18,19 +18,19 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'x':
-	do_shutdown = 1;
-	break;
+        do_shutdown = 1;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
-			   "-x "
+                           "-k <ior> "
+                           "-x "
                            "\n",
                            argv [0]),
                           -1);
@@ -45,18 +45,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Ping_Service_var ping_service =
-        Test::Ping_Service::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Ping_Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ping_service.in ()))
@@ -69,17 +69,17 @@ main (int argc, char *argv[])
 
       for (int i = 0; i != 10; ++i)
         {
-          ping_service->ping (ACE_TRY_ENV);
+          ping_service->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-  
+
       if (do_shutdown)
         {
-          ping_service->shutdown (ACE_TRY_ENV);
+          ping_service->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index e681ec8564a..47e9986ae9c 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,15 +38,15 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(ping_service_impl);
 
       Test::Ping_Service_var ping_service =
-        ping_service_impl->_this (ACE_TRY_ENV);
+        ping_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (ping_service.in (), ACE_TRY_ENV);
+        orb->object_to_string (ping_service.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -81,22 +81,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index 4b424e7e13b..68a1e72872c 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -71,7 +71,7 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -79,8 +79,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -90,13 +90,13 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR,
-                               ACE_TRY_ENV);
+        orb->string_to_object (IOR
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object = test::_narrow (object.in (),
-                                            ACE_TRY_ENV);
+      test_var test_object = test::_narrow (object.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test::data the_data0 (data_bytes);
@@ -118,20 +118,20 @@ main (int argc, char **argv)
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data0,
-                               ACE_TRY_ENV);
+                               the_data0
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data1,
-                               ACE_TRY_ENV);
+                               the_data1
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data2,
-                               ACE_TRY_ENV);
+                               the_data2
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -140,7 +140,7 @@ main (int argc, char **argv)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Sending a shutdown call..\n"));
-          test_object->shutdown (ACE_TRY_ENV);
+          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -150,7 +150,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index b84f0bc46a3..6607db33fdc 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -41,22 +41,22 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 6aa56f3de51..2ee2f038975 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -11,8 +11,8 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::method (CORBA::ULong request_number,
-                const test::data &,
-                CORBA::Environment &)
+                const test::data &
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -27,11 +27,11 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) About to invoke shudown... "));
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h
index 0d5e0887b9e..8f921b977d1 100644
--- a/TAO/tests/Single_Read/test_i.h
+++ b/TAO/tests/Single_Read/test_i.h
@@ -29,11 +29,11 @@ public:
 
   // = The test interface methods.
   void method (CORBA::ULong request_number,
-               const test::data &,
-               CORBA::Environment &)
+               const test::data &
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index 871d79432df..65826c42908 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -8,8 +8,8 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy,
-                                  CORBA::Environment &)
+Smart_Test_Factory::create_proxy (Test_ptr proxy
+                                  TAO_ENV_ARG_DECL_NOT_USED)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -18,7 +18,7 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy,
        ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-   
+
  }
 
 Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
@@ -27,13 +27,13 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 {
 }
 
-CORBA::Short 
-Smart_Test_Proxy::box_prices (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Short
+Smart_Test_Proxy::box_prices (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->price_ == 0)
     {
-      this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (ACE_TRY_ENV);
+      this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return this->price_;
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index 649ccc37f99..5cafabfec5e 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -6,21 +6,19 @@ class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 public:
 
   Smart_Test_Factory (void);
-  
-  virtual Test_ptr create_proxy (Test_ptr proxy,
-                                 CORBA::Environment &env = 
-                                 TAO_default_environment ());
-  // This method will create the smart_proxy.   
+
+  virtual Test_ptr create_proxy (Test_ptr proxy
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  // This method will create the smart_proxy.
 };
 
-class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base 
+class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 {
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short box_prices(CORBA::Environment &ACE_TRY_ENV = 
-                               TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException)); 
+  virtual CORBA::Short box_prices(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // "Smartify" the method call!
 
  private:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 898df5db6f2..f019ad60a01 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -118,16 +118,16 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
        CORBA::Object_var object =
-        orb->string_to_object (ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (register_smart_proxy == 1)
         {
@@ -150,8 +150,8 @@ main (int argc, char *argv[])
         }
 
       Test_var server =
-        Test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        Test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
            // Record current time.
            ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-           price = server->box_prices (ACE_TRY_ENV);
+           price = server->box_prices (TAO_ENV_SINGLE_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
            if (price < 300)
@@ -194,13 +194,13 @@ main (int argc, char *argv[])
 
        marker.dump_stats ("buying tickets ", gsf);
 
-       server->shutdown (ACE_TRY_ENV);
+       server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       /*
 
       Test_var server1 =
-        Test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        Test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
 
       if (CORBA::is_nil (server1.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -223,7 +223,7 @@ main (int argc, char *argv[])
            // Record current time.
            ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-           price1 = server1->box_prices (ACE_TRY_ENV);
+           price1 = server1->box_prices (TAO_ENV_SINGLE_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
            if (price1 < 300)
@@ -243,7 +243,7 @@ main (int argc, char *argv[])
 
        marker1.dump_stats ("buying tickets using a default proxy ", gsf1);
 
-       server1->shutdown (ACE_TRY_ENV);
+       server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       */
     }
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index 55dd4a8b809..9c6f0e15935 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -28,14 +28,14 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short box_prices  (CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Short box_prices  (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long tickets  (CORBA::Short number,
-                        CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Long tickets  (CORBA::Short number
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown  (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown  (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -49,25 +49,25 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i::box_prices (CORBA::Environment &)
+Test_i::box_prices (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125;
 }
 
 CORBA::Long
-Test_i::tickets (CORBA::Short number,
-                 CORBA::Environment &)
+Test_i::tickets (CORBA::Short number
+                 TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125 * number;
 }
 
 void
-Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 static const char *ior_output_file = 0;
@@ -100,7 +100,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -109,35 +109,35 @@ main (int argc, char *argv[])
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "",
-                                            ACE_TRY_ENV);
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var Test_object =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (Test_object.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -157,18 +157,18 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index cfe0ba58e66..a12bd8c64a6 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -22,10 +22,10 @@ Collocation_Test::Collocation_Test (void)
 }
 
 int
-Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
+Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL)
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int result = this->parse_args (argc, argv);
@@ -34,52 +34,52 @@ Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
-    PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+    PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POAManager of RootPOA
   this->poa_manager_ =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
+    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Activate the diamond servant and its base classes under RootPOA.
   PortableServer::ObjectId_var id =
-    this->root_poa_->activate_object (&this->top_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->top_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 //    // We only care about the most derived class here.
-//    this->diamond_obj_ = this->diamond_servant_._this (ACE_TRY_ENV);
+//    this->diamond_obj_ = this->diamond_servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 //    ACE_CHECK_RETURN (-1);
 
   id =
-    this->root_poa_->activate_object (&this->diamond_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->diamond_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We only care about the most derived class here.
-  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in (),
-                                                         ACE_TRY_ENV);
+  this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
-    this->root_poa_->activate_object (&this->left_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->left_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
-    this->root_poa_->activate_object (&this->right_servant_,
-                                      ACE_TRY_ENV);
+    this->root_poa_->activate_object (&this->right_servant_
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::String_var str =
-    this->orb_->object_to_string (this->diamond_obj_.in (),
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (this->diamond_obj_.in ()
+                                  TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n",
@@ -97,45 +97,45 @@ Collocation_Test::parse_args (int argc, char *argv[])
 }
 
 int
-Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV)
+Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Ensure that the smart proxy is the one which is used by registering
   // the user-defined factory. Its necessary to create one on the heap so
   // the lifetime of the factory object can be managed by the framework.
   Smart_Diamond_Top_Factory *factory = 0;
   ACE_NEW_RETURN (factory,
-				  Smart_Diamond_Top_Factory,
-				  -1);
+                                  Smart_Diamond_Top_Factory,
+                                  -1);
 
   Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_, ACE_TRY_ENV);
+    Diamond::Top::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_, ACE_TRY_ENV);
+    Diamond::Left::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_, ACE_TRY_ENV);
+    Diamond::Right::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_, ACE_TRY_ENV);
+    Diamond::Buttom::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::String_var str = top->shape (ACE_TRY_ENV);
+  CORBA::String_var str = top->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ()));
 
-  str = left->shape (ACE_TRY_ENV);
+  str = left->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ()));
 
-  str = right->shape (ACE_TRY_ENV);
+  str = right->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ()));
 
-  str = buttom->shape (ACE_TRY_ENV);
+  str = buttom->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ()));
 
@@ -143,12 +143,12 @@ Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Collocation_Test::run (CORBA::Environment &ACE_TRY_ENV)
+Collocation_Test::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (ACE_TRY_ENV);
+  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->test_narrow (ACE_TRY_ENV);
+  this->test_narrow (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index 110712c0122..5d7a4ff12fc 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -27,17 +27,17 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
-  int init (int argc, char *argv[], CORBA::Environment &);
+  int init (int argc, char *argv[] TAO_ENV_ARG_DECL_NOT_USED);
   // Initializing the Collocation_Test object.
 
   int parse_args (int argc, char *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (CORBA::Environment &);
+  int test_narrow (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (CORBA::Environment &);
+  int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Run the test.
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index e21a2b22e41..65b2483243b 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -8,15 +8,15 @@ Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void)
 }
 
 Diamond::Top_ptr
-Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy,
-		                                 CORBA::Environment &
-			                            )
+Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy
+                                                 TAO_ENV_ARG_DECL_NOT_USED
+                                                    )
  {
    ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n"));
    if (CORBA::is_nil (proxy) == 0)
-	   ACE_NEW_RETURN (proxy,
-		               Smart_Diamond_Top_Proxy (proxy),
-					   0);
+           ACE_NEW_RETURN (proxy,
+                               Smart_Diamond_Top_Proxy (proxy),
+                                           0);
    return proxy;
 
  }
@@ -28,31 +28,31 @@ Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy)
 
 char *
 Smart_Diamond_Top_Proxy::shape (
-								CORBA::Environment &ACE_TRY_ENV 
-								)
+                                                                TAO_ENV_SINGLE_ARG_DECL
+                                                                )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_DEBUG ((LM_DEBUG, "Smart_proxy: This is "));
-  
+
   CORBA::Short retval = 0;
   char *ans= 0;
-  ACE_TRY 
+  ACE_TRY
     {
-	  ans = ACE_OS::strdup (TAO_Diamond_Top_Smart_Proxy_Base::shape(ACE_TRY_ENV));
+          ans = ACE_OS::strdup (TAO_Diamond_Top_Smart_Proxy_Base::shape(TAO_ENV_SINGLE_ARG_PARAMETER));
 
-	  ACE_TRY_CHECK;
+          ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s\n", ans));
-	  
+
     }
-  ACE_CATCHANY 
+  ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Uncaught Exception");
       return 0;
     }
   ACE_ENDTRY;
-  
+
   return ans;
 }
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index cfef0a4876e..beda2599b3f 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -9,25 +9,23 @@ class ACE_Svc_Export Smart_Diamond_Top_Factory : public virtual Diamond::TAO_Dia
  public:
 
   Smart_Diamond_Top_Factory (void);
-  
-  virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy,
-										 CORBA::Environment &env = 
-										 TAO_default_environment ()
-										 );
-  // This method will create the smart_proxy.   
+
+  virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy
+                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                                                 );
+  // This method will create the smart_proxy.
 };
 
 
-class ACE_Svc_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamond_Top_Smart_Proxy_Base 
+class ACE_Svc_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamond_Top_Smart_Proxy_Base
 {
  public:
 
   Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy);
 
   virtual char * shape (
-                       CORBA::Environment &ACE_TRY_ENV = 
-                       TAO_default_environment ()
-                       )
+                       TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index 84ce376b7fc..71ff66d922a 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -12,10 +12,10 @@ int main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      coll_test.init (argc, argv, ACE_TRY_ENV);
+      coll_test.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coll_test.run (ACE_TRY_ENV);
+      coll_test.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
index 32017e2c2c7..5d05e7d417e 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
@@ -6,20 +6,20 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 {
 }
 
-CORBA::Short 
-Smart_Test_Proxy::method (CORBA::Short boo,
-                          CORBA::Environment &ACE_TRY_ENV)
+CORBA::Short
+Smart_Test_Proxy::method (CORBA::Short boo
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Yahoo, I am smart\n"));
-  
+
   CORBA::Short retval = 0;
-  ACE_TRY 
+  ACE_TRY
     {
-      retval = TAO_Test_Smart_Proxy_Base::method (boo,
-                                                  ACE_TRY_ENV);
+      retval = TAO_Test_Smart_Proxy_Base::method (boo
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test::Oops, reason)
@@ -29,7 +29,7 @@ Smart_Test_Proxy::method (CORBA::Short boo,
       return -1;
     }
   ACE_ENDTRY;
-  
+
   return retval;
 }
 
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
index f1e2a0178df..b466f3fbe0c 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
@@ -2,15 +2,14 @@
 
 #include "testC.h"
 
-class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base 
+class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 {
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short method (CORBA::Short boo,
-                               CORBA::Environment &ACE_TRY_ENV = 
-                               TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+  virtual CORBA::Short method (CORBA::Short boo
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
 
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
index f5894d0e5c2..20d025118f4 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -9,8 +9,8 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy,
-                                  CORBA::Environment &)
+Smart_Test_Factory::create_proxy (Test_ptr proxy
+                                  TAO_ENV_ARG_DECL_NOT_USED)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -19,7 +19,7 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy,
      ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-   
+
  }
 
 // The following Factory is used by the <ACE_Service_Config> to
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
index 74b463910d7..4ce95df91b1 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
@@ -12,9 +12,8 @@ public:
 
   Smart_Test_Factory (void);
 
-  virtual Test_ptr create_proxy (Test_ptr proxy,
-                                 CORBA::Environment &env =
-                                 TAO_default_environment ());
+  virtual Test_ptr create_proxy (Test_ptr proxy
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // This method will create the smart_proxy.
 };
 
diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
index 13302959bce..701aa5e3d8e 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
@@ -57,35 +57,35 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
-      
+
        CORBA::Object_var object =
-        orb->string_to_object (ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // To use the smart proxy just enter it as a svc.conf
       // entry.
-  
+
       Test_var server =
-        Test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        Test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Object reference <%s> is nil\n",
                            ior),
                           1);
-      
+
       server->method (0);
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index bb65e5ecb54..8260da63128 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -28,12 +28,12 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo,
-                        CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Short method  (CORBA::Short boo
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown  (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -47,8 +47,8 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i :: method (CORBA::Short boo,
-                  CORBA::Environment &ACE_TRY_ENV)
+Test_i :: method (CORBA::Short boo
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -62,7 +62,7 @@ Test_i :: method (CORBA::Short boo,
 }
 
 void
-Test_i::shutdown (CORBA::Environment &)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
@@ -98,7 +98,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -107,34 +107,34 @@ main (int argc, char *argv[])
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "",
-                                            ACE_TRY_ENV);
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var Test_object =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (Test_object.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -154,17 +154,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index e016b3b16c1..1fdcda810e7 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -10,8 +10,8 @@ Smart_Test_Factory::Smart_Test_Factory (int one_shot_factory)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy,
-                                  CORBA::Environment &)
+Smart_Test_Factory::create_proxy (Test_ptr proxy
+                                  TAO_ENV_ARG_DECL_NOT_USED)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -20,7 +20,7 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy,
        ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-   
+
  }
 
 Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
@@ -28,20 +28,20 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 {
 }
 
-CORBA::Short 
-Smart_Test_Proxy::method (CORBA::Short boo,
-                          CORBA::Environment &ACE_TRY_ENV)
+CORBA::Short
+Smart_Test_Proxy::method (CORBA::Short boo
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Yahoo, I am smart\n"));
-  
+
   CORBA::Short retval = 0;
-  ACE_TRY 
+  ACE_TRY
     {
-      retval = TAO_Test_Smart_Proxy_Base::method (boo,
-                                                  ACE_TRY_ENV);
+      retval = TAO_Test_Smart_Proxy_Base::method (boo
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test::Oops, reason)
@@ -51,6 +51,6 @@ Smart_Test_Proxy::method (CORBA::Short boo,
       return -1;
     }
   ACE_ENDTRY;
-  
+
   return retval;
 }
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
index 776b11b6b78..10edb88bf24 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
@@ -7,22 +7,20 @@ class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 public:
 
   Smart_Test_Factory (int one_shot_factory = 1);
-  
-  virtual Test_ptr create_proxy (Test_ptr proxy,
-                                 CORBA::Environment &env = 
-                                 TAO_default_environment ());
-  // This method will create the smart_proxy.   
+
+  virtual Test_ptr create_proxy (Test_ptr proxy
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  // This method will create the smart_proxy.
 };
 
-class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base 
+class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 {
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short method (CORBA::Short boo,
-                               CORBA::Environment &ACE_TRY_ENV = 
-                               TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+  virtual CORBA::Short method (CORBA::Short boo
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
 
diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index fc775d205a0..5c5c0f2211a 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -56,7 +56,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int 
+int
 run_test (CORBA::ORB_ptr orb_ptr,
           int target)
 {
@@ -67,28 +67,28 @@ run_test (CORBA::ORB_ptr orb_ptr,
       if (target == 1)
         {
           object =
-            orb->string_to_object (ior1,
-                                   ACE_TRY_ENV);
+            orb->string_to_object (ior1
+                                   TAO_ENV_ARG_PARAMETER);
         }
       else
         {
           object =
-            orb->string_to_object (ior2,
-                                   ACE_TRY_ENV);
+            orb->string_to_object (ior2
+                                   TAO_ENV_ARG_PARAMETER);
         }
       ACE_TRY_CHECK;
-      
+
       Test_var server =
-        Test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        Test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Object reference is nil\n"),
                           1);
-      
+
       server->method (0);
-      server->shutdown (ACE_TRY_ENV);
-      
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -97,7 +97,7 @@ run_test (CORBA::ORB_ptr orb_ptr,
                            "Client-side exception:");
     }
   ACE_ENDTRY;
-return 0;  
+return 0;
 }
 
 int
@@ -108,13 +108,13 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
-      
+
       // To use the smart proxy it is necessary to allocate the
       // user-defined smart factory on the heap as the smart proxy
       // generated classes take care of destroying the object. This
@@ -126,14 +126,14 @@ main (int argc, char *argv[])
       // this interface) but if there is a need for flexibility per
       // object instance then <one_shot_factory> needs to be set to 0.
       Smart_Test_Factory *test_factory = 0;
-      ACE_NEW_RETURN (test_factory, 
+      ACE_NEW_RETURN (test_factory,
                       Smart_Test_Factory (one_shot_factory),
                       -1);
-      
-      // To make KAI Compiler happy as it considers <test_factory> to be 
+
+      // To make KAI Compiler happy as it considers <test_factory> to be
       // an unused variable.
       ACE_UNUSED_ARG (test_factory);
-      
+
       run_test (orb.in (), 1);
       run_test (orb.in (), 2);
 
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 64260ee25f2..6c1780056d6 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -28,12 +28,12 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo,
-                        CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Short method  (CORBA::Short boo
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown  (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -47,8 +47,8 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i :: method (CORBA::Short boo,
-                  CORBA::Environment &ACE_TRY_ENV)
+Test_i :: method (CORBA::Short boo
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -62,10 +62,10 @@ Test_i :: method (CORBA::Short boo,
 }
 
 void
-Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
 
 static const char *ior_output_file = 0;
@@ -98,7 +98,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -107,35 +107,35 @@ main (int argc, char *argv[])
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "",
-                                            ACE_TRY_ENV);
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var Test_object =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (Test_object.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -155,18 +155,18 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 4c6919c093e..e220a9ccd81 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -9,8 +9,8 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 }
 
 Test_ptr
-Smart_Test_Factory::create_proxy (Test_ptr proxy,
-                                  CORBA::Environment &)
+Smart_Test_Factory::create_proxy (Test_ptr proxy
+                                  TAO_ENV_ARG_DECL)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -19,7 +19,7 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy,
        ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-   
+
  }
 
 Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
@@ -27,20 +27,20 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 {
 }
 
-CORBA::Short 
-Smart_Test_Proxy::method (CORBA::Short boo,
-                          CORBA::Environment &ACE_TRY_ENV)
+CORBA::Short
+Smart_Test_Proxy::method (CORBA::Short boo
+                          TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Yahoo, I am smart\n"));
-  
+
   CORBA::Short retval = 0;
-  ACE_TRY 
+  ACE_TRY
     {
-      retval = TAO_Test_Smart_Proxy_Base::method (boo,
-                                                  ACE_TRY_ENV);
+      retval = TAO_Test_Smart_Proxy_Base::method (boo
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test::Oops, reason)
@@ -50,6 +50,6 @@ Smart_Test_Proxy::method (CORBA::Short boo,
       return -1;
     }
   ACE_ENDTRY;
-  
+
   return retval;
 }
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index 09e9f3677ed..838a34b97ae 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -7,22 +7,20 @@ class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory
 public:
 
   Smart_Test_Factory (void);
-  
-  virtual Test_ptr create_proxy (Test_ptr proxy,
-                                 CORBA::Environment &env = 
-                                 TAO_default_environment ());
-  // This method will create the smart_proxy.   
+
+  virtual Test_ptr create_proxy (Test_ptr proxy
+                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  // This method will create the smart_proxy.
 };
 
-class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base 
+class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 {
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short method (CORBA::Short boo,
-                               CORBA::Environment &ACE_TRY_ENV = 
-                               TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+  virtual CORBA::Short method (CORBA::Short boo
+                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
 
diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 818e5baa50c..caeee42c552 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -57,16 +57,16 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
-      
+
        CORBA::Object_var object =
-        orb->string_to_object (ior,
-                               ACE_TRY_ENV);
+        orb->string_to_object (ior
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // To use the smart proxy it is necessary to allocate the
@@ -77,28 +77,28 @@ main (int argc, char *argv[])
       // proxy designer who now can manage the lifetime of the object
       // much surely.
       Smart_Test_Factory *test_factory = 0;
-      ACE_NEW_RETURN (test_factory, 
+      ACE_NEW_RETURN (test_factory,
                       Smart_Test_Factory,
                       -1);
 
-      // To make KAI Compiler happy as it considers <test_factory> to be 
+      // To make KAI Compiler happy as it considers <test_factory> to be
       // an unused variable.
       ACE_UNUSED_ARG (test_factory);
 
       Test_var server =
-        Test::_narrow (object.in (),
-                       ACE_TRY_ENV);
+        Test::_narrow (object.in ()
+                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Object reference <%s> is nil\n",
                            ior),
                           1);
-      
+
       server->method (0);
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 5f94f63a638..71b28c0ecff 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -28,12 +28,12 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short method  (CORBA::Short boo,
-                        CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Short method  (CORBA::Short boo
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (CORBA::Environment &ACE_TRY_ENV)
+  void shutdown  (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -47,8 +47,8 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i :: method (CORBA::Short boo,
-                  CORBA::Environment &ACE_TRY_ENV)
+Test_i :: method (CORBA::Short boo
+                  TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -62,7 +62,7 @@ Test_i :: method (CORBA::Short boo,
 }
 
 void
-Test_i::shutdown (CORBA::Environment &)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
@@ -98,7 +98,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -107,34 +107,34 @@ main (int argc, char *argv[])
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            "",
-                                            ACE_TRY_ENV);
+                                            ""
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var Test_object =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (Test_object.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (Test_object.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -154,17 +154,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index 7b9280c9ec1..ad0a7a6378b 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -67,18 +67,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        server->print_status (ACE_TRY_ENV);
+        server->print_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value == 0)
@@ -103,11 +103,11 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index 1f73206fca6..47dd25e76ed 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -17,13 +17,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -64,40 +64,40 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 383e8d62720..ad3665fbd00 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -115,22 +115,22 @@ parse_args (int argc, char **argv)
 }
 
 void
-setup_timeouts (CORBA::ORB_ptr orb,
-                CORBA::Environment &ACE_TRY_ENV)
+setup_timeouts (CORBA::ORB_ptr orb
+                TAO_ENV_ARG_DECL)
 {
   // Escape value.
   if (timeout == -1)
     return;
 
   // Obtain PolicyCurrent.
-  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent",
-                                                              ACE_TRY_ENV);
+  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow down to correct type.
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+    CORBA::PolicyCurrent::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TimeBase::TimeT rt_timeout = 10000 * timeout;
@@ -143,32 +143,32 @@ setup_timeouts (CORBA::ORB_ptr orb,
 
   rt_timeout_policy_list[0] =
     orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                        rt_timeout_any,
-                        ACE_TRY_ENV);
+                        rt_timeout_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policy_current->set_policy_overrides (rt_timeout_policy_list,
-                                        CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+                                        CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  rt_timeout_policy_list[0]->destroy (ACE_TRY_ENV);
+  rt_timeout_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-setup_buffering_constraints (CORBA::ORB_ptr orb,
-                             CORBA::Environment &ACE_TRY_ENV)
+setup_buffering_constraints (CORBA::ORB_ptr orb
+                             TAO_ENV_ARG_DECL)
 {
   // Obtain PolicyCurrent.
-  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent",
-                                                              ACE_TRY_ENV);
+  CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"
+                                                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow down to correct type.
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+    CORBA::PolicyCurrent::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the sync scope policy, i.e., the ORB will buffer oneways.
@@ -186,18 +186,18 @@ setup_buffering_constraints (CORBA::ORB_ptr orb,
   // Setup the sync scope policy.
   sync_policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                        sync_any,
-                        ACE_TRY_ENV);
+                        sync_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the sync scope.
   policy_current->set_policy_overrides (sync_policy_list,
-                                        CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+                                        CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are now done with this policy.
-  sync_policy_list[0]->destroy (ACE_TRY_ENV);
+  sync_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Flush buffers.
@@ -218,25 +218,25 @@ setup_buffering_constraints (CORBA::ORB_ptr orb,
   // Setup the buffering constraint policy.
   buffering_constraint_policy_list[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                        buffering_constraint_any,
-                        ACE_TRY_ENV);
+                        buffering_constraint_any
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the constraints.
   policy_current->set_policy_overrides (buffering_constraint_policy_list,
-                                        CORBA::ADD_OVERRIDE,
-                                        ACE_TRY_ENV);
+                                        CORBA::ADD_OVERRIDE
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are done with the policy.
-  buffering_constraint_policy_list[0]->destroy (ACE_TRY_ENV);
+  buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -244,8 +244,8 @@ main (int argc, char **argv)
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         0,
-                         ACE_TRY_ENV);
+                         0
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -255,23 +255,23 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object =
-        orb->string_to_object (IOR,
-                               ACE_TRY_ENV);
+        orb->string_to_object (IOR
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
-      test_var test_object = test::_narrow (object.in (),
-                                            ACE_TRY_ENV);
+      test_var test_object = test::_narrow (object.in ()
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup buffering.
-      setup_buffering_constraints (orb.in (),
-                                   ACE_TRY_ENV);
+      setup_buffering_constraints (orb.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup timeout.
-      setup_timeouts (orb.in (),
-                      ACE_TRY_ENV);
+      setup_timeouts (orb.in ()
+                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test::data the_data (data_bytes);
@@ -286,8 +286,8 @@ main (int argc, char **argv)
           // Invoke the oneway method.
           test_object->method (i,
                                the_data,
-                               work,
-                               ACE_TRY_ENV);
+                               work
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Interval between successive calls.
@@ -300,7 +300,7 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (ACE_TRY_ENV);
+          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -310,7 +310,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index b84f0bc46a3..6607db33fdc 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -41,22 +41,22 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (ACE_TRY_ENV);
+        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index b29dbf3fedf..ae78c1de3e6 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -12,8 +12,8 @@ test_i::test_i (CORBA::ORB_ptr orb)
 void
 test_i::method (CORBA::ULong request_number,
                 const test::data &,
-                CORBA::ULong work,
-                CORBA::Environment &)
+                CORBA::ULong work
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -29,9 +29,9 @@ test_i::method (CORBA::ULong request_number,
 }
 
 void
-test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h
index 5bf704ff3de..06723f6b263 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.h
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h
@@ -30,11 +30,11 @@ public:
   // = The test interface methods.
   void method (CORBA::ULong request_number,
                const test::data &,
-               CORBA::ULong work,
-               CORBA::Environment &)
+               CORBA::ULong work
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index b19f30c2f42..dc5416aceeb 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -53,12 +53,12 @@ static int in_time_count = 0;
 void
 send_echo (CORBA::ORB_ptr orb,
            Simple_Server_ptr server,
-           CORBA::Long t,
-           CORBA::Environment &ACE_TRY_ENV)
+           CORBA::Long t
+           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      server->echo (0, t, ACE_TRY_ENV);
+      server->echo (0, t TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       in_time_count++;
@@ -76,7 +76,7 @@ send_echo (CORBA::ORB_ptr orb,
                          (max_timeout % 1000) * 1000);
 
       // This is a non-standard TAO call.
-      orb->run (tv, ACE_TRY_ENV);
+      orb->run (tv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -88,18 +88,18 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -111,21 +111,21 @@ int main (int argc, char* argv[])
         }
 
       object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("PolicyCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PolicyCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (object.in (), ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT mid_value =
@@ -142,20 +142,20 @@ int main (int argc, char* argv[])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                            any_object,
-                            ACE_TRY_ENV);
+                            any_object
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       object =
         server->_set_policy_overrides (policy_list,
-                                       CORBA::SET_OVERRIDE,
-                                       ACE_TRY_ENV);
+                                       CORBA::SET_OVERRIDE
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var timeout_server =
-        Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
+        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policy_list[0]->destroy (ACE_TRY_ENV);
+      policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_list[0] = CORBA::Policy::_nil ();
 
@@ -174,15 +174,15 @@ int main (int argc, char* argv[])
 
           policy_list.length (0);
           policy_manager->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
+                                                CORBA::SET_OVERRIDE
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           policy_current->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
+                                                CORBA::SET_OVERRIDE
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          send_echo (orb.in (), server.in (), t, ACE_TRY_ENV);
+          send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG,
@@ -191,19 +191,19 @@ int main (int argc, char* argv[])
           policy_list.length (1);
           policy_list[0] =
             orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                any_orb,
-                                ACE_TRY_ENV);
+                                any_orb
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           policy_manager->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
+                                                CORBA::SET_OVERRIDE
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          send_echo (orb.in (), server.in (), t, ACE_TRY_ENV);
+          send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          policy_list[0]->destroy (ACE_TRY_ENV);
+          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG,
@@ -212,24 +212,24 @@ int main (int argc, char* argv[])
           policy_list.length (1);
           policy_list[0] =
             orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                any_thread,
-                                ACE_TRY_ENV);
+                                any_thread
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           policy_current->set_policy_overrides (policy_list,
-                                                CORBA::SET_OVERRIDE,
-                                                ACE_TRY_ENV);
+                                                CORBA::SET_OVERRIDE
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          send_echo (orb.in (), server.in (), t, ACE_TRY_ENV);
+          send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          policy_list[0]->destroy (ACE_TRY_ENV);
+          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG,
           //            "client(%P) Use the object policies\n"));
-          send_echo (orb.in (), timeout_server.in (), t, ACE_TRY_ENV);
+          send_echo (orb.in (), timeout_server.in (), t TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -238,18 +238,18 @@ int main (int argc, char* argv[])
       //             "resynch with server\n"));
       policy_list.length (0);
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_current->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      send_echo (orb.in (), server.in (), 0, ACE_TRY_ENV);
+      send_echo (orb.in (), server.in (), 0 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (timeout_count == 0)
@@ -263,7 +263,7 @@ int main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "In time = %d, timed out = %d\n",
                   in_time_count, timeout_count));
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index acdf5ddacbd..c79786c701e 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -17,14 +17,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -40,14 +40,14 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -56,42 +56,42 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
-	{
-      	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -99,7 +99,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index f51c48e0ad7..bbf564047ba 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -16,8 +16,8 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 
 CORBA::Long
 Simple_Server_i::echo (CORBA::Long x,
-                       CORBA::Long msecs,
-                       CORBA::Environment&)
+                       CORBA::Long msecs
+                       TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000);
@@ -30,10 +30,10 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index 74a62f9800a..fcc74c77fab 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -32,10 +32,10 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
-                    CORBA::Long msecs,
-                    CORBA::Environment&)
+                    CORBA::Long msecs
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index 983eecd6295..0d116185253 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -48,8 +48,8 @@ public:
   void add_callback (Control &);
   // Adds the callbacks to the GUI underneath.....
 
-  void parse_args (int argc, char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV);
+  void parse_args (int argc, char *argv[]
+                   TAO_ENV_ARG_DECL);
 private:
 
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 2c513e36a9c..b81d13c6c98 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(Xt_Stopwatch, client, "$Id$")
 
 #if !defined (ACE_HAS_XT)
 
-int 
+int
 main (int, char *[])
 {
   ACE_ERROR ((LM_INFO,
@@ -38,17 +38,17 @@ main (int argc, char *argv[])
 
   Control control (toplevel);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client client (orb.in ());
 
-      client.parse_args (argc, argv, ACE_TRY_ENV);
+      client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client.add_callback (control);
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
@@ -78,8 +78,8 @@ Client::~Client (void)
 
 void
 Client::parse_args (int argc,
-                    char *argv[],
-                    CORBA::Environment &ACE_TRY_ENV)
+                    char *argv[]
+                    TAO_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
@@ -102,11 +102,11 @@ Client::parse_args (int argc,
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior, ACE_TRY_ENV);
+    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->server_ =
-    Stopwatch::_narrow (object.in (), ACE_TRY_ENV);
+    Stopwatch::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(this->server_.in ()))
@@ -157,10 +157,10 @@ Client::stop_callback (Widget /*widget*/,
 void
 Client::start_hook (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->server_->start (ACE_TRY_ENV);
+      this->server_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -175,10 +175,10 @@ Client::start_hook (void)
 void
 Client::stop_hook (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->server_->stop (ACE_TRY_ENV);
+      this->server_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index e7c69d49af1..0086ad471bd 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(Xt_Stopwatch, server, "$Id$")
 
 #if !defined (ACE_HAS_XT)
 
-int 
+int
 main (int, char *[])
 {
   ACE_ERROR ((LM_INFO,
@@ -34,14 +34,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -72,16 +72,16 @@ main (int argc, char *argv[])
 
   Stopwatch_display stopwatch (toplevel);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -90,26 +90,26 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       stopwatch.manage ();
 
-      // Make a timer class 
+      // Make a timer class
       Timer_imp timer (app, 100, &stopwatch);
 
       Stopwatch_imp server_impl (orb.in (), &timer);
 
       Stopwatch_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -117,26 +117,26 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-	  FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_output_file),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", ior.in ());
-	  ACE_OS::fclose (output_file);
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       XtRealizeWidget (toplevel);
       XtAppMainLoop (app);
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
+                           "Caught exception:");
       return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/ior_corbaloc/client.cpp b/TAO/tests/ior_corbaloc/client.cpp
index a3acd04fbeb..1fec9b81a41 100644
--- a/TAO/tests/ior_corbaloc/client.cpp
+++ b/TAO/tests/ior_corbaloc/client.cpp
@@ -24,7 +24,7 @@
 int main (int argc, char *argv [])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -32,12 +32,12 @@ int main (int argc, char *argv [])
       IOR_corbaloc_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv, ACE_TRY_ENV);
+      init_result = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (init_result == 0)
           {
-            client.run (ACE_TRY_ENV);
+            client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         return 0;
diff --git a/TAO/tests/ior_corbaloc/corbaname_client.cpp b/TAO/tests/ior_corbaloc/corbaname_client.cpp
index 9f9335fe7a4..c240ebce76a 100644
--- a/TAO/tests/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/tests/ior_corbaloc/corbaname_client.cpp
@@ -18,7 +18,7 @@
 
 int main (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -26,39 +26,39 @@ int main (int argc, char *argv [])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
 
       if(argc < 2 )
-        { 
-          ACE_ERROR_RETURN((LM_ERROR, 
+        {
+          ACE_ERROR_RETURN((LM_ERROR,
                             "Usage:\n  %s [corbaname URL]\n",
-                            argv[0]), 
+                            argv[0]),
                            1);
-	}
-					     
+        }
+
       // Get an object reference using a corbaname: style URL
       CORBA::Object_var obj =
-        orb->string_to_object (argv[1],
-                               ACE_TRY_ENV);
+        orb->string_to_object (argv[1]
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow
       corbaloc::Status_var factory =
-        corbaloc::Status::_narrow (obj.in (), ACE_TRY_ENV);
+        corbaloc::Status::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "ERROR: Object reference <%s> is nil\n",
-                             argv[1]), 
+                             argv[1]),
                             -1);
         }
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (ACE_TRY_ENV);
+        factory->print_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value != 0)
@@ -66,7 +66,7 @@ int main (int argc, char *argv [])
           ACE_DEBUG ((LM_DEBUG,
                       "The server has not been contacted. Error!!\n",
                       0));
-        }   
+        }
 
       return 0;
     }
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
index 4e0a2a56dea..7b81ae125a2 100644
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -33,7 +33,7 @@ IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void)
 }
 
 int
-IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
+IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY
@@ -45,13 +45,13 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
       // Resolve the name
       CORBA::Object_var factory_object =
-        this->naming_context_->resolve (name,
-                                        ACE_TRY_ENV);
+        this->naming_context_->resolve (name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow
       corbaloc::Status_var factory =
-        corbaloc::Status::_narrow (factory_object.in (), ACE_TRY_ENV);
+        corbaloc::Status::_narrow (factory_object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -64,7 +64,7 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (ACE_TRY_ENV);
+        factory->print_status (TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value != 0)
@@ -72,7 +72,7 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
         ACE_DEBUG ((LM_DEBUG,
                     "The server has not been contacted. Error!!\n",
                     0));
-	}
+        }
     }
   ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
@@ -94,8 +94,8 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV)
 
 int
 IOR_corbaloc_Client_i::init (int& argc,
-                             char *argv[],
-                             CORBA::Environment &ACE_TRY_ENV)
+                             char *argv[]
+                             TAO_ENV_ARG_DECL)
 {
 
   ACE_TRY
@@ -105,20 +105,20 @@ IOR_corbaloc_Client_i::init (int& argc,
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
 
       if(argc < 2){
-	      ACE_DEBUG((LM_DEBUG, "\nUsage:\n  %s [corbaloc URL for NameService]\n", argv[0]));
-	      ACE_OS::exit(-1);
+              ACE_DEBUG((LM_DEBUG, "\nUsage:\n  %s [corbaloc URL for NameService]\n", argv[0]));
+              ACE_OS::exit(-1);
       }
 
       corbaloc_url_ = argv[1];
 
       // Get a reference to the Naming Service
       CORBA::Object_var naming_context_object =
-        orb->string_to_object (corbaloc_url_.c_str(),
-                               ACE_TRY_ENV);
+        orb->string_to_object (corbaloc_url_.c_str()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_context_object.in ()))
@@ -128,8 +128,8 @@ IOR_corbaloc_Client_i::init (int& argc,
 
       // Narrow to get the correct reference
       this->naming_context_ =
-        CosNaming::NamingContextExt::_narrow (naming_context_object.in (),
-                                              ACE_TRY_ENV);
+        CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->naming_context_.in ()))
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
index 246167e39a3..f785eb1dd80 100644
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
@@ -35,14 +35,14 @@ class IOR_corbaloc_Client_i
   //
 
  public:
-  // = COnstructor and destructor.
+  // = Constructor and destructor.
   IOR_corbaloc_Client_i (void);
   ~IOR_corbaloc_Client_i (void);
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[], CORBA::Environment &ACE_TRY_ENV);
+  int init (int& argc, char *argv[] TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/tests/ior_corbaloc/server.cpp b/TAO/tests/ior_corbaloc/server.cpp
index 68a9f5a19bb..8dfc85c305b 100644
--- a/TAO/tests/ior_corbaloc/server.cpp
+++ b/TAO/tests/ior_corbaloc/server.cpp
@@ -10,15 +10,15 @@
 int main (int argc, char* argv[])
 {
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
 
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv,
-                         "" /* the ORB name, it can be anything! */,
-                         ACE_TRY_ENV);
+                         "" /* the ORB name, it can be anything! */
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if(argc < 2){
@@ -27,21 +27,21 @@ int main (int argc, char* argv[])
       }
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_TRY_ENV);
+        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA Manager
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the servant
@@ -54,13 +54,13 @@ int main (int argc, char* argv[])
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down the reference
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_context_object.in(),
-                                           ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (naming_context_object.in()
+                                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind Iterator_Factory to the Naming Context
@@ -72,13 +72,13 @@ int main (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       // Run the orb
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA, waiting until the destruction terminates
-      poa->destroy (1, 1, ACE_TRY_ENV);
+      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, ex) {
@@ -86,7 +86,7 @@ int main (int argc, char* argv[])
   }
   ACE_CATCHANY {
     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in server");
-  }	    
+  }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/tests/ior_corbaloc/status_i.cpp b/TAO/tests/ior_corbaloc/status_i.cpp
index e80af02f9ae..d645e7c0170 100644
--- a/TAO/tests/ior_corbaloc/status_i.cpp
+++ b/TAO/tests/ior_corbaloc/status_i.cpp
@@ -2,14 +2,14 @@
 
 #include "status_i.h"
 
-corbaloc_Status_i::corbaloc_Status_i (CORBA::Environment &)
-	: server_name_()
+corbaloc_Status_i::corbaloc_Status_i (TAO_ENV_ARG_DECL_NOT_USED)
+        : server_name_()
 {
   // Constructor
 }
 
 CORBA::Boolean
-corbaloc_Status_i::print_status (CORBA::Environment &)
+corbaloc_Status_i::print_status (TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -17,7 +17,7 @@ corbaloc_Status_i::print_status (CORBA::Environment &)
   // return true == 0;
   ACE_DEBUG((LM_DEBUG,
              "Invoking print_status() method for servant with name: %s\nregistered in Naming Service\n",
-	     
-	      server_name_.c_str() ));
+
+              server_name_.c_str() ));
   return 0;
 }
diff --git a/TAO/tests/ior_corbaloc/status_i.h b/TAO/tests/ior_corbaloc/status_i.h
index dfdbc403099..cc197646643 100644
--- a/TAO/tests/ior_corbaloc/status_i.h
+++ b/TAO/tests/ior_corbaloc/status_i.h
@@ -9,13 +9,12 @@
 
 class corbaloc_Status_i : public POA_corbaloc::Status {
 public:
-  corbaloc_Status_i (CORBA::Environment & =
-                     TAO_default_environment());
+  corbaloc_Status_i (TAO_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::Boolean print_status (CORBA::Environment & = TAO_default_environment()) 
+  CORBA::Boolean print_status (TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     throw (CORBA::SystemException);
 
-  void set_name(const char *name){  server_name_=name; } 
+  void set_name(const char *name){  server_name_=name; }
 private:
   ACE_CString server_name_;
 
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index b657750574f..914b434d909 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -24,8 +24,8 @@
 
 
 static CORBA::Boolean
-catiiop (char* string,
-         CORBA::Environment &ACE_TRY_ENV)
+catiiop (char* string
+         TAO_ENV_ARG_DECL)
 {
   // NIL objref encodes as just "iiop:" ... which has already been
   // removed, so we see it as an empty string.
@@ -132,8 +132,8 @@ static CORBA::Boolean
 cat_profile_helper(TAO_InputCDR& stream, const char *protocol);
 
 static CORBA::Boolean
-catior (char* str,
-        CORBA::Environment &)
+catior (char* str
+        TAO_ENV_ARG_DECL_NOT_USED)
 {
   // Unhex the bytes, and make a CDR deencapsulation stream from the
   // resulting data.
@@ -263,12 +263,12 @@ catior (char* str,
             continue_decoding = cat_shmiop_profile (stream);
             ACE_DEBUG ((LM_DEBUG, "%}"));
           }
-	else if (tag == TAO_TAG_UDP_PROFILE)
+        else if (tag == TAO_TAG_UDP_PROFILE)
           {
             ACE_DEBUG ((LM_DEBUG, "%{"));
-	    continue_decoding =  cat_profile_helper(stream, "DIOP (GIOP over UDP)");
+            continue_decoding =  cat_profile_helper(stream, "DIOP (GIOP over UDP)");
             ACE_DEBUG ((LM_DEBUG, "%}"));
-	  }
+          }
         else
           {
             ACE_DEBUG ((LM_DEBUG, "%{"));
@@ -291,8 +291,8 @@ catior (char* str,
 // : interface_marker
 
 static CORBA::Boolean
-catpoop (char* string,
-        CORBA::Environment &ACE_TRY_ENV)
+catpoop (char* string
+        TAO_ENV_ARG_DECL)
 {
   if (!string || !*string)
     return 0;
@@ -411,8 +411,8 @@ main (int argc, char *argv[])
 {
   ACE_Get_Opt get_opt (argc, argv, "f:n:");
 
-  CORBA::Environment env;
-  CORBA::ORB_var orb_var =  CORBA::ORB_init (argc, argv, "TAO", env);
+  TAO_ENV_DECLARE_NEW_ENV;
+  CORBA::ORB_var orb_var =  CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
   CORBA::Boolean b = 0;
   int opt;
 
@@ -476,7 +476,7 @@ main (int argc, char *argv[])
                                          aString.length () - prefixLength);
                     subString[subString.length ()] = '\0';
                     str = subString.rep ();
-                    b = catior (str, env);
+                    b = catior (str TAO_ENV_ARG_PARAMETER);
                   }
                 else if (aString.find ("iiop:") == 0)
                   {
@@ -491,7 +491,7 @@ main (int argc, char *argv[])
                                          aString.length () - prefixLength);
                     //subString[subString.length () - 1] = '\0';
                     str = subString.rep ();
-                    b = catiiop (str, env);
+                    b = catiiop (str TAO_ENV_ARG_PARAMETER);
                   }
                 else if (aString.find (":IR:") > 0)
                   {
@@ -499,7 +499,7 @@ main (int argc, char *argv[])
                                 "decoding an POOP IOR\n"));
 
                     str = aString.rep ();
-                    b = catpoop (str, env);
+                    b = catpoop (str TAO_ENV_ARG_PARAMETER);
                   }
                 else
                   ACE_ERROR ((LM_ERROR,
@@ -603,10 +603,10 @@ static CORBA::Boolean
 cat_tagged_components (TAO_InputCDR& stream)
 {
   // ... and object key.
-  
+
   CORBA::ULong len;
   stream >> len;
-  
+
   for (CORBA::ULong i = 0;
        i != len;
        ++i)
@@ -619,7 +619,7 @@ cat_tagged_components (TAO_InputCDR& stream)
       cat_octet_seq ("Component Value", stream);
       ACE_DEBUG ((LM_DEBUG, "%}%}"));
     }
-  
+
   return 1;
 }
 
@@ -694,16 +694,16 @@ cat_profile_helper (TAO_InputCDR& stream,
 
   if (cat_object_key (str) == 0)
     return 0;
-  
+
   //IIOP 1.0 does not have tagged_components.
   if (iiop_version_minor)
     {
       if (cat_tagged_components (str) == 0)
         return 0;
-      
+
       return 1;
     }
-  else 
+  else
     return 0;
 }
 
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index ac7427862f1..3c61dfb04fa 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -25,11 +25,11 @@ int showNSonly = 0;
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *pname = argv[0];
@@ -86,15 +86,15 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var nc_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (nc_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (nc_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (root_nc.in ()))
         {
@@ -108,12 +108,12 @@ main (int argc, char *argv[])
       the_name[0].id = CORBA::string_dup (name);
       if (rebind)
         {
-          root_nc->rebind (the_name, obj.in (), ACE_TRY_ENV);
+          root_nc->rebind (the_name, obj.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
-          root_nc->bind (the_name, obj.in (), ACE_TRY_ENV);
+          root_nc->bind (the_name, obj.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 2d0df788494..e3723150f87 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -25,11 +25,11 @@ int showNSonly = 0;
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *pname = argv[0];
@@ -64,13 +64,13 @@ main (int argc, char *argv[])
                       "Usage: %s [ --name <name> ]\n", pname));
           return 1;
         }
-          
+
       CORBA::Object_var nc_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (nc_obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (nc_obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (root_nc.in ()))
         {
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
       CosNaming::Name the_name (1);
       the_name.length (1);
       the_name[0].id = CORBA::string_dup (name);
-      root_nc->unbind (the_name, ACE_TRY_ENV);
+      root_nc->unbind (the_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 75fae9e5567..607a0e8beeb 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -9,7 +9,7 @@
  *
  *
  *  @author  Thomas Lockhart, NASA/JPL <Thomas.Lockhart@jpl.nasa.gov>
- *  @date 1999-06-03 
+ *  @date 1999-06-03
  */
 //=============================================================================
 
@@ -25,8 +25,8 @@ int showIOR = 0;
 int showNSonly = 0;
 
 static void list_context (CosNaming::NamingContext_ptr nc,
-                          int level,
-                          CORBA::Environment &ACE_TRY_ENV);
+                          int level
+                          TAO_ENV_ARG_DECL);
 
 static void
 get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
@@ -42,7 +42,7 @@ get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
     case TAO_TAG_SHMEM_PROFILE:
       tag_string = "SHMEM";
       break;
-#ifdef TAO_TAG_UDP_PROFILE 
+#ifdef TAO_TAG_UDP_PROFILE
     case TAO_TAG_UDP_PROFILE:
       tag_string = "GIOP over UDP";
 #endif /* TAO_TAG_UDP_PROFILE */
@@ -81,7 +81,7 @@ display_endpoint_info (CORBA::Object_ptr obj)
 
   CORBA::ULong tag = endpoint->tag ();
   ACE_CString tag_name;
-  get_tag_name (tag, tag_name); 
+  get_tag_name (tag, tag_name);
 
   char buf[255];
   if (endpoint->addr_to_string (buf, 255) < 0)
@@ -89,7 +89,7 @@ display_endpoint_info (CORBA::Object_ptr obj)
       ACE_DEBUG ((LM_DEBUG, "Could not put endpoint address in string.\n"));
       return;
     }
-    
+
   ACE_DEBUG ((LM_DEBUG,
               "Protocol: %s,   Endpoint: %s\n",
               tag_name.c_str(),
@@ -101,8 +101,8 @@ display_endpoint_info (CORBA::Object_ptr obj)
 static void
 show_chunk (CosNaming::NamingContext_ptr nc,
             const CosNaming::BindingList &bl,
-            int level,
-            CORBA::Environment &ACE_TRY_ENV)
+            int level
+            TAO_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0;
        i < bl.length ();
@@ -126,7 +126,7 @@ show_chunk (CosNaming::NamingContext_ptr nc,
       Name[0].kind =
         CORBA::string_dup (bl[i].binding_name[0].kind);
 
-      CORBA::Object_var obj = nc->resolve (Name, ACE_TRY_ENV);
+      CORBA::Object_var obj = nc->resolve (Name TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // If this is a context node, follow it down to the next
@@ -137,10 +137,10 @@ show_chunk (CosNaming::NamingContext_ptr nc,
                       ": naming context\n"));
 
           CosNaming::NamingContext_var xc =
-            CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+            CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          list_context (xc.in (), level + 1, ACE_TRY_ENV);
+          list_context (xc.in (), level + 1 TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       // Mark this node as a reference
@@ -149,8 +149,8 @@ show_chunk (CosNaming::NamingContext_ptr nc,
           if (showIOR)
             {
               CORBA::String_var str =
-                orb->object_to_string (obj.in (),
-                                       ACE_TRY_ENV);
+                orb->object_to_string (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
               ACE_DEBUG ((LM_DEBUG,
                           ": <%s>\n",
@@ -168,17 +168,17 @@ show_chunk (CosNaming::NamingContext_ptr nc,
 
 static void
 list_context (CosNaming::NamingContext_ptr nc,
-              int level,
-              CORBA::Environment &ACE_TRY_ENV)
+              int level
+              TAO_ENV_ARG_DECL)
 {
   CosNaming::BindingIterator_var it;
   CosNaming::BindingList_var bl;
   const CORBA::ULong CHUNK = 100;
 
-  nc->list (CHUNK, bl, it, ACE_TRY_ENV);
+  nc->list (CHUNK, bl, it TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  show_chunk (nc, bl.in (), level, ACE_TRY_ENV);
+  show_chunk (nc, bl.in (), level TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (it.in ()))
@@ -188,12 +188,12 @@ list_context (CosNaming::NamingContext_ptr nc,
       do
         {
           more = it->next_n (CHUNK, bl);
-          show_chunk (nc, bl.in (), level, ACE_TRY_ENV);
+          show_chunk (nc, bl.in (), level TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       while (more);
 
-      it->destroy (ACE_TRY_ENV);
+      it->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -204,10 +204,10 @@ main (int argc, char *argv[])
   showIOR = 0;
   showNSonly = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      orb = CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+      orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *pname = argv[0];
@@ -246,16 +246,16 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
+        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (obj.in (), ACE_TRY_ENV);
+        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (root_nc.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (root_nc.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()) || CORBA::is_nil (root_nc.in ()))
@@ -282,7 +282,7 @@ main (int argc, char *argv[])
                           "Naming Service:\n---------\n"));
             }
 
-          list_context (root_nc.in (), 1, ACE_TRY_ENV);
+          list_context (root_nc.in (), 1 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }